diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/bg.po | 4689 | ||||
| -rw-r--r-- | po/de.po | 3310 | ||||
| -rw-r--r-- | po/fr.po | 3252 | ||||
| -rw-r--r-- | po/git.pot | 3078 | ||||
| -rw-r--r-- | po/is.po | 46 | ||||
| -rw-r--r-- | po/ko.po | 3192 | ||||
| -rw-r--r-- | po/pt_PT.po | 3893 | ||||
| -rw-r--r-- | po/ru.po | 3171 | ||||
| -rw-r--r-- | po/sv.po | 3269 | ||||
| -rw-r--r-- | po/vi.po | 3274 | ||||
| -rw-r--r-- | po/zh_CN.po | 3375 |
11 files changed, 19406 insertions, 15143 deletions
@@ -65,6 +65,9 @@ # term управляваща дума (за git-bisect) # mergetag етикет при сливане # delta - разлика, делта, обект-разлика +# peeled tag - проследен етикет - когато етикет сочи към друг етикет, а не подаване и проследяваме подобно на символна връзка +# strip - премахвам (за компонент при филтриране) +# unrelated histories - независими истории # ---- # „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ # ======================== @@ -109,8 +112,8 @@ msgid "" msgstr "" "Project-Id-Version: git master\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-12-22 22:50+0800\n" -"PO-Revision-Date: 2015-12-28 11:32+0200\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-05-29 15:23+0300\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -133,7 +136,7 @@ msgstr "" "Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“\n" "за да отбележите коригирането им. След това извършете подаването." -#: advice.c:101 builtin/merge.c:1225 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)." @@ -177,25 +180,25 @@ msgstr "ФОРМАТ" msgid "archive format" msgstr "ФОРМАТ на архива" -#: archive.c:430 builtin/log.c:1229 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" -msgstr "префикс" +msgstr "ПРЕФИКС" #: archive.c:431 msgid "prepend prefix to each pathname in the archive" -msgstr "добавяне на този префикс към всеки път в архива" +msgstr "добавяне на този ПРЕФИКС към всеки път в архива" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 builtin/blame.c:2536 -#: builtin/config.c:58 builtin/fast-export.c:987 builtin/fast-export.c:989 -#: builtin/grep.c:707 builtin/hash-object.c:99 builtin/ls-files.c:446 -#: builtin/ls-files.c:449 builtin/notes.c:395 builtin/notes.c:558 +#: 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 msgid "file" -msgstr "файл" +msgstr "ФАЙЛ" #: archive.c:433 builtin/archive.c:89 msgid "write the archive to this file" -msgstr "запазване на архива в този файл" +msgstr "запазване на архива в този ФАЙЛ" #: archive.c:435 msgid "read .gitattributes in working directory" @@ -221,7 +224,8 @@ msgstr "добро компресиране" msgid "list supported archive formats" msgstr "извеждане на списъка с поддържаните формати" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "хранилище" @@ -229,7 +233,7 @@ msgstr "хранилище" msgid "retrieve the archive from remote repository <repo>" msgstr "изтегляне на архива от отдалеченото ХРАНИЛИЩЕ" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482 msgid "command" msgstr "команда" @@ -237,7 +241,7 @@ msgstr "команда" msgid "path to the remote git-upload-archive command" msgstr "път към отдалечената команда „git-upload-archive“" -#: attr.c:265 +#: attr.c:263 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -245,85 +249,102 @@ msgstr "" "Отрицателните шаблони се игнорират в атрибутите на git.\n" "Ако ви трябва начална удивителна, ползвайте „\\!“." -#: branch.c:61 +#: branch.c:53 +#, c-format +msgid "" +"\n" +"After fixing the error cause you may try to fix up\n" +"the remote tracking information by invoking\n" +"\"git branch --set-upstream-to=%s%s%s\"." +msgstr "" +"\n" +"След корекция на грешката, можете да обновите\n" +"информацията за следения клон чрез:\n" +"git branch --set-upstream-to=%s%s%s" + +#: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "" "Клонът „%s“ не може да служи като източник за собствената си синхронизация." -#: branch.c:84 +#: branch.c:93 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." msgstr "" "Клонът „%s“ ще следи клона „%s“ от отдалеченото хранилище „%s“ чрез " "пребазиране." -#: branch.c:85 +#: branch.c:94 #, c-format msgid "Branch %s set up to track remote branch %s from %s." msgstr "Клонът „%s“ ще следи клона „%s“ от отдалеченото хранилище „%s“." -#: branch.c:89 +#: branch.c:98 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." msgstr "" "Клонът „%s“ ще следи клона „%s“ от локалното хранилище чрез пребазиране." -#: branch.c:90 +#: branch.c:99 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "Клонът „%s“ ще следи клона „%s“ от локалното хранилище." -#: branch.c:95 +#: branch.c:104 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "Клонът „%s“ ще следи отдалечения указател „%s“ чрез пребазиране." -#: branch.c:96 +#: branch.c:105 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "Клонът „%s“ ще следи отдалечения указател „%s“." -#: branch.c:100 +#: branch.c:109 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "Клонът „%s“ ще следи локалния указател „%s“ чрез пребазиране." -#: branch.c:101 +#: branch.c:110 #, c-format msgid "Branch %s set up to track local ref %s." msgstr "Клонът „%s“ ще следи локалния указател „%s“." -#: branch.c:134 +#: branch.c:119 +msgid "Unable to write upstream branch configuration" +msgstr "Настройките за следения клон не могат да бъдат записани" + +#: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "Няма следене: двусмислена информация за указателя „%s“" -#: branch.c:163 +#: branch.c:185 #, c-format msgid "'%s' is not a valid branch name." msgstr "„%s“ не е позволено име за клон." -#: branch.c:168 +#: branch.c:190 #, c-format msgid "A branch named '%s' already exists." msgstr "Вече съществува клон с име „%s“." -#: branch.c:176 +#: branch.c:198 msgid "Cannot force update the current branch." msgstr "Текущият клон не може да бъде принудително обновен." -#: branch.c:196 +#: branch.c:218 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "Зададените настройки за следенето са грешни — началото „%s“ не е клон." -#: branch.c:198 +#: branch.c:220 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "заявеният отдалечен клон „%s“ не съществува" -#: branch.c:200 +#: branch.c:222 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -342,26 +363,31 @@ msgstr "" "може да използвате „git push -u“, за да настроите към кой клон да се " "изтласква." -#: branch.c:244 +#: branch.c:266 #, c-format msgid "Not a valid object name: '%s'." msgstr "Неправилно име на обект: „%s“" -#: branch.c:264 +#: branch.c:286 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Двусмислено име на обект: „%s“" -#: branch.c:269 +#: branch.c:291 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Неправилно място за начало на клон: „%s“" -#: branch.c:322 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "„%s“ вече е изтеглен в „%s“" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "Указателят „HEAD“ на работното дърво „%s“ не е обновен" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -372,7 +398,7 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi msgid "unrecognized header: %s%s (%d)" msgstr "непозната заглавна част: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "„%s“ не може да се отвори" @@ -381,10 +407,10 @@ msgstr "„%s“ не може да се отвори" msgid "Repository lacks these prerequisite commits:" msgstr "В хранилището липсват следните необходими подавания:" -#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083 -#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358 -#: builtin/shortlog.c:158 +#: 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 msgid "revision walk setup failed" msgstr "неуспешно настройване на обхождането на версиите" @@ -424,21 +450,21 @@ msgid "ref '%s' is excluded by the rev-list options" msgstr "" "указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "непознат аргумент: %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "Създаването на празна пратка е невъзможно." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "Файлът „%s“ не може да бъде създаден" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "Командата „git index-pack“ не завърши успешно" @@ -447,8 +473,8 @@ msgstr "Командата „git index-pack“ не завърши успешн msgid "invalid color value: %.*s" msgstr "неправилна стойност за цвят: %.*s" -#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520 -#: builtin/am.c:2149 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "„%s“ не може да се анализира" @@ -462,28 +488,27 @@ msgstr "%s %s не е подаване!" msgid "memory exhausted" msgstr "паметта свърши" -#: config.c:474 config.c:476 +#: config.c:475 config.c:477 #, c-format -msgid "bad config file line %d in %s" -msgstr "неправилен ред %d в „%s“" +msgid "bad config line %d in %s %s" +msgstr "неправилен ред %d в настройката %s „%s“" -#: config.c:592 +#: config.c:593 #, c-format -msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "" -"неправилна числова стойност „%s“ за настройката „%s“ в раздела „%s“: %s" +msgid "bad numeric config value '%s' for '%s' in %s %s: %s" +msgstr "неправилна числова стойност „%s“ за настройката „%s“ в %s „%s“: %s" -#: config.c:594 +#: config.c:595 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "неправилна числова стойност „%s“ за настройката „%s“: %s" -#: config.c:679 +#: config.c:680 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "домашната папка на потребителя не може да бъде открита: „%s“" -#: config.c:757 config.c:768 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "неправилно ниво на компресиране: %d" @@ -493,42 +518,50 @@ msgstr "неправилно ниво на компресиране: %d" msgid "invalid mode for object creation: %s" msgstr "неправилен режим за създаването на обекти: %s" -#: config.c:1216 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "неправилни настройки от командния ред" -#: config.c:1277 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "неочаквана грешка при изчитането на конфигурационните файлове" -#: config.c:1601 +#: config.c:1629 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "неразпозната стойност „%s“ от командния ред" -#: config.c:1603 +#: config.c:1631 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d" -#: config.c:1662 +#: config.c:1690 #, c-format msgid "%s has multiple values" msgstr "зададени са няколко стойности за „%s“" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "„%s“ не може да се зададе да е „%s“" + +#: config.c:2226 +#, c-format +msgid "could not unset '%s'" +msgstr "„%s“ не може да се премахне" + #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Командата „git rev-list“ не може да бъде изпълнена." #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "неуспешен запис на списъка с версиите: %s" +msgid "failed write to rev-list" +msgstr "неуспешен запис на списъка с версиите" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "стандартният вход на списъка с версиите не може да бъде затворен: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "стандартният вход на списъка с версиите не може да бъде затворен" #: date.c:95 msgid "in the future" @@ -603,28 +636,28 @@ msgstr[1] "преди %lu години" msgid "failed to read orderfile '%s'" msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "Търсене на преименувания на обекти съчетани с промени" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Неуспешно разпознаване на „%s“ като процент-праг за статистиката по " "директории\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Непознат параметър „%s“ за статистиката по директории'\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Непозната стойност „%s“ за настройката „diff.submodule“" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -633,17 +666,17 @@ msgstr "" "Грешки в настройката „diff.dirstat“:\n" "%s" -#: diff.c:3000 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "" "външната програма за разлики завърши неуспешно. Спиране на работата при „%s“" -#: diff.c:3396 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "Опцията „--follow“ изисква точно един път" -#: diff.c:3559 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -652,20 +685,21 @@ msgstr "" "Неразпознат параметър към опцията „--dirstat/-X“:\n" "%s" -#: diff.c:3573 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Неразпознат параметър към опцията „--submodule“: „%s“" -#: dir.c:1915 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "името и версията на ядрото не бяха получени" -#: dir.c:1998 -msgid "Untracked cache is disabled on this system." -msgstr "Кеша за неследените файлове е изключен на тази система" +#: dir.c:1942 +msgid "Untracked cache is disabled on this system or location." +msgstr "" +"Кеша за неследените файлове е изключен на тази система или местоположение." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "Програмата „gpg“ не може да бъде стартирана." @@ -679,43 +713,43 @@ msgstr "Програмата „gpg“ не подписа данните." #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "Програмата „gpg“ не успя да създаде временния файл „%s“: %s" +msgid "could not create temporary file '%s'" +msgstr "Програмата не успя да създаде временния файл „%s“" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "Програмата „gpg“ не успя да запише самостоятелния подпис към „%s“: %s" +msgid "failed writing detached signature to '%s'" +msgstr "Програмата не успя да запише самостоятелния подпис в „%s“" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "„%s“: „%s“" +msgid "failed to stat '%s'" +msgstr "не може да бъде получена информация чрез „stat“ за „%s“" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "„%s“: изчитането на „%s“ върна по-малко байтове от заявените" +msgid "'%s': short read" +msgstr "„%s“: изчитането върна по-малко байтове от заявените" -#: help.c:207 +#: help.c:205 #, c-format msgid "available git commands in '%s'" msgstr "налични команди на git от „%s“" -#: help.c:214 +#: help.c:212 msgid "git commands available from elsewhere on your $PATH" msgstr "команди на git от други директории от „$PATH“" -#: help.c:246 +#: help.c:244 msgid "These are common Git commands used in various situations:" msgstr "Това са най-често използваните команди на Git:" -#: help.c:311 +#: help.c:309 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -724,11 +758,11 @@ msgstr "" "Изглежда, че „%s“ е команда на git, но тя не може да\n" "бъде изпълнена. Вероятно пакетът „git-%s“ е повреден." -#: help.c:368 +#: help.c:366 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Странно, изглежда, че на системата ви няма нито една команда на git." -#: help.c:390 +#: help.c:388 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -739,17 +773,17 @@ msgstr "" "съществува. Изпълнението автоматично продължава, като се счита, че имате " "предвид „%s“" -#: help.c:395 +#: help.c:393 #, c-format msgid "in %0.1f seconds automatically..." msgstr "след %0.1f секунди…" -#: help.c:402 +#: help.c:400 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“." -#: help.c:406 help.c:466 +#: help.c:404 help.c:464 msgid "" "\n" "Did you mean this?" @@ -763,17 +797,41 @@ msgstr[1] "" "\n" "Команди с подобно име са:" -#: help.c:462 +#: help.c:460 #, c-format msgid "%s: %s - %s" msgstr "%s: %s — %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"Файлът-ключалка „%s.lock“ не може да бъде създаден: %s\n" +"\n" +"Изглежда, че и друг процес на git е пуснат в това хранилище, напр.\n" +"редактор, стартиран с „git commit“. Уверете се, че всички подобни\n" +"процеси са спрени и опитайте отново. Ако това не помогне, вероятната\n" +"причина е, че някой процес на git в това хранилище е забил. За да\n" +"продължите работа, ще трябва ръчно да изтриете файла:" + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "Файлът-ключалка „%s.lock“ не може да бъде създаден: %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "кешът не може да бъде прочетен" -#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:722 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "неуспешно записване на новия индекс" @@ -791,66 +849,66 @@ msgstr "неуспешно изпълнение на „addinfo_cache“ за п msgid "error building trees" msgstr "грешка при изграждане на дърветата" -#: merge-recursive.c:686 +#: merge-recursive.c:689 #, c-format msgid "failed to create path '%s'%s" msgstr "грешка при създаването на пътя „%s“%s" -#: merge-recursive.c:697 +#: merge-recursive.c:700 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n" -#: merge-recursive.c:711 merge-recursive.c:732 +#: merge-recursive.c:714 merge-recursive.c:735 msgid ": perhaps a D/F conflict?" msgstr ": възможно е да има конфликт директория/файл." -#: merge-recursive.c:722 +#: merge-recursive.c:725 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" "преустановяване на действието, за да не се изтрие неследеният файл „%s“" -#: merge-recursive.c:762 +#: merge-recursive.c:765 #, c-format msgid "cannot read object %s '%s'" msgstr "обектът „%s“ (%s) не може да бъде прочетен" -#: merge-recursive.c:764 +#: merge-recursive.c:767 #, c-format msgid "blob expected for %s '%s'" msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е" -#: merge-recursive.c:787 builtin/clone.c:369 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "директорията „%s“ не може да бъде отворена" -#: merge-recursive.c:795 +#: merge-recursive.c:798 #, c-format msgid "failed to symlink '%s'" msgstr "неуспешно създаване на символната връзка „%s“" -#: merge-recursive.c:798 +#: merge-recursive.c:801 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" "не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“" -#: merge-recursive.c:936 +#: merge-recursive.c:939 msgid "Failed to execute internal merge" msgstr "Неуспешно вътрешно сливане" -#: merge-recursive.c:940 +#: merge-recursive.c:943 #, c-format msgid "Unable to add %s to database" msgstr "„%s“ не може да се добави в базата с данни" -#: merge-recursive.c:956 +#: merge-recursive.c:959 msgid "unsupported object type in the tree" msgstr "в дървото има неподдържан вид обект" -#: merge-recursive.c:1031 merge-recursive.c:1045 +#: merge-recursive.c:1034 merge-recursive.c:1048 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -859,7 +917,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото." -#: merge-recursive.c:1037 merge-recursive.c:1050 +#: merge-recursive.c:1040 merge-recursive.c:1053 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -868,20 +926,20 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото: %s." -#: merge-recursive.c:1091 +#: merge-recursive.c:1094 msgid "rename" msgstr "преименуване" -#: merge-recursive.c:1091 +#: merge-recursive.c:1094 msgid "renamed" msgstr "преименуван" -#: merge-recursive.c:1147 +#: merge-recursive.c:1150 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“" -#: merge-recursive.c:1169 +#: merge-recursive.c:1172 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -890,150 +948,150 @@ msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s." -#: merge-recursive.c:1174 +#: merge-recursive.c:1177 msgid " (left unresolved)" msgstr " (некоригиран конфликт)" -#: merge-recursive.c:1228 +#: merge-recursive.c:1231 #, 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:1258 +#: merge-recursive.c:1261 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“" -#: merge-recursive.c:1457 +#: merge-recursive.c:1460 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а " "„%s“ е добавен в „%s“" -#: merge-recursive.c:1467 +#: merge-recursive.c:1470 #, c-format msgid "Adding merged %s" msgstr "Добавяне на слетия „%s“" -#: merge-recursive.c:1472 merge-recursive.c:1674 +#: merge-recursive.c:1475 merge-recursive.c:1677 #, c-format msgid "Adding as %s instead" msgstr "Добавяне като „%s“" -#: merge-recursive.c:1523 +#: merge-recursive.c:1526 #, c-format msgid "cannot read object %s" msgstr "обектът „%s“ не може да се прочете" -#: merge-recursive.c:1526 +#: merge-recursive.c:1529 #, c-format msgid "object %s is not a blob" msgstr "обектът „%s“ не е BLOB" -#: merge-recursive.c:1578 +#: merge-recursive.c:1581 msgid "modify" msgstr "промяна" -#: merge-recursive.c:1578 +#: merge-recursive.c:1581 msgid "modified" msgstr "променен" -#: merge-recursive.c:1588 +#: merge-recursive.c:1591 msgid "content" msgstr "съдържание" -#: merge-recursive.c:1595 +#: merge-recursive.c:1598 msgid "add/add" msgstr "добавяне/добавяне" -#: merge-recursive.c:1629 +#: merge-recursive.c:1632 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)" -#: merge-recursive.c:1643 +#: merge-recursive.c:1646 #, c-format msgid "Auto-merging %s" msgstr "Автоматично сливане на „%s“" -#: merge-recursive.c:1647 git-submodule.sh:1025 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "ПОДМОДУЛ" -#: merge-recursive.c:1648 +#: merge-recursive.c:1651 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“" -#: merge-recursive.c:1734 +#: merge-recursive.c:1737 #, c-format msgid "Removing %s" msgstr "Изтриване на „%s“" -#: merge-recursive.c:1759 +#: merge-recursive.c:1762 msgid "file/directory" msgstr "файл/директория" -#: merge-recursive.c:1765 +#: merge-recursive.c:1768 msgid "directory/file" msgstr "директория/файл" -#: merge-recursive.c:1770 +#: merge-recursive.c:1773 #, 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:1780 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Добавяне на „%s“" -#: merge-recursive.c:1797 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Фатална грешка при сливане, а такава не трябва да възниква!" -#: merge-recursive.c:1816 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Вече е обновено!" -#: merge-recursive.c:1825 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "неуспешно сливане на дърветата „%s“ и „%s“" -#: merge-recursive.c:1855 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "" "Пътят „%s“ не е обработен, това е грешка в Git, докладвайте я на " "разработчиците, като пратите е-писмо на адрес: „git@vger.kernel.org“." -#: merge-recursive.c:1903 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "Сливане:" -#: merge-recursive.c:1916 +#: merge-recursive.c:1917 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "открит е %u общ предшественик:" msgstr[1] "открити са %u общи предшественици:" -#: merge-recursive.c:1953 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "сливането не върна подаване" -#: merge-recursive.c:2010 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "Неуспешен анализ на обекта „%s“" -#: merge-recursive.c:2021 builtin/merge.c:645 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "Индексът не може да бъде прочетен" @@ -1065,28 +1123,28 @@ msgstr "Зададена е лоша стойност на променлива msgid "unable to parse object: %s" msgstr "обектът „%s“ не може да бъде анализиран" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "…" -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "употреба: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " или: %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-ЧИСЛО" @@ -1095,7 +1153,7 @@ msgstr "-ЧИСЛО" msgid "malformed object name '%s'" msgstr "неправилно име на обект „%s“" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "Не могат да се дадат права за запис в директорията „%s“ на групата" @@ -1151,12 +1209,12 @@ msgstr "Пътят „%s“ е в подмодула „%.*s“" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: магическите пътища не се поддържат от командата „%s“" -#: pathspec.c:432 +#: pathspec.c:433 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "пътят „%s“ е след символна връзка" -#: pathspec.c:441 +#: pathspec.c:442 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -1164,7 +1222,7 @@ msgstr "" "Нищо не се изключва от шаблоните за изключване.\n" "Това често се случва, ако сте забравили да добавите „:/“ или „.“." -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "аргументът към опцията „--pretty“ не може да се анализира" @@ -1191,165 +1249,250 @@ msgstr "" "„GIT_INDEX_VERSION“.\n" "Ще се ползва версия %i" -#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 -#: builtin/merge.c:983 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запис" -#: refs/files-backend.c:2359 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "Указателят „%s“ не може да бъде изтрит: %s" -#: refs/files-backend.c:2362 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "Указателите не може да бъдат изтрити: %s" -#: refs/files-backend.c:2371 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "Указателят „%s“ не може да бъде изтрит" -#: ref-filter.c:245 +#: ref-filter.c:55 #, c-format -msgid "format: %%(end) atom used without corresponding atom" -msgstr "грешка във форма̀та: лексемата %%(end) е използвана без съответната ѝ" +msgid "expected format: %%(color:<color>)" +msgstr "очакван формат: %%(color:ЦВЯТ)" + +#: ref-filter.c:57 +#, c-format +msgid "unrecognized color: %%(color:%s)" +msgstr "непознат цвят: %%(color:%s)" -#: ref-filter.c:704 +#: ref-filter.c:71 +#, c-format +msgid "unrecognized format: %%(%s)" +msgstr "непознат формат: %%(%s)" + +#: ref-filter.c:77 +#, c-format +msgid "%%(body) does not take arguments" +msgstr "%%(body) не приема аргументи" + +#: ref-filter.c:84 +#, c-format +msgid "%%(subject) does not take arguments" +msgstr "%%(subject) не приема аргументи" + +#: ref-filter.c:101 #, c-format msgid "positive value expected contents:lines=%s" msgstr "очаква се положителна стойност за „contents:lines=%s“" -#: ref-filter.c:833 +#: ref-filter.c:103 #, c-format -msgid "expected format: %%(color:<color>)" -msgstr "очакван формат: %%(color:ЦВЯТ)" +msgid "unrecognized %%(contents) argument: %s" +msgstr "непознат аргумент за %%(contents): %s" -#: ref-filter.c:835 -msgid "unable to parse format" -msgstr "форматът не може да бъде анализиран" +#: ref-filter.c:113 +#, c-format +msgid "unrecognized %%(objectname) argument: %s" +msgstr "непознат аргумент за %%(objectname): %s" -#: ref-filter.c:870 +#: ref-filter.c:135 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "очакван формат: %%(align:ШИРОЧИНА,ПОЗИЦИЯ)" -#: ref-filter.c:893 +#: ref-filter.c:147 #, c-format -msgid "improper format entered align:%s" -msgstr "въведен е неправилен формат align:%s" +msgid "unrecognized position:%s" +msgstr "непозната позиция: %s" -#: ref-filter.c:898 +#: ref-filter.c:151 +#, c-format +msgid "unrecognized width:%s" +msgstr "непозната широчина: %s" + +#: ref-filter.c:157 +#, c-format +msgid "unrecognized %%(align) argument: %s" +msgstr "непознат аргумент за %%(align): %s" + +#: ref-filter.c:161 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "очаква се положителна широчина с лексемата „%%(align)“" -#: ref-filter.c:1219 +#: ref-filter.c:244 +#, c-format +msgid "malformed field name: %.*s" +msgstr "неправилно име на обект: „%.*s“" + +#: ref-filter.c:270 +#, c-format +msgid "unknown field name: %.*s" +msgstr "непознато име на обект: „%.*s“" + +#: ref-filter.c:372 +#, c-format +msgid "format: %%(end) atom used without corresponding atom" +msgstr "грешка във форма̀та: лексемата %%(end) е използвана без съответната ѝ" + +#: ref-filter.c:424 +#, c-format +msgid "malformed format string %s" +msgstr "неправилен низ за форматиране „%s“" + +#: ref-filter.c:878 +msgid ":strip= requires a positive integer argument" +msgstr "„:strip=“ изисква аргумент цяло, положително число" + +#: ref-filter.c:883 +#, c-format +msgid "ref '%s' does not have %ld components to :strip" +msgstr "указателят „%s“ не разполага с %ld компоненти за премахване (:strip)" + +#: ref-filter.c:1046 +#, c-format +msgid "unknown %.*s format %s" +msgstr "непознато „%.*s“, формат „%s“" + +#: ref-filter.c:1066 ref-filter.c:1097 +#, c-format +msgid "missing object %s for %s" +msgstr "обектът „%s“ липсва за „%s“" + +#: ref-filter.c:1069 ref-filter.c:1100 +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“" + +#: ref-filter.c:1311 #, c-format msgid "malformed object at '%s'" msgstr "обект със сгрешен формат при „%s“" -#: ref-filter.c:1561 +#: ref-filter.c:1373 +#, c-format +msgid "ignoring ref with broken name %s" +msgstr "игнориране на указателя с грешно име „%s“" + +#: ref-filter.c:1378 +#, c-format +msgid "ignoring broken ref %s" +msgstr "игнориране на повредения указател „%s“" + +#: ref-filter.c:1651 #, c-format msgid "format: %%(end) atom missing" msgstr "грешка във форма̀та: липсва лексемата %%(end)" -#: ref-filter.c:1615 +#: ref-filter.c:1705 #, c-format msgid "malformed object name %s" msgstr "неправилно име на обект „%s“" -#: remote.c:756 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“" -#: remote.c:760 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "„%s“ обикновено следи „%s“, а не „%s“" -#: remote.c:764 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "„%s“ следи както „%s“, така и „%s“" -#: remote.c:772 +#: remote.c:762 msgid "Internal error" msgstr "Вътрешна грешка" -#: remote.c:1687 remote.c:1730 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "Указателят „HEAD“ не сочи към клон" -#: remote.c:1696 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "няма клон на име „%s“" -#: remote.c:1699 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "не е зададен клон-източник за клона „%s“" -#: remote.c:1705 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "клонът-източник „%s“ не е съхранен като следящ клон" -#: remote.c:1720 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "липсва локален следящ клон за местоположението за изтласкване „%s“ в " "хранилището „%s“" -#: remote.c:1735 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "няма информация клонът „%s“ да следи някой друг" -#: remote.c:1746 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "указателят за изтласкване на „%s“ не включва „%s“" -#: remote.c:1759 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)" -#: remote.c:1781 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "простото (simple) изтласкване не съответства на една цел" -#: remote.c:2083 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n" -#: remote.c:2087 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n" -#: remote.c:2090 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Клонът е актуализиран към „%s“.\n" -#: remote.c:2094 +#: remote.c:2085 #, 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:2100 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (публикувайте локалните си промени чрез „git push“)\n" -#: remote.c:2103 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1359,11 +1502,11 @@ msgstr[0] "" msgstr[1] "" "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде тривиално слят.\n" -#: remote.c:2111 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (обновете локалния си клон чрез „git pull“)\n" -#: remote.c:2114 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1378,28 +1521,28 @@ msgstr[1] "" "Текущият клон се е отделил от „%s“,\n" "двата имат съответно по %d и %d несъвпадащи подавания.\n" -#: remote.c:2124 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n" -#: revision.c:2193 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "Текущият клон е повреден" -#: revision.c:2196 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Текущият клон „%s“ е без подавания " -#: revision.c:2390 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими" -#: run-command.c:90 +#: run-command.c:92 msgid "open /dev/null failed" msgstr "неуспешно отваряне на „/dev/null“" -#: run-command.c:92 +#: run-command.c:94 #, c-format msgid "dup2(%d,%d) failed" msgstr "неуспешно изпълнение на dup2(%d,%d)" @@ -1425,7 +1568,7 @@ msgid "the receiving end does not support --atomic push" msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“" # FIXME git add <path…> for consistence -#: sequencer.c:183 +#: sequencer.c:174 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1433,7 +1576,7 @@ msgstr "" "след коригирането на конфликтите, отбележете съответните\n" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“." -#: sequencer.c:186 +#: sequencer.c:177 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1444,227 +1587,227 @@ msgstr "" "подайте резултата с командата „git commit'“." # FIXME - must be the same as Could not write to '%s' above -#: sequencer.c:199 sequencer.c:842 sequencer.c:922 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "„%s“ не може да бъде записан" -#: sequencer.c:202 +#: sequencer.c:193 #, c-format msgid "Error wrapping up %s" msgstr "Обработката на „%s“ не завърши успешно." -#: sequencer.c:217 +#: sequencer.c:208 msgid "Your local changes would be overwritten by cherry-pick." msgstr "Локалните ви промени ще бъдат презаписани при отбирането на подавания." -#: sequencer.c:219 +#: sequencer.c:210 msgid "Your local changes would be overwritten by revert." msgstr "Локалните ви промени ще бъдат презаписани при отмяната на подавания." -#: sequencer.c:222 +#: sequencer.c:213 msgid "Commit your changes or stash them to proceed." msgstr "Подайте или скатайте промените, за да продължите" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:309 +#: sequencer.c:300 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: новият индекс не може да бъде запазен" -#: sequencer.c:327 +#: sequencer.c:318 msgid "Could not resolve HEAD commit\n" msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито\n" -#: sequencer.c:347 +#: sequencer.c:338 msgid "Unable to update cache tree\n" msgstr "Дървото на кеша не може да бъде обновено\n" -#: sequencer.c:399 +#: sequencer.c:390 #, c-format msgid "Could not parse commit %s\n" msgstr "Подаването „%s“ не може да бъде анализирано\n" -#: sequencer.c:404 +#: sequencer.c:395 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Родителското подаване „%s“ не може да бъде анализирано\n" -#: sequencer.c:469 +#: sequencer.c:460 msgid "Your index file is unmerged." msgstr "Индексът не е слят." -#: sequencer.c:488 +#: sequencer.c:479 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Подаването „%s“ е сливане, но не е дадена опцията „-m“" -#: sequencer.c:496 +#: sequencer.c:487 #, c-format msgid "Commit %s does not have parent %d" msgstr "Подаването „%s“ няма родител %d" -#: sequencer.c:500 +#: sequencer.c:491 #, c-format 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:513 +#: sequencer.c:504 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: неразпозната стойност за родителското подаване „%s“" -#: sequencer.c:517 +#: sequencer.c:508 #, c-format msgid "Cannot get commit message for %s" msgstr "Неуспешно извличане на съобщението за подаване на „%s“" -#: sequencer.c:603 +#: sequencer.c:594 #, c-format msgid "could not revert %s... %s" msgstr "подаването „%s“… не може да бъде отменено: „%s“" -#: sequencer.c:604 +#: sequencer.c:595 #, c-format msgid "could not apply %s... %s" msgstr "подаването „%s“… не може да бъде приложено: „%s“" -#: sequencer.c:639 +#: sequencer.c:630 msgid "empty commit set passed" msgstr "зададено е празно множество от подавания" -#: sequencer.c:647 +#: sequencer.c:638 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: неуспешно изчитане на индекса" -#: sequencer.c:651 +#: sequencer.c:642 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: неуспешно обновяване на индекса" -#: sequencer.c:711 +#: sequencer.c:702 #, c-format msgid "Cannot %s during a %s" msgstr "По време на „%1$s“ не може да се извърши „%2$s“" -#: sequencer.c:733 +#: sequencer.c:724 #, c-format msgid "Could not parse line %d." msgstr "%d-ят ред не може да се анализира." -#: sequencer.c:738 +#: sequencer.c:729 msgid "No commits parsed." msgstr "Никое от подаванията не може да се разпознае." # FIXME Could not open %s. - full stop for consistence with next message -#: sequencer.c:750 +#: sequencer.c:741 #, c-format msgid "Could not open %s" msgstr "„%s“ не може да се прочете." -#: sequencer.c:754 +#: sequencer.c:745 #, c-format msgid "Could not read %s." msgstr "„%s“ не може да се отвори." -#: sequencer.c:761 +#: sequencer.c:752 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Файлът с описание на предстоящите действия — „%s“ не може да се ползва" -#: sequencer.c:791 +#: sequencer.c:782 #, c-format msgid "Invalid key: %s" msgstr "Неправилен ключ: „%s“" -#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49 +#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52 #, c-format msgid "Invalid value for %s: %s" msgstr "Неправилна стойност за „%s“: „%s“" -#: sequencer.c:804 +#: sequencer.c:795 #, c-format msgid "Malformed options sheet: %s" msgstr "Неправилно съдържание на файла с опции: „%s“" -#: sequencer.c:823 +#: sequencer.c:814 msgid "a cherry-pick or revert is already in progress" msgstr "" "в момента вече се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:824 +#: sequencer.c:815 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“" -#: sequencer.c:828 +#: sequencer.c:819 #, c-format msgid "Could not create sequencer directory %s" msgstr "Директорията за секвенсора „%s“ не може да бъде създадена" -#: sequencer.c:844 sequencer.c:926 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "Обработката на „%s“ не завърши успешно." -#: sequencer.c:863 sequencer.c:996 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "" "в момента не се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:865 +#: sequencer.c:856 msgid "cannot resolve HEAD" msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито" -#: sequencer.c:867 +#: sequencer.c:858 msgid "cannot abort from a branch yet to be born" msgstr "" "действието не може да бъде преустановено, когато сте на клон, който тепърва " "предстои да бъде създаден" -#: sequencer.c:887 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "файлът „%s“ не може да бъде отворен: %s" +msgid "cannot open %s" +msgstr "„%s“ не може да бъде отворен" -#: sequencer.c:890 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "файлът „%s“ не може да бъде прочетен: %s" -#: sequencer.c:891 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "неочакван край на файл" -#: sequencer.c:897 +#: sequencer.c:887 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е " "повреден" -#: sequencer.c:919 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "Файлът „%s“ не може да се форматира по подходящия начин." -#: sequencer.c:1064 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не може да се отбере „%s“" -#: sequencer.c:1067 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s: неправилна версия" -#: sequencer.c:1101 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "Първоначалното подаване не може да бъде отменено" -#: sequencer.c:1102 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "При празен връх не могат да се отбират подавания" @@ -1673,7 +1816,35 @@ msgstr "При празен връх не могат да се отбират п msgid "failed to read %s" msgstr "файлът „%s“ не може да бъде прочетен" -#: sha1_name.c:463 +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "Очаква се версия на хранилището на git <= %d, а не %d" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "открити са непознати разширения в хранилището:" + +#: sha1_file.c:1080 +msgid "offset before end of packfile (broken .idx?)" +msgstr "" +"отместване преди края на пакетния файл (възможно е индексът да е повреден)" + +#: sha1_file.c:2458 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "" +"отместване преди началото на индекса на пакетния файл „%s“ (възможно е " +"индексът да е повреден)" + +#: sha1_file.c:2462 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "" +"отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът " +"да е отрязан)" + +#: sha1_name.c:462 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" @@ -1697,67 +1868,315 @@ msgstr "" "спрете това съобщение като изпълните командата:\n" "„git config advice.objectNameWarning false“" -#: submodule.c:61 submodule.c:95 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Неслетите файлове „.gitmodules“ не могат да бъдат променяни. Първо " "коригирайте конфликтите" -#: submodule.c:65 submodule.c:99 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Във файла „.gitmodules“ липсва раздел за директория „path=%s“" -#: submodule.c:73 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде променен" -#: submodule.c:106 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде изтрит" -#: submodule.c:117 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "неуспешно добавяне на променения файл „.gitmodules“ в индекса" -#: submodule.c:1040 +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "Настройката „submodule.fetchJobs“ не приема отрицателни стойности" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "Неправилна стойност за „%s“" + +#: trailer.c:237 #, c-format -msgid "Could not set core.worktree in %s" -msgstr "Настройката „core.worktree“ не може да се зададе в „%s“" +msgid "running trailer command '%s' failed" +msgstr "неуспешно изпълнение на завършващата команда „%s“" -#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 -#: trailer.c:561 +#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 +#: trailer.c:562 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "неправилна стойност „%s“ за настройката „%s“" -#: trailer.c:543 trailer.c:548 builtin/remote.c:296 +#: trailer.c:544 trailer.c:549 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "стойността „%s“ се повтаря в настройките" -#: trailer.c:581 +#: trailer.c:582 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "празна завършваща лексема в епилога „%.*s“" -#: trailer.c:701 +#: trailer.c:702 #, c-format msgid "could not read input file '%s'" msgstr "входният файл „%s“ не може да бъде прочетен" -#: trailer.c:704 +#: trailer.c:705 msgid "could not read from stdin" msgstr "от стандартния вход не може да се чете" -#: transport-helper.c:1025 +#: trailer.c:857 builtin/am.c:42 +#, c-format +msgid "could not stat %s" +msgstr "Не може да се получи информация чрез „stat“ за „%s“" + +#: trailer.c:859 +#, c-format +msgid "file %s is not a regular file" +msgstr "„%s“ не е обикновен файл" + +#: trailer.c:861 +#, c-format +msgid "file %s is not writable by user" +msgstr "„%s“: няма права за записване на файла" + +#: trailer.c:873 +msgid "could not open temporary file" +msgstr "временният файл не може да се отвори" + +#: trailer.c:912 +#, c-format +msgid "could not rename temporary file to %s" +msgstr "временният файл не може да се преименува на „%s“" + +#: transport-helper.c:1041 #, c-format msgid "Could not read ref %s" msgstr "Указателят „%s“ не може да се прочете." -#: unpack-trees.c:203 +#: 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." +msgstr "" +"Изтеглянето ще презапише локалните промени на тези файлове:\n" +"%%sПодайте или скатайте промените, за да преминете към нов клон." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"Изтеглянето ще презапише локалните промени на тези файлове:\n" +"%%s" + +#: unpack-trees.c:69 +#, 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." +msgstr "" +"Сливането ще презапише локалните промени на тези файлове:\n" +"%%sПодайте или скатайте промените, за да слеете." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Сливането ще презапише локалните промени на тези файлове:\n" +"%%s" + +#: unpack-trees.c:74 +#, 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." +msgstr "" +"„%s“ ще презапише локалните промени на тези файлове:\n" +"%%sПодайте или скатайте промените, за да извършите „%s“." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"„%s“ ще презапише локалните промени на тези файлове:\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"Обновяването на тези директории ще изтрие неследените файлове в тях:\n" +"%s" + +#: unpack-trees.c:85 +#, 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." +msgstr "" +"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n" +"%%sПреместете ги или ги изтрийте, за да преминете на друг клон." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Сливането ще изтрие тези неследени файлове в работното дърво:\n" +"%%sПреместете ги или ги изтрийте, за да слеете." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"Сливането ще изтрие тези неследени файлове в работното дърво:\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"„%s“ ще изтрие тези неследени файлове в работното дърво:\n" +"%%sПреместете ги или ги изтрийте, за да извършите „%s“." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"„%s“ ще изтрие тези неследени файлове в работното дърво:\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n" +"%%sПреместете ги или ги изтрийте, за да смените клон." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Сливането ще презапише тези неследени файлове в работното дърво:\n" +"%%sПреместете ги или ги изтрийте, за да слеете." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Сливането ще презапише тези неследени файлове в работното дърво:\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"„%s“ ще презапише тези неследени файлове в работното дърво:\n" +"%%sПреместете ги или ги изтрийте, за да извършите „%s“." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"„%s“ ще презапише тези неследени файлове в работното дърво:\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "Записът за „%s“ съвпада с този за „%s“. Не може да се присвои." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"Частичното изтегляне не може да бъде обновено: следните записи не са " +"актуални:\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Обновяването на частичното изтегляне ще презапише тези файлове в работното " +"дърво:\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Обновяването на частичното изтегляне ще изтрие тези файлове в работното " +"дърво:\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "Преустановяване на действието\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "Изтегляне на файлове" @@ -1790,210 +2209,206 @@ msgstr "неправилен номер на порт" msgid "invalid '..' path segment" msgstr "неправилна част от пътя „..“" -#: wrapper.c:219 wrapper.c:362 +#: wrapper.c:222 wrapper.c:381 #, c-format msgid "could not open '%s' for reading and writing" msgstr "„%s“ не може да бъде отворен и за четене, и за запис" -#: wrapper.c:221 wrapper.c:364 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запис" -#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691 -#: builtin/merge.c:1074 builtin/pull.c:380 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "файлът не може да бъде прочетен: „%s“" -#: wrapper.c:579 -#, c-format -msgid "unable to access '%s': %s" -msgstr "няма достъп до „%s“: %s" - -#: wrapper.c:600 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "няма достъп до „%s“" -#: wrapper.c:608 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "текущата работна директория е недостъпна" -#: wrapper.c:635 +#: 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:646 builtin/am.c:425 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "„%s“ не може да бъде записан" -#: wrapper.c:652 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "„%s“ не може да се затвори" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Неслети пътища:" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (използвайте „git reset %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" " (използвайте „git rm --cached %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" " (използвайте „git add ФАЙЛ…“, за да укажете разрешаването на конфликта)" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (използвайте „git add/rm ФАЙЛ…“, според решението, което избирате за " "конфликта)" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "Промени, които ще бъдат подадени:" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "Промени, които не са в индекса за подаване:" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (използвайте „git add ФАЙЛ…“, за да обновите съдържанието за подаване)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (използвайте „git add/rm ФАЙЛ…“, за да обновите съдържанието за подаване)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (използвайте „git checkout -- ФАЙЛ…“, за да отхвърлите промените в " "работното дърво)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (подайте или отхвърлете неследеното или промененото съдържание в " "подмодулите)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (използвайте „git %s ФАЙЛ…“, за да определите какво включвате в подаването)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "изтрити в двата случая:" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "добавени от вас:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "изтрити от тях:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "добавени от тях:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "изтрити от вас:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "добавени и в двата случая:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "променени и в двата случая:" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "грешка: състоянието на промяната „%x“ не може да бъде обработено" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "нов файл:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "копиран:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "изтрит:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "променен:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "преименуван:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "смяна на вида:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "непозната промяна:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "неслят:" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "нови подавания, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "променено съдържание, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "неследено съдържание, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "грешка: състоянието на промяната „%c“ не може да бъде обработено" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Подмодулите са променени, но не са обновени:" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Промени в подмодулите за подаване:" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2001,39 +2416,39 @@ msgstr "" "Не променяйте горния ред.\n" "Всичко отдолу ще бъде изтрито." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Някои пътища не са слети." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (коригирайте конфликтите и изпълнете „git commit“)" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "Всички конфликти са решени, но продължавате сливането." -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " (използвайте „git commit“, за да завършите сливането)" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "В момента прилагате поредица от кръпки чрез „git am“." -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "Текущата кръпка е празна." -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (използвайте „git am --abort“, за да възстановите първоначалния клон)" @@ -2187,43 +2602,43 @@ msgstr "" " (използвайте „git bisect reset“, за да се върнете към първоначалното " "състояние и клон)" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "На клон " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "извършвате интерактивно пребазиране върху " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "извършвате пребазиране върху " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "Указателят „HEAD“ не е свързан и е при " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "Указателят „HEAD“ не е свързан и е отделѐн от " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "Извън всички клони." -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "Първоначално подаване" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "Неследени файлове" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "Игнорирани файлове" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2235,32 +2650,32 @@ msgstr "" "изпълнението, но не трябва да забравяте ръчно да добавяте новите файлове.\n" "За повече подробности погледнете „git status help“." -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "Неследените файлове не са изведени%s" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "Няма промени" -#: wt-status.c:1513 +#: wt-status.c:1535 #, 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:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "към индекса за подаване не са добавени промени\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2269,52 +2684,56 @@ msgstr "" "към индекса за подаване не са добавени промени, но има нови файлове " "(използвайте „git add“, за да започне тяхното следене)\n" -#: wt-status.c:1522 +#: wt-status.c:1544 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n" -#: wt-status.c:1525 +#: wt-status.c:1547 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "липсват каквито и да е промени (създайте или копирайте файлове и използвайте " "„git add“, за да започне тяхното следене)\n" -#: wt-status.c:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "липсват каквито и да е промени\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и " "неследените файлове)\n" -#: wt-status.c:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "липсват каквито и да е промени, работното дърво е чисто\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "Първоначално подаване на клон" -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (извън клон)" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "изтрит" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "назад с " -#: compat/precompose_utf8.c:56 builtin/clone.c:408 +#: wt-status.c:1702 wt-status.c:1705 +msgid "ahead " +msgstr "напред с " + +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "неуспешно изтриване на „%s“" @@ -2328,7 +2747,7 @@ msgstr "git add [ОПЦИЯ…] [--] ПЪТ…" msgid "unexpected diff status %c" msgstr "неочакван изходен код при генериране на разлика: %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "неуспешно обновяване на файловете" @@ -2341,7 +2760,7 @@ msgstr "изтриване на „%s“\n" msgid "Unstaged changes after refreshing the index:" msgstr "Промени, които и след обновяването на индекса не са добавени към него:" -#: builtin/add.c:194 builtin/rev-parse.c:796 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "Индексът не може да бъде прочетен" @@ -2377,15 +2796,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n" -#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543 -#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162 +#: 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 msgid "dry run" msgstr "пробно изпълнeние" -#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114 +#: 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 "повече подробности" @@ -2393,7 +2812,7 @@ msgstr "повече подробности" msgid "interactive picking" msgstr "интерактивно отбиране на промени" -#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "интерактивен избор на парчета код" @@ -2465,138 +2884,123 @@ msgstr "Нищо не е зададено и нищо не е добавено.\ 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:938 -#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:40 +#: 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 msgid "index file corrupt" msgstr "файлът с индекса е повреден" -#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430 +#: 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:42 -#, c-format -msgid "could not stat %s" -msgstr "Не може да се получи информация чрез „stat“ за „%s“" - -#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: builtin/am.c:445 +#: builtin/am.c:430 msgid "could not parse author script" msgstr "скриптът за автор не може да се анализира" -#: builtin/am.c:522 +#: builtin/am.c:507 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "„%s“ бе изтрит от куката „applypatch-msg“" -#: builtin/am.c:563 builtin/notes.c:300 +#: builtin/am.c:548 builtin/notes.c:300 #, c-format msgid "Malformed input line: '%s'." msgstr "Даденият входен ред е с неправилен формат: „%s“." -#: builtin/am.c:600 builtin/notes.c:315 +#: builtin/am.c:585 builtin/notes.c:315 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Бележката не може да се копира от „%s“ към „%s“" -#: builtin/am.c:626 +#: builtin/am.c:611 msgid "fseek failed" msgstr "неуспешно изпълнение на „fseek“" -#: builtin/am.c:787 builtin/am.c:875 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "„%s“ не може да бъде отворен за четене: %s" - -#: builtin/am.c:794 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "„%s“ не може да бъде отворен за запис: %s" - -#: builtin/am.c:803 +#: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" msgstr "кръпката „%s“ не може да се анализира" -#: builtin/am.c:868 +#: builtin/am.c:853 msgid "Only one StGIT patch series can be applied at once" msgstr "" "Само една серия кръпки от „StGIT“ може да бъде прилагана в даден момент" -#: builtin/am.c:916 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "неправилна стойност за време" -#: builtin/am.c:919 builtin/am.c:927 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "неправилен ред за дата „Date“" -#: builtin/am.c:924 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "неправилно отместване на часовия пояс" -#: builtin/am.c:1011 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "Форматът на кръпката не може да бъде определен." -#: builtin/am.c:1016 builtin/clone.c:373 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/am.c:1020 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "Кръпките не могат да бъдат разделени." -#: builtin/am.c:1152 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "индексът не може да бъде записан" -#: builtin/am.c:1203 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "След коригирането на този проблем изпълнете „%s --continue“." -#: builtin/am.c:1204 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Ако предпочитате да прескочите тази кръпка, изпълнете „%s --skip“." -#: builtin/am.c:1205 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "За да се върнете към първоначалното състояние, изпълнете „%s --abort“." -#: builtin/am.c:1343 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "Празна кръпка. Дали не е разделена погрешно?" -#: builtin/am.c:1417 builtin/log.c:1347 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "грешна идентичност: %s" -#: builtin/am.c:1444 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "подаването не може да бъде анализирано: %s" -#: builtin/am.c:1646 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "В хранилището липсват необходимите обекти BLOB, за да се премине към тройно " "сливане." -#: builtin/am.c:1648 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "Базовото дърво се реконструира от информацията в индекса…" -#: builtin/am.c:1667 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2604,39 +3008,39 @@ msgstr "" "Кръпката не може да се приложи към обектите BLOB в индекса.\n" "Да не би да сте я редактирали на ръка?" -#: builtin/am.c:1673 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…" -#: builtin/am.c:1688 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "Неуспешно сливане на промените." -#: builtin/am.c:1712 builtin/merge.c:632 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "Командата „git write-tree“ не успя да запише обект-дърво" -#: builtin/am.c:1719 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "прилагане върху празна история" -#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829 -#: builtin/merge.c:854 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "обектът за подаването не може да бъде записан" -#: builtin/am.c:1764 builtin/am.c:1768 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "не може да се продължи — „%s“ не съществува." -#: builtin/am.c:1784 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "За интерактивно изпълнение е необходимо стандартният\n" "изход да е свързан с терминал, а в момента не е." -#: builtin/am.c:1789 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "Тялото на кръпката за прилагане е:" @@ -2644,38 +3048,38 @@ msgstr "Тялото на кръпката за прилагане е:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1799 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане " "на всичко:" -#: builtin/am.c:1849 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" "Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)" -#: builtin/am.c:1884 builtin/am.c:1955 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "Прилагане: %.*s" -#: builtin/am.c:1900 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "Без промени — кръпката вече е приложена." -#: builtin/am.c:1908 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "Неуспешно прилагане на кръпка при %s %.*s“" -#: builtin/am.c:1914 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "Дубликат на проблемната кръпка се намира в: %s" -#: builtin/am.c:1958 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2685,7 +3089,7 @@ msgstr "" "Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n" "кръпка е довела до същите промени и в такъв случай просто пропуснете тази." -#: builtin/am.c:1965 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2693,17 +3097,17 @@ msgstr "" "Индексът все още съдържа неслети промени.\n" "Възможно е да не сте изпълнили „git add“." -#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "„%s“ не е разпознат като обект." -#: builtin/am.c:2125 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "индексът не може да бъде изчистен" -#: builtin/am.c:2159 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2714,157 +3118,159 @@ msgstr "" "към\n" "„ORIG_HEAD“" -#: builtin/am.c:2220 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Неправилна стойност за „--patch-format“: „%s“" -#: builtin/am.c:2253 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [ОПЦИЯ…] [ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА]…" -#: builtin/am.c:2254 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)" -#: builtin/am.c:2260 +#: builtin/am.c:2245 msgid "run interactively" msgstr "интерактивна работа" -#: builtin/am.c:2262 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "изоставена опция, съществува по исторически причини, нищо не прави" -#: builtin/am.c:2264 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "да се преминава към тройно сливане при нужда." -#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "без извеждане на информация" -#: builtin/am.c:2267 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "добавяне на ред за подпис „Signed-off-by“ в съобщението за подаване" -#: builtin/am.c:2270 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "прекодиране в UTF-8 (стандартно)" -#: builtin/am.c:2272 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "подаване на опцията „-k“ на командата „git-mailinfo“" -#: builtin/am.c:2274 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "подаване на опцията „-b“ на командата „git-mailinfo“" -#: builtin/am.c:2276 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "подаване на опцията „-m“ на командата „git-mailinfo“" -#: builtin/am.c:2278 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" "подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“" -#: builtin/am.c:2281 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо " "от „am.keepcr“" -#: builtin/am.c:2284 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "пропускане на всичко преди реда за отрязване" -#: builtin/am.c:2285 builtin/apply.c:4554 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "действие" -#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295 -#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 -#: builtin/am.c:2313 +#: 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 msgid "pass it through git-apply" msgstr "прекарване през „git-apply“" -#: builtin/am.c:2294 builtin/apply.c:4578 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "НАЧАЛНА_ДИРЕКТОРИЯ" -#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516 -#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93 -#: builtin/pull.c:167 builtin/submodule--helper.c:78 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 +#: 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:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127 +#: 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/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 #: parse-options.h:134 parse-options.h:244 msgid "n" msgstr "БРОЙ" -#: builtin/am.c:2306 builtin/apply.c:4522 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "БРОЙ" -#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "ФОРМАТ" -#: builtin/am.c:2310 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "формат на кръпките" -#: builtin/am.c:2316 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "избрано от вас съобщение за грешка при прилагане на кръпки" -#: builtin/am.c:2318 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "продължаване на прилагането на кръпки след коригирането на конфликт" -#: builtin/am.c:2321 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "синоними на „--continue“" -#: builtin/am.c:2324 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "прескачане на текущата кръпка" -#: builtin/am.c:2327 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "" "възстановяване на първоначалното състояние на клона и преустановяване на " "прилагането на кръпката." -#: builtin/am.c:2331 +#: builtin/am.c:2316 msgid "lie about committer date" -msgstr "дата за подаване различна от първоначалнота" +msgstr "дата за подаване различна от първоначалната" -#: builtin/am.c:2333 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "използване на текущото време като това за автор" -#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ" -#: builtin/am.c:2336 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "подписване на подаванията с GPG" -#: builtin/am.c:2339 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(ползва се вътрешно за „git-rebase“)" -#: builtin/am.c:2354 +#: builtin/am.c:2339 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." @@ -2872,18 +3278,18 @@ msgstr "" "Опциите „-b“/„--binary“ отдавна не правят нищо и\n" "ще бъдат премахнати в бъдеще. Не ги ползвайте." -#: builtin/am.c:2361 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "неуспешно изчитане на индекса" -#: builtin/am.c:2376 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "предишната директория за пребазиране „%s“ все още съществува, а е зададен " "файл „mbox“." -#: builtin/am.c:2400 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2892,7 +3298,7 @@ msgstr "" "Открита е излишна директория „%s“.\n" "Можете да я изтриете с командата „git am --abort“." -#: builtin/am.c:2406 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "В момента не тече операция по коригиране и няма как да се продължи." @@ -2925,45 +3331,45 @@ msgstr "Регулярният израз върна %d при подадена msgid "unable to find filename in patch at line %d" msgstr "Липсва име на файл на ред %d от кръпката" -#: builtin/apply.c:940 +#: 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:944 +#: 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:945 +#: 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:952 +#: 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:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "част от кръпка без заглавна част на ред %d: %.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2978,65 +3384,65 @@ msgstr[1] "" "След съкращаването на първите %d части от компонентите на пътя, в заглавната " "част на „git diff“ липсва информация за име на файл (ред: %d)" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "новият файл зависи от старото съдържание на файла" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "изтритият файл не е празен" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "грешка в кръпката на ред %d" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "новият файл „%s“ зависи от старото съдържание на файла" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "изтритият файл „%s“ не е празен" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "● предупреждение: файлът „%s“ вече е празен, но не е изтрит" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "грешка в двоичната кръпка на ред %d: %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "неразпозната двоичната кръпка на ред %d" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "кръпката е с изцяло повредени данни на ред %d" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "символната връзка „%s“ не може да бъде прочетена" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "файлът „%s“ не може да бъде отворен или прочетен" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "неправилно начало на ред: „%c“" -#: builtin/apply.c:2896 +#: 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)." @@ -3045,13 +3451,13 @@ msgstr[0] "" msgstr[1] "" "%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)." -#: builtin/apply.c:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" "Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3060,328 +3466,338 @@ msgstr "" "при търсене за:\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "липсват данните за двоичната кръпка за „%s“" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "двоичната кръпка не може да бъде приложена върху „%s“" -#: builtin/apply.c:3041 +#: 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:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "неуспешно прилагане на кръпка: „%s:%ld“" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "„%s“ не може да се изтегли" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "неуспешно прочитане на „%s“" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "изчитане на „%s“ след проследяване на символна връзка" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "обектът с път „%s“ е преименуван или изтрит" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "„%s“ не съществува в индекса" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "„%s“: %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "„%s“ не съответства на индекса" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "изтриващата кръпка оставя файла непразен" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "„%s“: неправилен вид" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "„%s“ е от вид „%o“, а се очакваше „%o“" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "неправилен път: „%s“" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "„%s“: вече съществува в индекса" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "„%s“: вече съществува в работното дърво" -#: builtin/apply.c:3769 +#: 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:3774 +#: 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:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "засегнатият файл „%s“ е след символна връзка" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "Кръпката „%s“ не може да бъде приложена" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "Проверяване на кръпката „%s“…" -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: 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:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "„%s“ не може да се извади от индекса" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "повредена кръпка за модула „%s“" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" "не може да се получи информация чрез „stat“ за новосъздадения файл „%s“" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "не може да се за създаде мястото за съхранение на новосъздадения файл „%s“" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "не може да се добави запис в кеша за „%s“" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "затваряне на файла „%s“" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "Кръпката „%s“ бе приложена чисто." -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "вътрешна грешка" -#: builtin/apply.c:4269 +#: 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:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“" -#: builtin/apply.c:4300 +#: 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:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "%d-то парче бе отхвърлено." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Пропусната кръпка: „%s“" + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "непознат вход" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "индексът не може да бъде записан" -#: builtin/apply.c:4517 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "без прилагане на промените напасващи на дадения път" -#: builtin/apply.c:4520 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "прилагане на промените напасващи на дадения път" -#: builtin/apply.c:4523 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата" -#: builtin/apply.c:4526 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "игнориране на редовете добавени от тази кръпка" -#: builtin/apply.c:4528 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "извеждане на статистика на промените без прилагане на кръпката" -#: builtin/apply.c:4532 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "извеждане на броя на добавените и изтритите редове" -#: builtin/apply.c:4534 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "извеждане на статистика на входните данни без прилагане на кръпката" -#: builtin/apply.c:4536 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "проверка дали кръпката може да се приложи, без действително прилагане" -#: builtin/apply.c:4538 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "проверка дали кръпката може да бъде приложена към текущия индекс" -#: builtin/apply.c:4540 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "прилагане на кръпката без промяна на работното дърво" -#: builtin/apply.c:4542 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "прилагане на кръпка, която променя и файлове извън работното дърво" -#: builtin/apply.c:4544 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--" "summary“" -#: builtin/apply.c:4546 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно" -#: builtin/apply.c:4548 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "" "създаване на временен индекс на база на включената информация за индекса" -#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412 +#: 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:4553 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове" -#: builtin/apply.c:4555 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "засичане на нови или променени редове с грешки в знаците за интервали" -#: builtin/apply.c:4558 builtin/apply.c:4561 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "" "игнориране на промените в знаците за интервали при откриване на контекста" -#: builtin/apply.c:4564 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "прилагане на кръпката в обратна посока" -#: builtin/apply.c:4566 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "без изискване на дори и един ред контекст" -#: builtin/apply.c:4568 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“" -#: builtin/apply.c:4570 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "позволяване на застъпващи се парчета" -#: builtin/apply.c:4573 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл" -#: builtin/apply.c:4576 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "без доверяване на номерата на редовете в заглавните части на парчетата" -#: builtin/apply.c:4579 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове" -#: builtin/apply.c:4601 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "като „--3way“, но извън хранилище" -#: builtin/apply.c:4609 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "като „--index“, но извън хранилище" -#: builtin/apply.c:4612 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "като „--cached“, но извън хранилище" -#: builtin/apply.c:4631 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "кръпката „%s“ не може да бъде отворена" -#: builtin/apply.c:4645 +#: 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:4651 builtin/apply.c:4661 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3436,120 +3852,128 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" "обновяване на указателя „BISECT_HEAD“ вместо да се използва текущото подаване" -#: builtin/blame.c:32 +#: builtin/blame.c:33 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗА_ВЕРСИЯТА…] [ВЕРСИЯ] [--] ФАЙЛ" -#: builtin/blame.c:37 +#: builtin/blame.c:38 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "ОПЦИИте_ЗА_ВЕРСИЯТА са документирани в ръководството git-rev-list(1)" -#: builtin/blame.c:2519 +#: builtin/blame.c:1782 +msgid "Blaming lines" +msgstr "Анотирани редове" + +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "Извеждане на анотациите с намирането им, последователно" # FIXME SHA-1 -> SHA1 -#: builtin/blame.c:2520 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Извеждане на празни суми по SHA1 за граничните подавания (стандартно опцията " "е изключена)" -#: builtin/blame.c:2521 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Началните подавания да не се считат за гранични (стандартно опцията е " "изключена)" -#: builtin/blame.c:2522 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "Извеждане на статистика за извършените действия" -#: builtin/blame.c:2523 +#: builtin/blame.c:2535 +msgid "Force progress reporting" +msgstr "Принудително извеждане на напредъка" + +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "Извеждане на допълнителна информация за определянето на анотациите" -#: builtin/blame.c:2524 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "" "Извеждане на първоначалното име на файл (стандартно това е автоматично)" -#: builtin/blame.c:2525 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "" "Извеждане на първоначалният номер на ред (стандартно опцията е изключена)" -#: builtin/blame.c:2526 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "Извеждане във формат за по-нататъшна обработка" -#: builtin/blame.c:2527 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "" "Извеждане във формат за команди от потребителско ниво с информация на всеки " "ред" -#: builtin/blame.c:2528 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Използване на същия формат като „git-annotate“ (стандартно опцията е " "изключена)" -#: builtin/blame.c:2529 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "Извеждане на неформатирани времена (стандартно опцията е изключена)" -#: builtin/blame.c:2530 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "Извеждане на пълните суми по SHA1 (стандартно опцията е изключена)" -#: builtin/blame.c:2531 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "Без име на автор и време на промяна (стандартно опцията е изключена)" -#: builtin/blame.c:2532 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "" "Извеждане на е-пощата на автора, а не името му (стандартно опцията е " "изключена)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "Без разлики в знаците за интервали" -#: builtin/blame.c:2534 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "Допълнителни изчисления за по-добри резултати" -#: builtin/blame.c:2535 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Изчитане на версиите от ФАЙЛ, а не чрез изпълнение на „git-rev-list“" -#: builtin/blame.c:2536 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "Използване на съдържанието на ФАЙЛа като крайно положение" -#: builtin/blame.c:2537 builtin/blame.c:2538 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "напасване на редовете" -#: builtin/blame.c:2537 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "" "Търсене на копирани редове както в рамките на един файл, така и от един файл " "към друг" -#: builtin/blame.c:2538 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "" "Търсене на преместени редове както в рамките на един файл, така и от един " "файл към друг" -#: builtin/blame.c:2539 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2539 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "" "Информация само за редовете в интервала от n до m включително. Броенето " @@ -3561,31 +3985,31 @@ 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:2620 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "преди 4 години и 11 месеца" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [ОПЦИЯ…] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [ОПЦИЯ…] [-l] [-f] ИМЕ_НА_КЛОН [НАЧАЛО]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [ОПЦИЯ…] [-r] (-d | -D) ИМЕ_НА_КЛОН…" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [ОПЦИЯ…] (-m | -M) [СТАР_КЛОН] НОВ_КЛОН" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [ОПЦИЯ…] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3594,7 +4018,7 @@ msgstr "" "изтриване на клона „%s“, който е слят към „%s“,\n" " но още не е слят към върха „HEAD“." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3603,12 +4027,12 @@ msgstr "" "отказване на изтриване на клона „%s“, който не е слят към\n" " „%s“, но е слят към върха „HEAD“." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Обектът-подаване за „%s“ не може да бъде открит" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3617,301 +4041,322 @@ msgstr "" "Клонът „%s“ не е слят напълно. Ако сте сигурни, че искате\n" "да го изтриете, изпълнете „git branch -D %s“." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "Неуспешно обновяване на конфигурационния файл" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "Опцията „-a“ е несъвместима с опцията „-d“" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "Обектът-подаване, сочен от указателя „HEAD“, не може да бъде открит" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "Не можете да изтриете текущия клон „%s“" +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "Не можете да изтриете клона „%s“, който е изтеглен в пътя „%s“" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "следящият клон „%s“ не може да бъде открит." -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "клонът „%s“ не може да бъде открит." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Грешка при изтриването на следящия клон „%s“" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "Грешка при изтриването на клона „%s“" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Изтрит следящ клон „%s“ (той сочеше към „%s“).\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: изтрит]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: назад с %d]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[назад с %d]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: напред с %d]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[напред с %d]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: напред с %d, назад с %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[напред с %d, назад с %d]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " ●●● неправилен указател ●●●" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(извън клон, пребазиране на „%s“)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(извън клон, двоично търсене от „%s“)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(Указателят „HEAD“ не е свързан и е при „%s“)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "Указателят „HEAD“ не е свързан и е отделѐн от „%s“" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(извън клон)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "Клонът „%s“ се пребазира върху „%s“" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "Търси се двоично в клона „%s“ при „%s“" + +#: builtin/branch.c:560 msgid "cannot rename the current branch while not on any." msgstr "" "не можете да преименувате текущия клон, защото сте извън който и да е клон" -#: builtin/branch.c:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "Неправилно име на клон: „%s“" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "Неуспешно преименуване на клон" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "На клона с неправилно име „%s“ е дадено служебно име" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен" -#: builtin/branch.c:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "Клонът е преименуван, но конфигурационният файл не е обновен" -#: builtin/branch.c:587 -#, c-format -msgid "could not write branch description template: %s" -msgstr "шаблонът за описание на клон не бе записан: „%s“" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "шаблонът за описание на клон не бе записан" -#: builtin/branch.c:616 +#: builtin/branch.c:651 msgid "Generic options" msgstr "Общи настройки" -#: builtin/branch.c:618 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "" "извеждане на хеша и темата. Повтарянето на опцията прибавя отдалечените клони" -#: builtin/branch.c:619 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "без информационни съобщения" -#: builtin/branch.c:620 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "задаване на режима на следене (виж git-pull(1))" -#: builtin/branch.c:622 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "смяна на следения клон" -#: builtin/branch.c:626 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "клон-източник" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "смяна на клона-източник" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "цветен изход" -#: builtin/branch.c:627 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "действие върху следящите клони" -#: builtin/branch.c:629 builtin/branch.c:630 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" -msgstr "извеждане само на клоните, които съдържат това подаване" +msgstr "извеждане само на клоните, които съдържат това ПОДАВАНЕ" -#: builtin/branch.c:633 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "Специални действия на „git-branch“:" -#: builtin/branch.c:634 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "извеждане както на следящите, така и на локалните клони" -#: builtin/branch.c:636 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "изтриване на клони, които са напълно слети" -#: builtin/branch.c:637 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "изтриване и на клони, които не са напълно слети" -#: builtin/branch.c:638 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "" "преместване/преименуване на клон и принадлежащият му журнал на указателите" -#: builtin/branch.c:639 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име" -#: builtin/branch.c:640 +#: builtin/branch.c:675 msgid "list branch names" msgstr "извеждане на имената на клоните" -#: builtin/branch.c:641 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "създаване на журнала на указателите на клона" -#: builtin/branch.c:643 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "редактиране на описанието на клона" -#: builtin/branch.c:644 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "принудително създаване, преместване, преименуване, изтриване" -#: builtin/branch.c:645 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "извеждане само на слетите клони" -#: builtin/branch.c:646 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "извеждане само на неслетите клони" -#: builtin/branch.c:647 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "извеждане по колони" -#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" -msgstr "ключ" +msgstr "КЛЮЧ" -#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "име на полето, по което да е подредбата" -#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398 -#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564 +#: 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/tag.c:369 msgid "object" -msgstr "обект" +msgstr "ОБЕКТ" -#: builtin/branch.c:652 +#: builtin/branch.c:687 msgid "print only branches of the object" -msgstr "извеждане само на клоните на обекта" +msgstr "извеждане само на клоните на ОБЕКТА" -#: builtin/branch.c:670 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "Не може да се открие към какво сочи указателят „HEAD“" -#: builtin/branch.c:674 builtin/clone.c:697 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "В директорията „refs/heads“ липсва файл „HEAD“" -#: builtin/branch.c:694 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "Опциите „--column“ и „--verbose“ са несъвместими" -#: builtin/branch.c:705 builtin/branch.c:747 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "Необходимо е име на клон" -#: builtin/branch.c:723 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "Не може да зададете описание на „HEAD“ извън клон" -#: builtin/branch.c:728 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "Не може да редактирате описанието на повече от един клон едновременно" -#: builtin/branch.c:735 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "В клона „%s“ все още няма подавания." -#: builtin/branch.c:738 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "Липсва клон на име „%s“." -#: builtin/branch.c:753 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "Прекалено много клони за преименуване" -#: builtin/branch.c:758 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "Зададени са прекалено много клони за следене" -#: builtin/branch.c:762 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3919,39 +4364,39 @@ msgstr "" "Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към " "никой клон." -#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "Няма клон на име „%s“." -#: builtin/branch.c:769 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "Не съществува клон на име „%s“." -#: builtin/branch.c:781 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "Прекалено много клони за махане на следене" -#: builtin/branch.c:785 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон." -#: builtin/branch.c:791 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Няма информация клонът „%s“ да следи някой друг" -#: builtin/branch.c:805 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "Няма никакъв смисъл ръчно да създавате „HEAD“." -#: builtin/branch.c:811 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "Опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон" -#: builtin/branch.c:814 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3960,7 +4405,7 @@ msgstr "" "Опцията „--set-upstream“ вече е остаряла и предстои да бъде махната. " "Използвайте „--track“ или „--set-upstream-to“\n" -#: builtin/branch.c:831 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3971,16 +4416,6 @@ msgstr "" "За да накарате „%s“ да следи „%s“, изпълнете следната команда:\n" "\n" -#: builtin/branch.c:832 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:833 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -4077,7 +4512,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:96 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 msgid "read file names from stdin" msgstr "изчитане на имената на файловете от стандартния вход" @@ -4085,7 +4520,7 @@ msgstr "изчитане на имената на файловете от ста msgid "terminate input and output records by a NUL character" msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“" -#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "без показване на напредъка" @@ -4138,49 +4573,54 @@ msgstr "контактът не може да бъде анализиран: %s" msgid "no contacts specified" msgstr "не са указани контакти" -#: builtin/checkout-index.c:126 +#: builtin/checkout-index.c:127 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [ОПЦИЯ…] [--] [ФАЙЛ…]" -#: builtin/checkout-index.c:188 +#: builtin/checkout-index.c:144 +msgid "stage should be between 1 and 3 or all" +msgstr "етапът трябва да е „1“, „2“, „3“ или „all“ (всички)" + +#: builtin/checkout-index.c:160 msgid "check out all files in the index" msgstr "изтегляне на всички файлове в индекса" -#: builtin/checkout-index.c:189 +#: builtin/checkout-index.c:161 msgid "force overwrite of existing files" msgstr "презаписване на файловете, дори и да съществуват" -#: builtin/checkout-index.c:191 +#: builtin/checkout-index.c:163 msgid "no warning for existing files and files not in index" msgstr "без предупреждения при липсващи файлове и файлове не в индекса" -#: builtin/checkout-index.c:193 +#: builtin/checkout-index.c:165 msgid "don't checkout new files" msgstr "без изтегляне на нови файлове" -#: builtin/checkout-index.c:195 +#: builtin/checkout-index.c:167 msgid "update stat information in the index file" msgstr "обновяване на информацията получена чрез „stat“ за файловете в индекса" -#: builtin/checkout-index.c:201 +#: builtin/checkout-index.c:171 msgid "read list of paths from the standard input" msgstr "изчитане на пътищата от стандартния вход" -#: builtin/checkout-index.c:203 +#: builtin/checkout-index.c:173 msgid "write the content to temporary files" msgstr "записване на съдържанието във временни файлове" -#: builtin/checkout-index.c:204 builtin/column.c:30 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 -#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181 +#: 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 msgid "string" msgstr "НИЗ" -#: builtin/checkout-index.c:205 +#: builtin/checkout-index.c:175 msgid "when creating files, prepend <string>" msgstr "при създаването на нови файлове да се добавя префикса НИЗ" -#: builtin/checkout-index.c:208 +#: builtin/checkout-index.c:177 msgid "copy out the files from named stage" msgstr "копиране на файловете от това състояние на сливане" @@ -4222,45 +4662,49 @@ msgstr "пътят „%s“ не може да бъде слян" msgid "Unable to add merge result for '%s'" msgstr "Резултатът за „%s“ не може да бъде слян" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "Опцията „%s“ е несъвместима с обновяването на пътища" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "Опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "повреден файл на индекса" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "пътят „%s“ не е слят" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "първо трябва да коригирате индекса си" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "Указателят „HEAD“ в момента сочи към" +#: builtin/checkout.c:664 builtin/clone.c:661 +msgid "unable to update HEAD" +msgstr "Указателят „HEAD“ не може да бъде обновен" + #: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" @@ -4276,7 +4720,7 @@ msgstr "Вече сте на „%s“\n" msgid "Switched to and reset branch '%s'\n" msgstr "Преминаване към клона „%s“ и зануляване на промените\n" -#: builtin/checkout.c:677 builtin/checkout.c:1066 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Преминахте към новия клон „%s“\n" @@ -4348,7 +4792,7 @@ msgstr "вътрешна грешка при обхождането на вер msgid "Previous HEAD position was" msgstr "Преди това „HEAD“ сочеше към" -#: builtin/checkout.c:823 builtin/checkout.c:1061 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "В момента сте на клон, който предстои да бъде създаден" @@ -4357,137 +4801,137 @@ msgstr "В момента сте на клон, който предстои да msgid "only one reference expected, %d given." msgstr "очакваше се един указател, а сте подали %d." -#: builtin/checkout.c:1007 builtin/worktree.c:213 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "неправилен указател: %s" -#: builtin/checkout.c:1036 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "указателят не сочи към обект-дърво: %s" -#: builtin/checkout.c:1075 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "задаването на път е несъвместимо с преминаването от един клон към друг" -#: builtin/checkout.c:1078 builtin/checkout.c:1082 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг" -#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094 -#: builtin/checkout.c:1097 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:1102 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" "За да преминете към клон, подайте указател, който сочи към подаване. „%s“ не " "е такъв" -#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320 -#: builtin/worktree.c:322 +#: 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 msgid "branch" msgstr "клон" -#: builtin/checkout.c:1136 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "създаване и преминаване към нов клон" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "създаване/зануляване на клон и преминаване към него" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "създаване на журнал на указателите за нов клон" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "отделяне на указателя „HEAD“ към указаното подаване" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "задаване на кой клон бива следен при създаването на новия клон" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "НОВ_КЛОН" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "нов клон без родител" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "изтегляне на вашата версия на неслетите файлове" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "изтегляне на чуждата версия на неслетите файлове" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "принудително изтегляне (вашите промени ще бъдат занулени)" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "извършване на тройно сливане с новия клон" -#: builtin/checkout.c:1150 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "обновяване на игнорираните файлове (стандартно)" -#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" -msgstr "стил" +msgstr "СТИЛ" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "действие при конфликт (сливане или тройна разлика)" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "без ограничаване на изброените пътища само до частично изтеглените" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" "опит за отгатване на име на клон след неуспешен опит с „git checkout " "НЕСЪЩЕСТВУВАЩ_КЛОН“" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "без проверка дали друго работно дърво държи указателя" -#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112 -#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558 +#: 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/send-pack.c:168 msgid "force progress reporting" msgstr "извеждане на напредъка" -#: builtin/checkout.c:1191 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга" -#: builtin/checkout.c:1208 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "опцията „--track“ изисква име на клон" -#: builtin/checkout.c:1213 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "Липсва име на клон, използвайте опцията „-b“" -#: builtin/checkout.c:1249 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "указан е неправилен път" -#: builtin/checkout.c:1256 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4496,12 +4940,12 @@ msgstr "" "Не можете едновременно да обновявате пътища и да преминете към клона „%s“.\n" "Дали не искате да изтеглите „%s“, който не сочи към подаване?" -#: builtin/checkout.c:1261 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“" -#: builtin/checkout.c:1265 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4539,7 +4983,7 @@ msgstr "Хранилището „%s“ ще бъде прескочено\n" msgid "failed to remove %s" msgstr "файлът „%s“ не може да бъде изтрит" -#: builtin/clean.c:315 +#: builtin/clean.c:291 msgid "" "Prompt help:\n" "1 - select a numbered item\n" @@ -4551,7 +4995,7 @@ msgstr "" "ПРЕФИКС — избор на единствен обект по този уникален префикс\n" " — (празно) нищо да не се избира" -#: builtin/clean.c:319 +#: builtin/clean.c:295 msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -4571,38 +5015,38 @@ msgstr "" "* — избиране на всички обекти\n" " — (празно) завършване на избирането" -#: builtin/clean.c:535 +#: builtin/clean.c:511 #, c-format msgid "Huh (%s)?" msgstr "Неправилен избор (%s). Изберете отново." # FIXME - should we use >> or sth else -#: builtin/clean.c:677 +#: builtin/clean.c:653 #, c-format msgid "Input ignore patterns>> " msgstr "Шаблони за игнорирани елементи≫ " -#: builtin/clean.c:714 +#: builtin/clean.c:690 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ПРЕДУПРЕЖДЕНИЕ: Никой обект не напасва на „%s“" -#: builtin/clean.c:735 +#: builtin/clean.c:711 msgid "Select items to delete" msgstr "Избиране на обекти за изтриване" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:776 +#: builtin/clean.c:752 #, c-format msgid "Remove %s [y/N]? " msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ" # FIXME improve message -#: builtin/clean.c:801 +#: builtin/clean.c:777 msgid "Bye." msgstr "Изход." -#: builtin/clean.c:809 +#: builtin/clean.c:785 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -4620,63 +5064,63 @@ msgstr "" "help — този край\n" "? — подсказка за шаблоните" -#: builtin/clean.c:836 +#: builtin/clean.c:812 msgid "*** Commands ***" msgstr "●●● Команди ●●●" # FIXME improve message -#: builtin/clean.c:837 +#: builtin/clean.c:813 msgid "What now" msgstr "Избор на следващо действие" -#: builtin/clean.c:845 +#: builtin/clean.c:821 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Следният обект ще бъде изтрит:" msgstr[1] "Следните обекти ще бъдат изтрити:" -#: builtin/clean.c:862 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "Файловете за изчистване свършиха. Изход от програмата." -#: builtin/clean.c:893 +#: builtin/clean.c:869 msgid "do not print names of files removed" msgstr "без извеждане на имената на файловете, които ще бъдат изтрити" -#: builtin/clean.c:895 +#: builtin/clean.c:871 msgid "force" msgstr "принудително изтриване" -#: builtin/clean.c:896 +#: builtin/clean.c:872 msgid "interactive cleaning" msgstr "интерактивно изтриване" -#: builtin/clean.c:898 +#: builtin/clean.c:874 msgid "remove whole directories" msgstr "изтриване на цели директории" -#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709 -#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: 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 msgid "pattern" -msgstr "шаблон" +msgstr "ШАБЛОН" -#: builtin/clean.c:900 +#: builtin/clean.c:876 msgid "add <pattern> to ignore rules" msgstr "добавяне на ШАБЛОН от файлове, които да не се трият" -#: builtin/clean.c:901 +#: builtin/clean.c:877 msgid "remove ignored files, too" msgstr "изтриване и на игнорираните файлове" -#: builtin/clean.c:903 +#: builtin/clean.c:879 msgid "remove only ignored files" msgstr "изтриване само на игнорирани файлове" -#: builtin/clean.c:921 +#: builtin/clean.c:897 msgid "-x and -X cannot be used together" msgstr "опциите „-x“ и „-X“ са несъвместими" -#: builtin/clean.c:925 +#: builtin/clean.c:901 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -4684,7 +5128,7 @@ msgstr "" "Настройката „clean.requireForce“ е зададена като истина, което изисква някоя " "от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване" -#: builtin/clean.c:928 +#: builtin/clean.c:904 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -4697,148 +5141,168 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" -#: builtin/clone.c:59 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "без създаване на работно дърво" -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "създаване на голо хранилище" -#: builtin/clone.c:64 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "" "създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)" -#: builtin/clone.c:66 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "клониране от локално хранилище" -#: builtin/clone.c:68 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "без твърди връзки, файловете винаги да се копират" -#: builtin/clone.c:70 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "настройване за споделено хранилище" -#: builtin/clone.c:72 builtin/clone.c:74 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "инициализиране на подмодулите при това клониране" -#: builtin/clone.c:75 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "брой подмодули, клонирани паралелно" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "директория с шаблони" -#: builtin/clone.c:76 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "директория, която съдържа шаблоните, които да се ползват" -#: builtin/clone.c:78 builtin/submodule--helper.c:179 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "еталонно хранилище" -#: builtin/clone.c:80 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "опцията „--reference“ може да се използва само при клониране" -#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "ИМЕ" -#: builtin/clone.c:82 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони" -#: builtin/clone.c:84 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“" -#: builtin/clone.c:86 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище" -#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 builtin/pull.c:186 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201 msgid "depth" msgstr "ДЪЛБОЧИНА" -#: builtin/clone.c:88 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "плитко клониране до тази ДЪЛБОЧИНА" -#: builtin/clone.c:90 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "" "клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично " "зададения с „--branch“" -#: builtin/clone.c:91 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "всички клонирани подмодули ще са плитки" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ" -#: builtin/clone.c:92 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво" -#: builtin/clone.c:93 +#: builtin/clone.c:100 msgid "key=value" msgstr "КЛЮЧ=СТОЙНОСТ" -#: builtin/clone.c:94 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "задаване на настройките на новото хранилище" -#: builtin/clone.c:300 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 +msgid "use IPv4 addresses only" +msgstr "само адреси IPv4" + +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 +msgid "use IPv6 addresses only" +msgstr "само адреси IPv6" + +#: builtin/clone.c:241 +msgid "" +"No directory name could be guessed.\n" +"Please specify a directory on the command line" +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:302 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "еталонното хранилище „%s“ не е локално" -#: builtin/clone.c:307 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "еталонното хранилище „%s“ е плитко" -#: builtin/clone.c:310 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "еталонното хранилище „%s“ е с присаждане" -#: builtin/clone.c:375 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "не може да бъде получена информация чрез „stat“ за „%s“" - -#: builtin/clone.c:377 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "„%s“ съществува и не е директория" -#: builtin/clone.c:391 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "не може да бъде получена информация чрез „stat“ за „%s“\n" -#: builtin/clone.c:413 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "връзката „%s“ не може да бъде създадена" -#: builtin/clone.c:417 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "файлът не може да бъде копиран като „%s“" -#: builtin/clone.c:442 builtin/clone.c:626 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "действието завърши.\n" -#: builtin/clone.c:454 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4849,7 +5313,7 @@ msgstr "" "клон в момента са изтеглени с командата „git status“. Можете да\n" "завършите изтеглянето на клона с командата „git checkout -f HEAD“.\n" -#: builtin/clone.c:531 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" @@ -4857,116 +5321,126 @@ msgstr "" "и който следва да бъде изтеглен, не съществува." # FIXME translator note that the space at end is necesssary -#: builtin/clone.c:621 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "Проверка на връзката… " -#: builtin/clone.c:624 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "отдалеченото хранилище не изпрати всички необходими обекти." -#: builtin/clone.c:688 +# FIXME merge with next? +#: builtin/clone.c:649 +#, c-format +msgid "unable to update %s" +msgstr "обектът „%s“ не може да бъде обновен" + +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n" "което не съществува. Не може да се изтегли определен клон.\n" -#: builtin/clone.c:719 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "работното дърво не може да бъде подготвено" -#: builtin/clone.c:808 +#: builtin/clone.c:767 +msgid "unable to write parameters to config file" +msgstr "настройките не могат да бъдат записани в конфигурационния файл" + +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "не може да се извърши пакетиране за изчистване на файловете" -#: builtin/clone.c:810 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "временният файл за алтернативни обекти не може да бъде изтрит" -#: builtin/clone.c:842 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "Прекалено много аргументи." -#: builtin/clone.c:846 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "Трябва да укажете кое хранилище искате да клонирате." -#: builtin/clone.c:857 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "опциите „--bare“ и „--origin %s“ са несъвместими." -#: builtin/clone.c:860 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими." -#: builtin/clone.c:873 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "не съществува хранилище „%s“" -#: builtin/clone.c:879 builtin/fetch.c:1166 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "дълбочината трябва да е положително цяло число, а не „%s“" -#: builtin/clone.c:889 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевият път „%s“ съществува и не е празна директория." -#: builtin/clone.c:899 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "в „%s“ вече съществува работно дърво." -#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224 -#: builtin/worktree.c:221 builtin/worktree.c:248 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "родителските директории на „%s“ не могат да бъдат създадени" -#: builtin/clone.c:917 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "работното дърво в „%s“ не може да бъде създадено." -#: builtin/clone.c:935 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клониране и създаване на голо хранилище в „%s“…\n" -#: builtin/clone.c:937 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клониране и създаване на хранилище в „%s“…\n" -#: builtin/clone.c:975 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--depth“ се игнорира. Ползвайте схемата " "„file://“." -#: builtin/clone.c:978 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "клонираното хранилище е плитко, затова опцията „--local“ се игнорира" -#: builtin/clone.c:983 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "опцията „--local“ се игнорира" -#: builtin/clone.c:987 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "Не се поддържа клониране на връзки от вида „%s“ " -#: builtin/clone.c:1036 builtin/clone.c:1044 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“" -#: builtin/clone.c:1047 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "Изглежда клонирахте празно хранилище." @@ -5110,66 +5584,66 @@ msgstr "" "Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n" "останалите подавания.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "временният индекс не може да бъде създаден" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "неуспешно интерактивно добавяне" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "временният индекс не може да бъде обновен" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "Дървото на основния кеш не може да бъде обновено" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "новият индекс не може да бъде записан" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "по време на сливане не може да се извърши частично подаване." -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "по време на отбиране не може да се извърши частично подаване." -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "индексът не може да бъде прочетен" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "временният индекс не може да бъде записан" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "заглавната част за автор в подаването „%s“ липсва" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "заглавната част за автор в подаването „%s“ е неправилна" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "неправилен параметър към опцията „--author“" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "неправилен формат на дата: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5177,39 +5651,39 @@ msgstr "" "не може да се избере знак за коментар — в текущото съобщение за подаване са " "използвани всички подобни знаци" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "следното подаване не може да бъде открито: %s" -#: builtin/commit.c:702 builtin/shortlog.c:273 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "(изчитане на съобщението за подаване от стандартния вход)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "съобщението за подаване не бе прочетено стандартния вход" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "файлът със съобщението за подаване „%s“ не може да бъде прочетен" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "съобщението за смачкване SQUASH_MSG не може да бъде прочетено" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "шаблонът за подаване не може да бъде запазен" # FIXME -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5225,7 +5699,7 @@ msgstr "" "и опитайте отново.\n" # FIXME -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5241,7 +5715,7 @@ msgstr "" " %s\n" "и опитайте отново.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5250,7 +5724,7 @@ msgstr "" "Въведете съобщението за подаване на промените. Редовете, които започват\n" "с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5261,96 +5735,96 @@ msgstr "" "с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n" "съобщение преустановява подаването.\n" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sАвтор: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sДата: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sПодаващ: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "Индексът не може да бъде прочетен" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "Грешка при изграждане на дърветата" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 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:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "Опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с " "никой автор" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Неправилна стойност за неследените файлове: „%s“" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "Опциите „--long“ и „-z“ са несъвместими." -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "Опциите „--reset-author“ и „--author“ са несъвместими." -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "Няма какво да бъде поправено." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "В момента се извършва сливане, не можете да поправяте." -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "В момента се извършва отбиране на подаване, не можете да поправяте." -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "Опциите „--squash“ и „--fixup“ са несъвместими." -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими." -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“, „-F“ и „--fixup“." -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n" "„--amend“." -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n" "несъвместими." -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 msgid "No paths with --include/--only does not make sense." msgstr "Опциите „--include“ и „--only“ изискват аргументи." # FIXME bad message -#: builtin/commit.c:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "" "Чудесно сте се сетили как да поправите съобщението на последното подаване " @@ -5358,271 +5832,269 @@ msgstr "" "променен индекс. Споделете и с друг потребител трика с „git commit --amend -" "o“." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "Зададени са изрични пътища без опциите „-i“ или „-o“. Приема се, че все едно " "сте\n" "ползвали опцията „--only“ с ПЪТища…" -#: builtin/commit.c:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Несъществуващ режим на изчистване „%s“" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "Опцията „-a“ е несъвместима със задаването на пътища." -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "кратка информация за състоянието" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "информация за клоните" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544 -#: builtin/worktree.c:423 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "формат на изхода за четене от програма" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "подробна информация за състоянието (стандартно)" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "разделяне на елементите с нулевия знак „NUL“" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" -msgstr "режим" +msgstr "РЕЖИМ" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -"извеждане на неследените файлове. Възможните режими са „all“ (подробна\n" -"информация), „normal“ (кратка информация), „no“ (без неследените файлове).\n" -"Стандартният режим е: „all“." +"извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна " +"информация), „normal“ (кратка информация), „no“ (без неследените файлове). " +"Стандартният РЕЖИМ е: „all“." -#: builtin/commit.c:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "извеждане на игнорираните файлове" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" -msgstr "кога" +msgstr "КОГА" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "игнориране на промените в подмодулите. Опция с незадължителна стойност — " -"една от\n" -"„all“ (всички), „dirty“ (тези с неподадени промени), „untracked“ (неследени)" +"една от „all“ (всички), „dirty“ (тези с неподадени промени), " +"„untracked“ (неследени)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "извеждане на неследените файлове в колони" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "току що създаденото подаване не може да бъде открито" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "току що създаденото подаване не може да бъде анализирано" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "несвързан връх „HEAD“" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (начално подаване)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "без информация след успешно подаване" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "добавяне на разликата към шаблона за съобщението при подаване" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "Опции за съобщението при подаване" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" -msgstr "взимане на съобщението от файл" +msgstr "взимане на съобщението от ФАЙЛ" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" -msgstr "автор" +msgstr "АВТОР" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" -msgstr "задаване на автор за подаването" +msgstr "задаване на АВТОР за подаването" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" -msgstr "дата" +msgstr "ДАТА" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" -msgstr "задаване на дата за подаването" +msgstr "задаване на ДАТА за подаването" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392 -#: builtin/notes.c:555 builtin/tag.c:349 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 +#: builtin/notes.c:558 builtin/tag.c:349 msgid "message" -msgstr "съобщение" +msgstr "СЪОБЩЕНИЕ" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" -msgstr "съобщение при подаване" +msgstr "СЪОБЩЕНИЕ при подаване" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" -msgstr "подаване" +msgstr "ПОДАВАНЕ" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" -msgstr "преизползване и редактиране на съобщението от указаното подаване" +msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" -msgstr "преизползване на съобщението от указаното подаване" +msgstr "преизползване на съобщението от указаното ПОДАВАНЕ" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -"използване на автоматичното съобщение при смачкване за вкарване на " -"указаното\n" -"подаване в предното без следа" +"използване на автоматичното съобщение при смачкване за вкарване на указаното " +"ПОДАВАНЕ в предното без следа" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" msgstr "" "използване на автоматичното съобщение при смачкване за смачкване на " -"указаното\n" -"подаване в предното" +"указаното ПОДАВАНЕ в предното" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)" -#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "добавяне на поле за подпис — „Signed-off-by:“" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" -msgstr "използване на указания шаблонен файл" +msgstr "използване на указания шаблонен ФАЙЛ" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "редактиране на подаване" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "стандартно" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "кои празни знаци и #коментари да се махат от съобщенията" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "вмъкване на състоянието в шаблона за съобщението при подаване" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "подписване на подаването с GPG" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "Опции за избор на файлове при подаване" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "подаване на всички променени файлове" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "добавяне на указаните файлове към индекса за подаване" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "интерактивно добавяне на файлове" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "интерактивно добавяне на промени" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "подаване само на указаните файлове" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "без изпълнение на куката преди подаване (pre-commit)" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "отпечатване на това, което би било подадено" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "поправяне на предишното подаване" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "без изпълнение на куката след презаписване (post-rewrite)" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "позволяване на празни подавания" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "позволяване на подавания с празни съобщения" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "върховото подаване „HEAD“ не може да бъде прочетено" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "съобщението за подаване не може да бъде прочетено: %s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Неизвършване на подаване поради нередактирано съобщение.\n" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Неизвършване на подаване поради празно съобщение.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5632,145 +6104,151 @@ msgstr "" "не е записан. Проверете дали дискът не е препълнен или не сте\n" "превишили дисковата си квота. След това изпълнете „git reset HEAD“." -#: builtin/config.c:8 +#: builtin/config.c:9 msgid "git config [<options>]" msgstr "git config [ОПЦИЯ…]" -#: builtin/config.c:54 +#: builtin/config.c:56 msgid "Config file location" msgstr "Местоположение на конфигурационния файл" -#: builtin/config.c:55 +#: builtin/config.c:57 msgid "use global config file" msgstr "използване на глобалния конфигурационен файл" -#: builtin/config.c:56 +#: builtin/config.c:58 msgid "use system config file" msgstr "използване на системния конфигурационен файл" -#: builtin/config.c:57 +#: builtin/config.c:59 msgid "use repository config file" msgstr "използване на конфигурационния файл на хранилището" -#: builtin/config.c:58 +#: builtin/config.c:60 msgid "use given config file" -msgstr "използване на зададения конфигурационен файл" +msgstr "използване на зададения конфигурационен ФАЙЛ" -#: builtin/config.c:59 +#: builtin/config.c:61 msgid "blob-id" -msgstr "идентификатор на BLOB" +msgstr "ИДЕНТИФИКАТОР" -#: builtin/config.c:59 +#: builtin/config.c:61 msgid "read config from given blob object" msgstr "" -"изчитане на конфигурацията от BLOB с този идентификатор на съдържанието" +"изчитане на конфигурацията от BLOB с този ИДЕНТИФИКАТОР на съдържанието" -#: builtin/config.c:60 +#: builtin/config.c:62 msgid "Action" msgstr "Действие" -#: builtin/config.c:61 +#: builtin/config.c:63 msgid "get value: name [value-regex]" msgstr "извеждане на стойност: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:62 +#: builtin/config.c:64 msgid "get all values: key [value-regex]" msgstr "извеждане на всички стойности: ключ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:63 +#: builtin/config.c:65 msgid "get values for regexp: name-regex [value-regex]" msgstr "" "извеждане на стойностите за РЕГУЛЯРНия_ИЗРАЗ: РЕГУЛЯРЕН_ИЗРАЗ_ЗА_ИМЕТО " "[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:64 +#: builtin/config.c:66 msgid "get value specific for the URL: section[.var] URL" msgstr "извеждане на стойността за указания адрес: РАЗДЕЛ[.ПРОМЕНЛИВА] АДРЕС" -#: builtin/config.c:65 +#: builtin/config.c:67 msgid "replace all matching variables: name value [value_regex]" msgstr "" "замяна на всички съвпадащи променливи: ИМЕ СТОЙНОСТ " "[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:66 +#: builtin/config.c:68 msgid "add a new variable: name value" msgstr "добавяне на нова променлива: ИМЕ СТОЙНОСТ" -#: builtin/config.c:67 +#: builtin/config.c:69 msgid "remove a variable: name [value-regex]" msgstr "изтриване на променлива: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:68 +#: builtin/config.c:70 msgid "remove all matches: name [value-regex]" msgstr "изтриване на всички съвпадащи: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:69 +#: builtin/config.c:71 msgid "rename section: old-name new-name" msgstr "преименуване на раздел: СТАРО_ИМЕ НОВО_ИМЕ" -#: builtin/config.c:70 +#: builtin/config.c:72 msgid "remove a section: name" msgstr "изтриване на раздел: ИМЕ" -#: builtin/config.c:71 +#: builtin/config.c:73 msgid "list all" msgstr "изброяване на всички" -#: builtin/config.c:72 +#: builtin/config.c:74 msgid "open an editor" msgstr "отваряне на редактор" -#: builtin/config.c:73 +#: builtin/config.c:75 msgid "find the color configured: slot [default]" msgstr "извеждане на зададения цвят: номер [стандартно]" -#: builtin/config.c:74 +#: builtin/config.c:76 msgid "find the color setting: slot [stdout-is-tty]" msgstr "извеждане на зададения цвят: номер [стандартният изход е терминал]" -#: builtin/config.c:75 +#: builtin/config.c:77 msgid "Type" msgstr "Вид" -#: builtin/config.c:76 +#: builtin/config.c:78 msgid "value is \"true\" or \"false\"" msgstr "СТОЙНОСТТА е „true“ (истина) или „false“ (лъжа)" -#: builtin/config.c:77 +#: builtin/config.c:79 msgid "value is decimal number" msgstr "СТОЙНОСТТА е цяло, десетично число" -#: builtin/config.c:78 +#: builtin/config.c:80 msgid "value is --bool or --int" msgstr "СТОЙНОСТТА е „--bool“ (булева) или „--int“ (десетично цяло число)" -#: builtin/config.c:79 +#: builtin/config.c:81 msgid "value is a path (file or directory name)" msgstr "СТОЙНОСТТА е път (до файл или директория)" -#: builtin/config.c:80 +#: builtin/config.c:82 msgid "Other" msgstr "Други" # FIXME NUL byte to null char, terminate -> razdelitel - da stane ednakvo -#: builtin/config.c:81 +#: builtin/config.c:83 msgid "terminate values with NUL byte" msgstr "разделяне на стойностите с нулевия знак „NUL“" -#: builtin/config.c:82 +#: builtin/config.c:84 msgid "show variable names only" msgstr "извеждане на имената на променливите" -#: builtin/config.c:83 +#: builtin/config.c:85 msgid "respect include directives on lookup" msgstr "при търсене да се уважат и директивите за включване" -#: builtin/config.c:303 +#: builtin/config.c:86 +msgid "show origin of config (file, standard input, blob, command line)" +msgstr "" +"извеждане на мястото на задаване на настройката (файл, стандартен вход, " +"обект BLOB, команден ред)" + +#: builtin/config.c:328 msgid "unable to parse default color value" msgstr "неразпозната стойност на стандартния цвят" -#: builtin/config.c:441 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5785,7 +6263,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:575 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "конфигурационният файл „%s“ не може да бъде създаден" @@ -5822,7 +6300,7 @@ msgstr "в анотирания етикет „%s“ липсва вграде msgid "tag '%s' is really '%s' here" msgstr "етикетът „%s“ тук е всъщност „%s“" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "Неправилно име на обект „%s“" @@ -5918,7 +6396,7 @@ msgstr "да се търси само в този БРОЙ последни ет msgid "only consider tags matching <pattern>" msgstr "да се търси само измежду етикетите напасващи този ШАБЛОН" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "извеждане на съкратено име на обект като резервен вариант" @@ -5952,21 +6430,21 @@ msgstr "„%s“: не е нито обикновен файл, нито сим msgid "invalid option: %s" msgstr "неправилна опция: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "Не е хранилище на Git" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "зададен е неправилен обект „%s“." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "зададени са повече от 2 обекта BLOB: „%s“" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "зададен е неподдържан обект „%s“." @@ -5989,11 +6467,11 @@ msgstr "Как да се обработват етикетите на филтр #: builtin/fast-export.c:988 msgid "Dump marks to this file" -msgstr "Запазване на маркерите в този файл" +msgstr "Запазване на маркерите в този ФАЙЛ" #: builtin/fast-export.c:990 msgid "Import marks from this file" -msgstr "Внасяне на маркерите от този файл" +msgstr "Внасяне на маркерите от този ФАЙЛ" #: builtin/fast-export.c:992 msgid "Fake a tagger when tags lack one" @@ -6013,11 +6491,11 @@ msgstr "Без извеждане на съдържанието на обект #: builtin/fast-export.c:998 msgid "refspec" -msgstr "указател на версия" +msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ" #: builtin/fast-export.c:999 msgid "Apply refspec to exported refs" -msgstr "Прилагане на указателя на версия към изнесените указатели" +msgstr "Прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към изнесените указатели" #: builtin/fast-export.c:1000 msgid "anonymize output" @@ -6039,164 +6517,163 @@ msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА) msgid "git fetch --all [<options>]" msgstr "git fetch --all [ОПЦИЯ…]" -#: builtin/fetch.c:90 builtin/pull.c:162 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "доставяне от всички отдалечени хранилища" -#: builtin/fetch.c:92 builtin/pull.c:165 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна" -#: builtin/fetch.c:94 builtin/pull.c:168 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "отдалечен път, където да се качи пакетът" -#: builtin/fetch.c:95 builtin/pull.c:170 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "принудително презаписване на локалния клон" -#: builtin/fetch.c:97 +#: builtin/fetch.c:99 msgid "fetch from multiple remotes" msgstr "доставяне от множество отдалечени хранилища" -#: builtin/fetch.c:99 builtin/pull.c:172 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "доставяне на всички етикети и принадлежащи обекти" -#: builtin/fetch.c:101 +#: builtin/fetch.c:103 msgid "do not fetch all tags (--no-tags)" msgstr "без доставянето на всички етикети „--no-tags“" -#: builtin/fetch.c:103 builtin/pull.c:175 +#: builtin/fetch.c:105 +msgid "number of submodules fetched in parallel" +msgstr "брой подмодули доставени паралелно" + +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони" -#: builtin/fetch.c:104 builtin/pull.c:178 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" -msgstr "при нужда" +msgstr "ПРИ НУЖДА" -#: builtin/fetch.c:105 builtin/pull.c:179 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "управление на рекурсивното доставяне на подмодулите" -#: builtin/fetch.c:109 builtin/pull.c:184 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "запазване на изтеглените пакети с обекти" -#: builtin/fetch.c:111 +#: builtin/fetch.c:115 msgid "allow updating of HEAD ref" msgstr "позволяване на обновяването на указателя „HEAD“" -#: builtin/fetch.c:114 builtin/pull.c:187 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "задълбочаване на историята на плитко хранилище" -#: builtin/fetch.c:116 builtin/pull.c:190 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "превръщане в пълно хранилище" -#: builtin/fetch.c:118 builtin/log.c:1233 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "директория" -#: builtin/fetch.c:119 +#: builtin/fetch.c:123 msgid "prepend this to submodule path output" msgstr "добавяне на това пред пътя на подмодула" -#: builtin/fetch.c:122 +#: builtin/fetch.c:126 msgid "default mode for recursion" msgstr "стандартен режим на рекурсия" -#: builtin/fetch.c:124 builtin/pull.c:193 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "приемане на указатели, които обновяват „.git/shallow“" -#: builtin/fetch.c:125 builtin/pull.c:195 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" -msgstr "карта с указатели" +msgstr "КАРТА_С_УКАЗАТЕЛИ" -#: builtin/fetch.c:126 builtin/pull.c:196 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" -msgstr "указване на картата с указатели за доставяне" +msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне" -#: builtin/fetch.c:378 +#: builtin/fetch.c:386 msgid "Couldn't find remote ref HEAD" msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит" -#: builtin/fetch.c:458 +#: builtin/fetch.c:466 #, c-format msgid "object %s not found" msgstr "обектът „%s“ липсва" -#: builtin/fetch.c:463 +#: builtin/fetch.c:471 msgid "[up to date]" msgstr "[актуализиран]" -#: builtin/fetch.c:477 +#: builtin/fetch.c:485 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s → %s (в текущия клон не може да се доставя)" -#: builtin/fetch.c:478 builtin/fetch.c:566 +#: builtin/fetch.c:486 builtin/fetch.c:574 msgid "[rejected]" msgstr "[отхвърлен]" -#: builtin/fetch.c:489 +#: builtin/fetch.c:497 msgid "[tag update]" msgstr "[обновяване на етикетите]" -#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544 +#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552 msgid " (unable to update local ref)" msgstr " (локалните указатели не могат да бъдат обновени)" -#: builtin/fetch.c:509 +#: builtin/fetch.c:517 msgid "[new tag]" msgstr "[нов етикет]" -#: builtin/fetch.c:512 +#: builtin/fetch.c:520 msgid "[new branch]" msgstr "[нов клон]" -#: builtin/fetch.c:515 +#: builtin/fetch.c:523 msgid "[new ref]" msgstr "[нов указател]" -#: builtin/fetch.c:561 +#: builtin/fetch.c:569 msgid "unable to update local ref" msgstr "локален указател не може да бъде обновен" -#: builtin/fetch.c:561 +#: builtin/fetch.c:569 msgid "forced update" msgstr "принудително обновяване" -#: builtin/fetch.c:568 +#: builtin/fetch.c:576 msgid "(non-fast-forward)" msgstr "(сливането не е тривиално)" -#: builtin/fetch.c:602 builtin/fetch.c:843 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "файлът „%s“ не може да бъде отворен: %s\n" - -#: builtin/fetch.c:611 +#: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" msgstr "хранилището „%s“ не изпрати всички необходими обекти\n" -#: builtin/fetch.c:629 +#: builtin/fetch.c:637 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат " "обновявани" -#: builtin/fetch.c:716 builtin/fetch.c:808 +#: builtin/fetch.c:724 builtin/fetch.c:816 #, c-format msgid "From %.*s\n" msgstr "От %.*s\n" # FIXME - is the space necessary -#: builtin/fetch.c:727 +#: builtin/fetch.c:735 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6206,55 +6683,55 @@ msgstr "" "„git remote prune %s“, за да премахнете остарелите клони, които\n" "предизвикват конфликта" -#: builtin/fetch.c:779 +#: builtin/fetch.c:787 #, c-format msgid " (%s will become dangling)" msgstr " (обектът „%s“ ще се окаже извън клон)" -#: builtin/fetch.c:780 +#: builtin/fetch.c:788 #, c-format msgid " (%s has become dangling)" msgstr " (обектът „%s“ вече е извън клон)" -#: builtin/fetch.c:812 +#: builtin/fetch.c:820 msgid "[deleted]" msgstr "[изтрит]" -#: builtin/fetch.c:813 builtin/remote.c:1040 +#: builtin/fetch.c:821 builtin/remote.c:1025 msgid "(none)" msgstr "(нищо)" -#: builtin/fetch.c:833 +#: builtin/fetch.c:841 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо" -#: builtin/fetch.c:852 +#: builtin/fetch.c:860 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“" -#: builtin/fetch.c:855 +#: builtin/fetch.c:863 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Опцията „%s“ се игнорира при „%s“\n" -#: builtin/fetch.c:911 +#: builtin/fetch.c:920 #, c-format msgid "Don't know how to fetch from %s" msgstr "Не се поддържа доставяне от „%s“" -#: builtin/fetch.c:1072 +#: builtin/fetch.c:1080 #, c-format msgid "Fetching %s\n" msgstr "Доставяне на „%s“\n" -#: builtin/fetch.c:1074 builtin/remote.c:96 +#: builtin/fetch.c:1082 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "„%s“ не може да се достави" -#: builtin/fetch.c:1092 +#: builtin/fetch.c:1100 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -6262,33 +6739,33 @@ msgstr "" "Не сте указали отдалечено хранилище. Задайте или адрес, или име\n" "на отдалечено хранилище, откъдето да се доставят новите версии." -#: builtin/fetch.c:1115 +#: builtin/fetch.c:1123 msgid "You need to specify a tag name." msgstr "Трябва да укажете име на етикет." -#: builtin/fetch.c:1157 +#: builtin/fetch.c:1165 msgid "--depth and --unshallow cannot be used together" msgstr "опциите „--depth“ и „--unshallow“ са несъвместими" -#: builtin/fetch.c:1159 +#: builtin/fetch.c:1167 msgid "--unshallow on a complete repository does not make sense" msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище" -#: builtin/fetch.c:1179 +#: builtin/fetch.c:1187 msgid "fetch --all does not take a repository argument" msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1189 msgid "fetch --all does not make sense with refspecs" msgstr "" "към „git fetch --all“ не можете да добавите аргумент — указател на версия" -#: builtin/fetch.c:1192 +#: builtin/fetch.c:1200 #, c-format msgid "No such remote or remote group: %s" msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“" -#: builtin/fetch.c:1200 +#: builtin/fetch.c:1208 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Указването на група и указването на версия са несъвместими" @@ -6362,7 +6839,7 @@ msgstr "ФОРМАТ за изхода" #: builtin/for-each-ref.c:41 msgid "print only refs which points at the given object" -msgstr "извеждане само на указателите, сочещи към обекта" +msgstr "извеждане само на указателите, сочещи към ОБЕКТА" #: builtin/for-each-ref.c:43 msgid "print only refs that are merged" @@ -6374,7 +6851,7 @@ msgstr "извеждане само на неслетите указатели" #: builtin/for-each-ref.c:45 msgid "print only refs which contain the commit" -msgstr "извеждане само на указателите, които съдържат това подаване" +msgstr "извеждане само на указателите, които съдържат това ПОДАВАНЕ" #: builtin/fsck.c:156 builtin/prune.c:140 msgid "Checking connectivity" @@ -6384,56 +6861,56 @@ msgstr "Проверка на връзката" msgid "Checking object directories" msgstr "Проверка на директориите с обекти" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "показване на недостижимите обекти" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "показване на обектите извън клоните" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "показване на етикетите" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "показване на кореновите възли" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "задаване на обекти от индекса да са коренови" # FIXME bad message -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "проследяване на указателите от журнала като глави (стандартно)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "допълнително да се проверяват пакетите и алтернативните обекти" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "проверка само на връзката" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "по-строги проверки" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "показване на напредъка" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "Проверка на обектите" @@ -6527,239 +7004,253 @@ msgstr "" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [ОПЦИЯ…] [-e] ШАБЛОН [ВЕРСИЯ…] [[--] ПЪТ…]" -#: builtin/grep.c:218 +#: builtin/grep.c:219 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: неуспешно създаване на нишка: %s" -#: builtin/grep.c:441 builtin/grep.c:476 +#: builtin/grep.c:277 +#, c-format +msgid "invalid number of threads specified (%d) for %s" +msgstr "зададен е неправилен брой нишки (%d) за %s" + +#: builtin/grep.c:452 builtin/grep.c:487 #, c-format msgid "unable to read tree (%s)" msgstr "дървото не може да бъде прочетено (%s)" -#: builtin/grep.c:491 +#: builtin/grep.c:502 #, c-format msgid "unable to grep from object of type %s" msgstr "не може да се изпълни „grep“ от обект от вида %s" -#: builtin/grep.c:547 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "опцията „%c“ очаква число за аргумент" -#: builtin/grep.c:564 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "„%s“ не може да бъде отворен" -#: builtin/grep.c:633 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "търсене в индекса, а не в работното дърво" -#: builtin/grep.c:635 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "търсене и във файловете, които не са под управлението на git" -#: builtin/grep.c:637 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "търсене и в следените, и в неследените файлове" -#: builtin/grep.c:639 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "игнориране на файловете указани в „.gitignore“" -#: builtin/grep.c:642 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "извеждане на редовете, които не съвпадат" -#: builtin/grep.c:644 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "без значение на регистъра на буквите (главни/малки)" -#: builtin/grep.c:646 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "напасване на шаблоните само по границите на думите" -#: builtin/grep.c:648 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "обработване на двоичните файлове като текстови" -#: builtin/grep.c:650 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "прескачане на двоичните файлове" -#: builtin/grep.c:653 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "" "обработване на двоичните файлове чрез филтри за преобразуване към текст" -#: builtin/grep.c:655 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото" -#: builtin/grep.c:659 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "разширени регулярни изрази по POSIX" -#: builtin/grep.c:662 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "основни регулярни изрази по POSIX (стандартно)" -#: builtin/grep.c:665 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "шаблоните са дословни низове" -#: builtin/grep.c:668 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "регулярни изрази на Perl" -#: builtin/grep.c:671 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "извеждане на номерата на редовете" -#: builtin/grep.c:672 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "без извеждане на имената на файловете" -#: builtin/grep.c:673 +#: builtin/grep.c:686 msgid "show filenames" msgstr "извеждане на имената на файловете" -#: builtin/grep.c:675 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "" "извеждане на относителните имена на файловете спрямо основната директория на " "хранилището" -#: builtin/grep.c:677 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "извеждане само на имената на файловете без напасващите редове" -#: builtin/grep.c:679 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "синоним на „--files-with-matches“" -#: builtin/grep.c:682 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "" "извеждане само на имената на файловете, които не съдържат ред, напасващ на " "шаблона" -#: builtin/grep.c:684 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл" -#: builtin/grep.c:686 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "извеждане на броя на съвпаденията вместо напасващите редове" -#: builtin/grep.c:687 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "оцветяване на напасванията" -#: builtin/grep.c:689 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "извеждане на празен ред между напасванията от различни файлове" -#: builtin/grep.c:691 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "" "извеждане на името на файла само веднъж за всички напасвания от този файл" -#: builtin/grep.c:694 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "извеждане на такъв БРОЙ редове преди и след напасванията" -#: builtin/grep.c:697 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "извеждане на такъв БРОЙ редове преди напасванията" -#: builtin/grep.c:699 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "извеждане на такъв БРОЙ редове след напасванията" -#: builtin/grep.c:700 +#: builtin/grep.c:714 +msgid "use <n> worker threads" +msgstr "използване на такъв БРОЙ работещи нишки" + +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "синоним на „-C БРОЙ“" -#: builtin/grep.c:703 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона" -#: builtin/grep.c:705 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "извеждане на обхващащата функция" -#: builtin/grep.c:708 +#: builtin/grep.c:723 msgid "read patterns from file" -msgstr "изчитане на шаблоните от файл" +msgstr "изчитане на шаблоните от ФАЙЛ" -#: builtin/grep.c:710 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "напасване на ШАБЛОН" -#: builtin/grep.c:712 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "комбиниране на шаблоните указани с опцията „-e“" -#: builtin/grep.c:724 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "" "без извеждане на стандартния изход. Изходният код указва наличието на " "напасване" -#: builtin/grep.c:726 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "" "извеждане на редове само от файловете, които напасват на всички шаблони" -#: builtin/grep.c:728 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "извеждане на дървото за анализ на регулярния израз" -#: builtin/grep.c:732 +#: builtin/grep.c:747 msgid "pager" msgstr "програма за преглед по страници" -#: builtin/grep.c:732 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "извеждане на съвпадащите файлове в програма за преглед по страници" -#: builtin/grep.c:735 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" "позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази " "опция)" -#: builtin/grep.c:793 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "липсва шаблон." -#: builtin/grep.c:851 +#: builtin/grep.c:845 builtin/index-pack.c:1477 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "зададен е неправилен брой нишки: %d" + +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "" "опцията „--open-files-in-pager“ е съвместима само с търсене в работното дърво" -#: builtin/grep.c:877 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“." -#: builtin/grep.c:882 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "" "опциите „--cached“ и „--untracked“ са несъвместими с търсене във версии." -#: builtin/grep.c:885 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени " "файлове." -#: builtin/grep.c:893 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "опцията „--cached“ е несъвместима със задаване на дърво." -#: builtin/hash-object.c:80 +#: builtin/hash-object.c:81 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -6767,40 +7258,40 @@ msgstr "" "git hash-object [-t ВИД] [-w] [--path=ФАЙЛ | --no-filters] [--stdin] [--] " "ФАЙЛ…" -#: builtin/hash-object.c:81 +#: builtin/hash-object.c:82 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:92 +#: builtin/hash-object.c:93 msgid "type" msgstr "ВИД" -#: builtin/hash-object.c:92 +#: builtin/hash-object.c:93 msgid "object type" -msgstr "вид на обекта" +msgstr "ВИД на обекта" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "write the object into the object database" msgstr "записване на обекта в базата от данни за обектите" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:96 msgid "read the object from stdin" msgstr "изчитане на обекта от стандартния вход" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "store file as is without filters" msgstr "запазване на файла както е — без филтри" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "създаване и хеширане на произволни данни за повредени обекти за трасиране на " "Git" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "process file as it were from this path" -msgstr "обработване на файла все едно е с този път" +msgstr "обработване на ФАЙЛа все едно е с този път" #: builtin/help.c:41 msgid "print all available commands" @@ -6846,10 +7337,10 @@ msgstr "Прекалено стара версия на „emacsclient“ — %d #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "неуспешно изпълнение на „%s“: %s" +msgid "failed to exec '%s'" +msgstr "неуспешно изпълнение на „%s“" -#: builtin/help.c:208 +#: builtin/help.c:205 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -6858,7 +7349,7 @@ msgstr "" "„%s“: път към неподдържана програма за преглед на\n" " ръководството. Вместо нея пробвайте „man.<tool>.cmd“." -#: builtin/help.c:220 +#: builtin/help.c:217 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -6867,63 +7358,63 @@ msgstr "" "„%s“: команда за поддържана програма за преглед на\n" " ръководството. Вместо нея пробвайте „man.<tool>.path“." -#: builtin/help.c:337 +#: builtin/help.c:334 #, c-format msgid "'%s': unknown man viewer." msgstr "„%s“: непозната програма за преглед на ръководството." -#: builtin/help.c:354 +#: builtin/help.c:351 msgid "no man viewer handled the request" msgstr "никоя програма за преглед на ръководство не успя да обработи заявката" -#: builtin/help.c:362 +#: builtin/help.c:359 msgid "no info viewer handled the request" msgstr "" "никоя програма за преглед на информационните страници не успя да обработи " "заявката" -#: builtin/help.c:411 +#: builtin/help.c:408 msgid "Defining attributes per path" msgstr "Указване на атрибути към път" -#: builtin/help.c:412 +#: builtin/help.c:409 msgid "Everyday Git With 20 Commands Or So" msgstr "Ежедневието в Git в рамките на 20-ина команди" -#: builtin/help.c:413 +#: builtin/help.c:410 msgid "A Git glossary" msgstr "Речник с термините на Git" -#: builtin/help.c:414 +#: builtin/help.c:411 msgid "Specifies intentionally untracked files to ignore" msgstr "Указване на неследени файлове, които да бъдат нарочно пренебрегвани" -#: builtin/help.c:415 +#: builtin/help.c:412 msgid "Defining submodule properties" msgstr "Дефиниране на свойствата на подмодулите" -#: builtin/help.c:416 +#: builtin/help.c:413 msgid "Specifying revisions and ranges for Git" msgstr "Указване на версии и интервали в Git" -#: builtin/help.c:417 +#: builtin/help.c:414 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Въвеждащ урок за Git (версии поне 1.5.1)" -#: builtin/help.c:418 +#: builtin/help.c:415 msgid "An overview of recommended workflows with Git" msgstr "Общ преглед на препоръчваните начини за работа с Git" -#: builtin/help.c:430 +#: builtin/help.c:427 msgid "The common Git guides are:\n" msgstr "Популярните пътеводители в Git са:\n" -#: builtin/help.c:451 builtin/help.c:468 +#: builtin/help.c:448 builtin/help.c:465 #, c-format msgid "usage: %s%s" msgstr "употреба: %s%s" -#: builtin/help.c:484 +#: builtin/help.c:481 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "„git %s“ е синоним на „%s“" @@ -7119,118 +7610,115 @@ msgstr "" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "действието завърши с %d локални обекта" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "действието завърши с %d локален обект" +msgstr[1] "действието завърши с %d локални обекта" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в " "диска)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, 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:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "добавеният обект не може да се компресира с „deflate“: %d" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "локалният обект „%s“ е повреден" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "грешка при затварянето на пакетния файл" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "" "грешка при записването на файла „%s“, осигуряващ запазване на директория" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "" "грешка при затварянето на записания файл „%s“, осигуряващ запазване на " "директория" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "пакетният файл не може да бъде запазен" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "файлът за индекса не може да бъде съхранен" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“" -#: builtin/index-pack.c:1475 -#, c-format -msgid "invalid number of threads specified (%d)" -msgstr "зададен е неправилен брой нишки: %d" - -#: builtin/index-pack.c:1479 builtin/index-pack.c:1663 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне" -#: builtin/index-pack.c:1537 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1539 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1586 +#: builtin/index-pack.c:1589 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "%d обект не е разлика" msgstr[1] "%d обекта не са разлика" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1596 #, 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 +#, 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:1623 +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "Процесът не може да се върне към предишната работна директория" -#: builtin/index-pack.c:1675 builtin/index-pack.c:1678 -#: builtin/index-pack.c:1690 builtin/index-pack.c:1694 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "неправилна стойност „%s“" -#: builtin/index-pack.c:1708 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "опцията „--fix-thin“ изисква „--stdin“" -#: builtin/index-pack.c:1712 builtin/index-pack.c:1721 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "името на пакетния файл „%s“ не завършва на „.pack“" - -#: builtin/index-pack.c:1729 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "опцията „--verify“ изисква име на пакетен файл" @@ -7269,28 +7757,27 @@ msgstr "„%s“ не може да се копира в „%s“" msgid "ignoring template %s" msgstr "игнориране на шаблона „%s“" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "директорията с шаблоните не е открита: „%s“" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "" -"шаблоните с неправилен номер на форма̀та %d няма да бъдат копирани от „%s“" +msgid "not copying templates from '%s': %s" +msgstr "шаблоните няма да бъдат копирани от „%s“: „%s“" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "Директорията „%s“ вече съществува" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "файлове от вид %d не се поддържат" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "„%s“ не може да се премести в „%s“" @@ -7298,24 +7785,24 @@ 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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s хранилище на Git в „%s%s“\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "Наново инициализирано, съществуващо" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "Инициализирано празно" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr ", споделено" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7323,27 +7810,27 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШАБЛОНИ] [--" "shared[=ПРАВА]] [ДИРЕКТОРИЯ]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "права" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "указване, че хранилището на Git ще бъде споделено от повече от един " "потребител" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "не може да се влезе в директорията „%s“" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7352,31 +7839,39 @@ msgstr "" "%s (или --work-tree=ДИРЕКТОРИЯ) изисква указването на %s (или --git-" "dir=ДИРЕКТОРИЯ)" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "Работното дърво в „%s“ е недостъпно" #: builtin/interpret-trailers.c:15 msgid "" -"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " -"[<file>...]" +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " +"<token>[(=|:)<value>])...] [<file>...]" msgstr "" -"git interpret-trailers [--trim-empty] [(--trailer ЛЕКСЕМА[(=|:)СТОЙНОСТ])…] " -"[ФАЙЛ…]" +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " +"ЛЕКСЕМА[(=|:)СТОЙНОСТ])…] [ФАЙЛ…]" -#: builtin/interpret-trailers.c:25 +#: builtin/interpret-trailers.c:26 +msgid "edit files in place" +msgstr "директно редактиране на файловете" + +#: builtin/interpret-trailers.c:27 msgid "trim empty trailers" msgstr "изчистване на празните епилози" -#: builtin/interpret-trailers.c:26 +#: builtin/interpret-trailers.c:28 msgid "trailer" msgstr "епилог" -#: builtin/interpret-trailers.c:27 +#: builtin/interpret-trailers.c:29 msgid "trailer(s) to add" msgstr "епилог(зи) за добавяне" +#: builtin/interpret-trailers.c:42 +msgid "no input file given for in-place editing" +msgstr "не е зададен входен файл за редактиране на място" + #: builtin/log.c:43 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]" @@ -7390,277 +7885,327 @@ msgstr "git show [ОПЦИЯ…] ОБЕКТ…" msgid "invalid --decorate option: %s" msgstr "неправилна опция „--decorate“: %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "без извеждане на разликите" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "извеждане на изходния код" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "" "Използване на файл за съответствията на имената и адресите на е-поща („." "mailmap“)" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "настройки на форма̀та на извежданата информация" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "" "Обработване само на редовете във файла в интервала от n до m включително. " "Броенето започва от 1" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "Резултат: %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: повреден файл" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "Обектът не може да бъде прочетен: %s" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "Неизвестен вид: %d" -#: builtin/log.c:714 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "не е зададена стойност на „format.headers“" -#: builtin/log.c:798 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "прекалено дълго име на директорията за изходната информация" -#: builtin/log.c:813 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "Файлът-кръпка „%s“ не може да бъде отворен" -#: builtin/log.c:827 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "Трябва да зададете точно един диапазон." -#: builtin/log.c:837 +#: builtin/log.c:851 msgid "Not a range." msgstr "Не е диапазон." -#: builtin/log.c:943 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "Придружаващото писмо трябва да е форматирано като е-писмо" # FIXME bad wording insanely -#: builtin/log.c:1022 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s" -#: builtin/log.c:1050 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]" -# FIXME message WTF why ask it -#: builtin/log.c:1095 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "Можете да укажете максимум една директория за изход." -#: builtin/log.c:1211 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, 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 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Не може да се открие към какво сочи „%s“." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "Точната база за сливане не може да се открие." + +#: builtin/log.c:1235 +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" +"зададете, използвайте „git branch --set-upstream-to“.\n" +"Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "Точната база при сливане не може да бъде открита" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "базовото подаване трябва да е предшественикът на списъка с версиите" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "базовото подаване не може да е в списъка с версиите" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "идентификаторът на кръпката не може да бъде получен" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка" -#: builtin/log.c:1214 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "номерация „[PATCH]“ дори и при множество кръпки" -#: builtin/log.c:1218 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "извеждане на кръпките на стандартния изход" -#: builtin/log.c:1220 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "създаване на придружаващо писмо" -#: builtin/log.c:1222 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "проста числова последователност за имената на файловете-кръпки" -#: builtin/log.c:1223 +#: builtin/log.c:1389 msgid "sfx" msgstr "ЗНАЦИ" -#: builtin/log.c:1224 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“" -#: builtin/log.c:1226 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1" -#: builtin/log.c:1228 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки" -#: builtin/log.c:1230 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“" -#: builtin/log.c:1233 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ" -#: builtin/log.c:1236 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "без добавяне/махане на префикса „[PATCH]“" -#: builtin/log.c:1239 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "без извеждане на разлики между двоични файлове" -#: builtin/log.c:1241 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "в заглавната част „From:“ (от) хешът да е само от нули" -#: builtin/log.c:1243 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "да не се включват кръпки, които присъстват в следения клон" -#: builtin/log.c:1245 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "" "извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)" -#: builtin/log.c:1247 +#: builtin/log.c:1413 msgid "Messaging" msgstr "Опции при изпращане" -#: builtin/log.c:1248 +#: builtin/log.c:1414 msgid "header" msgstr "ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1249 +#: builtin/log.c:1415 msgid "add email header" msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1250 builtin/log.c:1252 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "Е-ПОЩА" -#: builtin/log.c:1250 +#: builtin/log.c:1416 msgid "add To: header" msgstr "добавяне на заглавна част „To:“ (до)" -#: builtin/log.c:1252 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "добавяне на заглавна част „Cc:“ (и до)" -#: builtin/log.c:1254 +#: builtin/log.c:1420 msgid "ident" msgstr "ИДЕНТИЧНОСТ" -#: builtin/log.c:1255 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако " "не е зададена такава, се взима адреса на подаващия" -#: builtin/log.c:1257 +#: builtin/log.c:1423 msgid "message-id" msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1258 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "" "първото съобщение да е в отговор на е-писмото с този " "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1259 builtin/log.c:1262 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "граница" -#: builtin/log.c:1260 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "прикрепяне на кръпката" -#: builtin/log.c:1263 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "включване на кръпката в текста на писмата" -#: builtin/log.c:1267 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "" -"използване на нишки за съобщенията. Стилът е „shallow“ (плитък) или " +"използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или " "„deep“ (дълбок)" -#: builtin/log.c:1269 +#: builtin/log.c:1435 msgid "signature" msgstr "подпис" -#: builtin/log.c:1270 +#: builtin/log.c:1436 msgid "add a signature" msgstr "добавяне на поле за подпис" -#: builtin/log.c:1272 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "БАЗОВО_ПОДАВАНЕ" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "добавяне на необходимото БАЗово дърво към серията кръпки" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "добавяне на подпис от файл" -#: builtin/log.c:1273 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "без извеждане на имената на кръпките" -#: builtin/log.c:1362 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "опциите „-n“ и „-k“ са несъвместими." -#: builtin/log.c:1364 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "опциите „--subject-prefix“ и „-k“ са несъвместими." -#: builtin/log.c:1372 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1374 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1376 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "опцията „--check“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1401 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "" "изходът може да или стандартният, или да е в директория, но не и двете." -#: builtin/log.c:1403 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "Директорията „%s“ не може да бъде създадена" -#: builtin/log.c:1500 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "файлът „%s“ с подпис не може да бъде прочетен" -#: builtin/log.c:1563 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "Изходните файлове не могат да бъдат създадени" -#: builtin/log.c:1611 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]" -#: builtin/log.c:1665 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -7668,106 +8213,151 @@ msgstr "" "Следеният отдалечен клон не бе открит, затова изрично задайте " "ОТДАЛЕЧЕН_КЛОН.\n" -#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690 -#, c-format -msgid "Unknown commit %s" -msgstr "Непознато подаване „%s“" - -#: builtin/ls-files.c:358 +#: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [ОПЦИЯ…] [ФАЙЛ…]" -#: builtin/ls-files.c:415 +#: builtin/ls-files.c:427 msgid "identify the file status with tags" msgstr "извеждане на състоянието на файловете с еднобуквени флагове" -#: builtin/ls-files.c:417 +#: builtin/ls-files.c:429 msgid "use lowercase letters for 'assume unchanged' files" msgstr "малки букви за файловете, които да се счетат за непроменени" -#: builtin/ls-files.c:419 +#: builtin/ls-files.c:431 msgid "show cached files in the output (default)" msgstr "извеждане на кешираните файлове (стандартно)" -#: builtin/ls-files.c:421 +#: builtin/ls-files.c:433 msgid "show deleted files in the output" msgstr "извеждане на изтритите файлове" -#: builtin/ls-files.c:423 +#: builtin/ls-files.c:435 msgid "show modified files in the output" msgstr "извеждане на променените файлове" -#: builtin/ls-files.c:425 +#: builtin/ls-files.c:437 msgid "show other files in the output" msgstr "извеждане на другите файлове" -#: builtin/ls-files.c:427 +#: builtin/ls-files.c:439 msgid "show ignored files in the output" msgstr "извеждане на игнорираните файлове" -#: builtin/ls-files.c:430 +#: builtin/ls-files.c:442 msgid "show staged contents' object name in the output" msgstr "извеждане на името на обекта за съдържанието на индекса" -#: builtin/ls-files.c:432 +#: builtin/ls-files.c:444 msgid "show files on the filesystem that need to be removed" msgstr "извеждане на файловете, които трябва да бъдат изтрити" -#: builtin/ls-files.c:434 +#: builtin/ls-files.c:446 msgid "show 'other' directories' names only" msgstr "извеждане само на името на другите (неследените) директории" -#: builtin/ls-files.c:437 +#: builtin/ls-files.c:448 +msgid "show line endings of files" +msgstr "извеждане на знаците за край на ред във файловете" + +#: builtin/ls-files.c:450 msgid "don't show empty directories" msgstr "без извеждане на празните директории" -#: builtin/ls-files.c:440 +#: builtin/ls-files.c:453 msgid "show unmerged files in the output" msgstr "извеждане на неслетите файлове" # FIXME not clear about what this option does -#: builtin/ls-files.c:442 +#: builtin/ls-files.c:455 msgid "show resolve-undo information" msgstr "извеждане на информацията за отмяна на разрешените подавания" -#: builtin/ls-files.c:444 +#: builtin/ls-files.c:457 msgid "skip files matching pattern" msgstr "прескачане на файловете напасващи ШАБЛОНа" -#: builtin/ls-files.c:447 +#: builtin/ls-files.c:460 msgid "exclude patterns are read from <file>" msgstr "шаблоните за игнориране да се прочетат от този ФАЙЛ" -#: builtin/ls-files.c:450 +#: builtin/ls-files.c:463 msgid "read additional per-directory exclude patterns in <file>" msgstr "" "изчитане на допълнителните шаблони за игнориране по директория от този ФАЙЛ" -#: builtin/ls-files.c:452 +#: builtin/ls-files.c:465 msgid "add the standard git exclusions" msgstr "добавяне на стандартно игнорираните от Git файлове" -#: builtin/ls-files.c:455 +#: builtin/ls-files.c:468 msgid "make the output relative to the project top directory" msgstr "пътищата да са относителни спрямо основната директория на проекта" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:471 msgid "if any <file> is not in the index, treat this as an error" msgstr "грешка, ако някой от тези ФАЙЛове не е в индекса" -#: builtin/ls-files.c:459 +#: builtin/ls-files.c:472 msgid "tree-ish" msgstr "УКАЗАТЕЛ_КЪМ_ДЪРВО" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:473 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "считане, че пътищата изтрити след УКАЗАТЕЛя_КЪМ_ДЪРВО все още съществуват" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:475 msgid "show debugging data" msgstr "извеждане на информацията за изчистване на грешки" +#: builtin/ls-remote.c:7 +msgid "" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<repository> [<refs>...]]" +msgstr "" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=КОМАНДА]\n" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]" + +#: builtin/ls-remote.c:50 +msgid "do not print remote URL" +msgstr "без извеждане на адресите на отдалечените хранилища" + +#: builtin/ls-remote.c:51 builtin/ls-remote.c:53 +msgid "exec" +msgstr "КОМАНДА" + +#: builtin/ls-remote.c:52 builtin/ls-remote.c:54 +msgid "path of git-upload-pack on the remote host" +msgstr "път към командата „git-upload-pack“ на отдалечената машина" + +#: builtin/ls-remote.c:56 +msgid "limit to tags" +msgstr "само етикетите" + +#: builtin/ls-remote.c:57 +msgid "limit to heads" +msgstr "само върховете" + +#: builtin/ls-remote.c:58 +msgid "do not show peeled tags" +msgstr "без извеждане на проследените етикети" + +#: builtin/ls-remote.c:60 +msgid "take url.<base>.insteadOf into account" +msgstr "взимане предвид на „url.БАЗА.insteadOf“" + +#: builtin/ls-remote.c:62 +msgid "exit with exit code 2 if no matching refs are found" +msgstr "изход с код 2, ако не се открият съвпадащи указатели" + +#: builtin/ls-remote.c:64 +msgid "show underlying ref in addition to the object pointed by it" +msgstr "извеждане на указателя заедно с обекта сочен от него" + #: builtin/ls-tree.c:28 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО [ПЪТ…]" @@ -7819,175 +8409,179 @@ msgid "git merge --abort" msgstr "git merge --abort" # FIXME -m rather than just m -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "опцията „-m“ изисква стойност" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Няма такава стратегия за сливане: „%s“.\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "Наличните стратегии са:" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "Допълнителните стратегии са:" -#: builtin/merge.c:193 builtin/pull.c:119 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "без извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:196 builtin/pull.c:122 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:197 builtin/pull.c:125 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(синоним на „--stat“)" -#: builtin/merge.c:199 builtin/pull.c:128 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението " "за подаване" -#: builtin/merge.c:202 builtin/pull.c:131 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "създаване на едно подаване вместо извършване на сливане" -#: builtin/merge.c:204 builtin/pull.c:134 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "извършване на подаване при успешно сливане (стандартно действие)" -#: builtin/merge.c:206 builtin/pull.c:137 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "редактиране на съобщението преди подаване" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "позволяване на тривиално сливане (стандартно действие)" -#: builtin/merge.c:209 builtin/pull.c:143 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "преустановяване, ако сливането не е тривиално" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "Проверка, че именуваното подаване е с правилен подпис на GPG" -#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" -msgstr "стратегия" +msgstr "СТРАТЕГИЯ" -#: builtin/merge.c:215 builtin/pull.c:149 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" -msgstr "стратегия за сливане, която да се ползва" +msgstr "СТРАТЕГИЯ за сливане, която да се ползва" -#: builtin/merge.c:216 builtin/pull.c:152 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" -msgstr "опция=стойност" +msgstr "ОПЦИЯ=СТОЙНОСТ" -#: builtin/merge.c:217 builtin/pull.c:153 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" -msgstr "опция за избраната стратегия за сливане" +msgstr "ОПЦИЯ за избраната стратегия за сливане" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" -msgstr "съобщение при подаването със сливане (при нетривиални сливания)" +msgstr "СЪОБЩЕНИЕ при подаването със сливане (при нетривиални сливания)" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "преустановяване на текущото сливане" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "позволяване на сливане на независими истории" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "не може да се извърши скатаване" -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "неуспешно скатаване" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "неправилен обект: „%s“" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "неуспешно прочитане на обект-дърво" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (няма какво да се смачка)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Подаване със смачкване — указателят „HEAD“ няма да бъде обновен\n" -#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 -#: builtin/merge.c:988 +#: 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:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "Записване на съобщението за смачкване SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "Завършване на съобщението за смачкване SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" "Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n" -#: builtin/merge.c:447 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "„%s“ не сочи към подаване" -#: builtin/merge.c:537 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“" -#: builtin/merge.c:656 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "Поддържа се само сливане на точно две истории." -#: builtin/merge.c:670 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“" -#: builtin/merge.c:683 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "„%s“ не може да бъде записан" -#: builtin/merge.c:772 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "От „%s“ не може да се чете" -#: builtin/merge.c:781 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Сливането няма да бъде подадено. За завършването му и подаването му " "използвайте командата „git commit“.\n" -#: builtin/merge.c:787 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -8002,55 +8596,55 @@ msgstr "" "Редовете, които започват с „%c“ ще бъдат пропуснати, а празно съобщение\n" "преустановява подаването.\n" -#: builtin/merge.c:811 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "Празно съобщение при подаване." # FIXME - WTF is wonderful. -#: builtin/merge.c:823 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "Първият етап на тривиалното сливане завърши.\n" -#: builtin/merge.c:878 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "Неуспешно сливане — коригирайте конфликтите и подайте резултата.\n" -#: builtin/merge.c:894 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "„%s“ не е подаване" -#: builtin/merge.c:935 +#: builtin/merge.c:947 msgid "No current branch." msgstr "Няма текущ клон." -#: builtin/merge.c:937 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/merge.c:939 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "Текущият клон не следи никой клон." -#: builtin/merge.c:944 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Никой клон не следи клона „%s“ от хранилището „%s“" -#: builtin/merge.c:1079 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "„%s“ не може да се затвори" -#: builtin/merge.c:1206 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Не може да преустановите сливане, защото в момента не се извършва такова " "(липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1222 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8058,7 +8652,7 @@ msgstr "" "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n" "Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1229 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8066,111 +8660,115 @@ msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува). Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1232 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува)." -#: builtin/merge.c:1241 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "Опцията „--squash“ е несъвместима с „--no-ff“." -#: builtin/merge.c:1249 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена." -#: builtin/merge.c:1266 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "Подаване със смачкване във връх без история все още не се поддържа" -#: builtin/merge.c:1268 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Понеже върхът е без история, всички сливания са тривиални, не може да се " "извърши нетривиално сливане изисквано от опцията „--no-ff“" -#: builtin/merge.c:1274 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "„%s“ — не е нещо, което може да се слее" -#: builtin/merge.c:1276 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "Можете да слеете точно едно подаване във връх без история" -#: builtin/merge.c:1331 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1334 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1337 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Подаването „%s“ е без подпис от GPG." -#: builtin/merge.c:1340 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n" -#: builtin/merge.c:1423 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "независими истории не може да се слеят" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "Обновяване „%s..%s“\n" -#: builtin/merge.c:1460 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Проба с най-тривиалното сливане в рамките на индекса…\n" # FIXME WTF message -#: builtin/merge.c:1467 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "Неуспешно сливане.\n" -#: builtin/merge.c:1499 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "" "Не може да се извърши тривиално сливане, преустановяване на действието." -#: builtin/merge.c:1522 builtin/merge.c:1601 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Привеждане на дървото към първоначалното…\n" -#: builtin/merge.c:1526 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Пробване със стратегията за сливане „%s“…\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Никоя стратегия за сливане не може да извърши сливането.\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Неуспешно сливане със стратегия „%s“.\n" -#: builtin/merge.c:1603 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" "Ползва се стратегията „%s“, която ще подготви дървото за коригиране на " "ръка.\n" -#: builtin/merge.c:1615 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8258,19 +8856,19 @@ msgstr "без предупреждения при конфликти" msgid "set labels for file1/orig-file/file2" msgstr "задаване на етикети за ФАЙЛ_1/ОРИГИНАЛ/ФАЙЛ_2" -#: builtin/mktree.c:64 +#: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:150 +#: builtin/mktree.c:152 msgid "input is NUL terminated" msgstr "входните записи са разделени с нулевия знак „NUL“" -#: builtin/mktree.c:151 builtin/write-tree.c:24 +#: builtin/mktree.c:153 builtin/write-tree.c:24 msgid "allow missing objects" msgstr "разрешаване на липсващи обекти" -#: builtin/mktree.c:152 +#: builtin/mktree.c:154 msgid "allow creation of more than one tree" msgstr "разрешаване на създаването на повече от едно дърво" @@ -8278,138 +8876,136 @@ msgstr "разрешаване на създаването на повече о msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [ОПЦИЯ…] ОБЕКТ… ЦЕЛ" -# FIXME message< -#: builtin/mv.c:69 +#: builtin/mv.c:70 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Директорията „%s“ е в индекса, но не е подмодул" -#: builtin/mv.c:71 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "За да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n" "или ги скатайте" -# FIXME message -#: builtin/mv.c:89 +#: builtin/mv.c:90 #, c-format msgid "%.*s is in index" msgstr "„%.*s“ вече е в индекса" -#: builtin/mv.c:111 +#: builtin/mv.c:112 msgid "force move/rename even if target exists" msgstr "принудително преместване/преименуване дори целта да съществува" -#: builtin/mv.c:112 +#: builtin/mv.c:113 msgid "skip move/rename errors" msgstr "прескачане на грешките при преместване/преименуване" -#: builtin/mv.c:151 +#: builtin/mv.c:152 #, c-format msgid "destination '%s' is not a directory" msgstr "целта „%s“ съществува и не е директория" -#: builtin/mv.c:162 +#: builtin/mv.c:163 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n" -#: builtin/mv.c:166 +#: builtin/mv.c:167 msgid "bad source" msgstr "неправилен обект" -#: builtin/mv.c:169 +#: builtin/mv.c:170 msgid "can not move directory into itself" msgstr "директория не може да се премести в себе си" -#: builtin/mv.c:172 +#: builtin/mv.c:173 msgid "cannot move directory over file" msgstr "директория не може да се премести върху файл" -#: builtin/mv.c:181 +#: builtin/mv.c:182 msgid "source directory is empty" msgstr "първоначалната директория е празна" -#: builtin/mv.c:206 +#: builtin/mv.c:207 msgid "not under version control" msgstr "не е под контрола на Git" -#: builtin/mv.c:209 +#: builtin/mv.c:210 msgid "destination exists" msgstr "целта съществува" -#: builtin/mv.c:217 +#: builtin/mv.c:218 #, c-format msgid "overwriting '%s'" msgstr "презаписване на „%s“" -#: builtin/mv.c:220 +#: builtin/mv.c:221 msgid "Cannot overwrite" msgstr "Презаписването е невъзможно" -#: builtin/mv.c:223 +#: builtin/mv.c:224 msgid "multiple sources for the same target" msgstr "множество източници за една цел" -#: builtin/mv.c:225 +#: builtin/mv.c:226 msgid "destination directory does not exist" msgstr "целевата директория не съществува" -#: builtin/mv.c:232 +#: builtin/mv.c:233 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, обект: „%s“, цел: „%s“" -#: builtin/mv.c:253 +#: builtin/mv.c:254 #, c-format msgid "Renaming %s to %s\n" msgstr "Преименуване на „%s“ на „%s“\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "неуспешно преименуване на „%s“" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [ОПЦИЯ…] ПОДАВАНЕ…" -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [ОПЦИЯ…] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [ОПЦИЯ…] --stdin" # FIXME sha -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "извеждане само на имената (без сумите по SHA1)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "използване само на етикетите за именуване на подаванията" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" -msgstr "използване само на шаблоните напасващи на ШАБЛОНа" +msgstr "използване само на указателите напасващи на ШАБЛОНа" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" "извеждане на всички подавания, които могат да бъдат достигнати от всички " "указатели" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "четене от стандартния вход" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "да се извеждат и недефинираните имена (стандартна стойност на опцията)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)" @@ -8557,24 +9153,16 @@ msgstr "обектът-бележка не може да бъде записан msgid "The note contents have been left in %s" msgstr "Съдържанието на бележката е във файла „%s“" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "файлът „%s“ не може да бъде отворен или прочетен" -#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 -#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507 -#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653 -#: builtin/notes.c:877 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Не може да се открие към какво сочи „%s“." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8586,42 +9174,42 @@ msgid "Cannot read note data from non-blob object '%s'." msgstr "" "Съдържанието на бележка не може да се вземе от обект, който не е BLOB: „%s“." -#: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490 -#: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646 -#: builtin/notes.c:942 +#: 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 msgid "too many parameters" msgstr "прекалено много параметри" -#: builtin/notes.c:372 builtin/notes.c:659 +#: builtin/notes.c:375 builtin/notes.c:662 #, c-format msgid "No note found for object %s." msgstr "Няма бележки за обекта „%s“." -#: builtin/notes.c:393 builtin/notes.c:556 +#: builtin/notes.c:396 builtin/notes.c:559 msgid "note contents as a string" msgstr "низ, който е съдържанието на бележката" -#: builtin/notes.c:396 builtin/notes.c:559 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "note contents in a file" -msgstr "файл със съдържанието на бележката" +msgstr "ФАЙЛ със съдържанието на бележката" -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "reuse and edit specified note object" -msgstr "преизползване и редактиране на указания обект-бележка" +msgstr "преизползване и редактиране на указания ОБЕКТ-бележка" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "reuse specified note object" -msgstr "преизползване на указания обект-бележка" +msgstr "преизползване на указания ОБЕКТ-бележка" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "allow storing empty note" msgstr "приемане и на празни бележки" -#: builtin/notes.c:406 builtin/notes.c:477 +#: builtin/notes.c:409 builtin/notes.c:480 msgid "replace existing notes" msgstr "замяна на съществуващите бележки" -#: builtin/notes.c:431 +#: builtin/notes.c:434 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -8630,32 +9218,32 @@ msgstr "" "Не може да се добави бележка, защото такава вече съществува за обекта „%s“. " "Използвайте опцията „-f“, за да презапишете съществуващи бележки." -#: builtin/notes.c:446 builtin/notes.c:525 +#: builtin/notes.c:449 builtin/notes.c:528 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Презаписване на съществуващите бележки за обекта „%s“\n" -#: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "Изтриване на бележката за обекта „%s“\n" -#: builtin/notes.c:478 +#: builtin/notes.c:481 msgid "read objects from stdin" msgstr "изчитане на обектите от стандартния вход" # FIXME imporve message -#: builtin/notes.c:480 +#: builtin/notes.c:483 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "зареждане на настройките за КОМАНДАта, която презаписва подавания (включва " "опцията „--stdin“)" -#: builtin/notes.c:498 +#: builtin/notes.c:501 msgid "too few parameters" msgstr "прекалено малко параметри" -#: builtin/notes.c:519 +#: builtin/notes.c:522 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -8664,14 +9252,14 @@ msgstr "" "Не може да се копира бележка, защото такава вече съществува за обекта „%s“. " "Използвайте опцията „-f“, за да презапишете съществуващи бележки." -#: builtin/notes.c:531 +#: builtin/notes.c:534 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" "Не може да се копира бележка, която не съществува — няма бележки за обекта-" "източник „%s“." -#: builtin/notes.c:583 +#: builtin/notes.c:586 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -8682,67 +9270,67 @@ msgstr "" "Вместо това ги използвайте с подкомандата „add“: „git notes add -f -m/-F/-c/-" "C“.\n" -#: builtin/notes.c:764 +#: builtin/notes.c:768 msgid "General options" msgstr "Общи опции" -#: builtin/notes.c:766 +#: builtin/notes.c:770 msgid "Merge options" msgstr "Опции при сливане" -#: builtin/notes.c:768 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -"коригиране на конфликтите при сливане на бележките чрез тази стратегия — " +"коригиране на конфликтите при сливане на бележките чрез тази СТРАТЕГИЯ — " "„manual“ (ръчно), „ours“ (вашата версия), „theirs“ (чуждата версия), " "„union“ (обединяване), „cat_sort_uniq“ (обединяване, подреждане, уникални " "резултати)" -#: builtin/notes.c:770 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "Подаване на неслети бележки" -#: builtin/notes.c:772 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "завършване на сливането чрез подаване на неслети бележки" -#: builtin/notes.c:774 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "Преустановяване на корекцията при сливането на бележки" -#: builtin/notes.c:776 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "преустановяване на сливането на бележки" -#: builtin/notes.c:853 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "В момента се извършва сливане на бележките в „%s“ при „%s“" -#: builtin/notes.c:880 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "Няма бележки за обекта „%s“\n" -#: builtin/notes.c:892 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "опитът за изтриването на несъществуваща бележка не се счита за грешка" -#: builtin/notes.c:895 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "изчитане на имената на обектите от стандартния вход" -#: builtin/notes.c:976 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" -#: builtin/notes.c:977 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" -#: builtin/notes.c:1012 builtin/remote.c:1647 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "Непозната подкоманда: %s" @@ -8766,181 +9354,187 @@ msgstr "" msgid "deflate error (%d)" msgstr "грешка при декомпресиране с „deflate“ (%d)" -#: builtin/pack-objects.c:771 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "" +"изключване на записването на битовата маска, пакетите са разделени поради " +"стойността на „pack.packSizeLimit“" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "Записване на обектите" -#: builtin/pack-objects.c:1011 +#: builtin/pack-objects.c:1017 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "изключване на записването на битовата маска, защото някои обекти няма да се " "пакетират" -#: builtin/pack-objects.c:2171 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "Компресиране на обектите" -#: builtin/pack-objects.c:2568 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "неподдържана версия на индекса „%s“" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "неправилна версия на индекса „%s“" -#: builtin/pack-objects.c:2602 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "без извеждане на напредъка" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "извеждане на напредъка" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "извеждане на напредъка във фазата на запазване на обектите" -#: builtin/pack-objects.c:2609 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "" "същото действие като опцията „--all-progress“ при извеждането на напредъка" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "" "запазване на индекса на пакетните файлове във форма̀та с указаната версия" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "максимален размер на всеки пакетен файл" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "игнориране на обектите заети от други хранилища на обекти" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "игнориране на пакетираните обекти" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "ограничаване на прозореца за пакетиране по брой обекти" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "" "ограничаване на прозореца за пакетиране и по памет освен по брой обекти" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2619 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "максимална дължина на веригата от разлики, която е позволена в пакетния файл" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "преизползване на съществуващите разлики" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "преизползване на съществуващите обекти" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "използване на обекти „OFS_DELTA“" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2627 msgid "use threads when searching for best delta matches" msgstr "" "стартиране на нишки за претърсване на най-добрите съвпадения на разликите" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "без създаване на празен пакетен файл" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "изчитане на версиите от стандартния вход" -#: builtin/pack-objects.c:2638 +#: builtin/pack-objects.c:2633 msgid "limit the objects to those that are not yet packed" msgstr "ограничаване до все още непакетираните обекти" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "" "включване на всички обекти, които могат да се достигнат от произволен " "указател" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "включване и на обектите сочени от записите в журнала на указателите" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "включване и на обектите сочени от индекса" -#: builtin/pack-objects.c:2650 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "извеждане на пакета на стандартния изход" -#: builtin/pack-objects.c:2652 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "" "включване и на обектите-етикети, които сочат към обектите, които ще бъдат " "пакетирани" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "запазване на недостижимите обекти" -#: builtin/pack-objects.c:2655 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "ВРЕМЕ" -#: builtin/pack-objects.c:2656 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "създаване на съкратени пакети" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "пакетиране подходящо за плитко доставяне" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "игнориране на пакетите, които са придружени от файл „.keep“" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "ниво на компресиране при пакетиране" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "" "извеждане на всички родители — дори и тези, които нормално са скрити при " "присажданията" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2664 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "използване на съществуващи индекси на база битови маски за ускоряване на " "преброяването на обектите" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "" "запазване и на индекс на база побитова маска, заедно с индекса за пакета" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "Преброяване на обектите" @@ -8968,15 +9562,15 @@ msgstr "Изтриване на повтарящите се обекти" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire ВРЕМЕ] [--] [ВРЪХ…]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "само извеждане без действително окастряне" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "информация за окастрените обекти" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "окастряне на обектите по-стари от това ВРЕМЕ" @@ -8984,52 +9578,60 @@ msgstr "окастряне на обектите по-стари от това msgid "cannot prune in a precious-objects repo" msgstr "хранилище с важни обекти не може да се окастря" -#: builtin/pull.c:69 +#: builtin/pull.c:72 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]" -#: builtin/pull.c:113 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "Опции при сливане" -#: builtin/pull.c:116 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "внасяне на промените чрез пребазиране, а не чрез сливане" -#: builtin/pull.c:140 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "позволяване на тривиални сливания" -#: builtin/pull.c:146 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "Проверка, че указаното подаване е с правилен подпис на GPG" -#: builtin/pull.c:160 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "Опции при доставяне" -#: builtin/pull.c:268 +#: builtin/pull.c:194 +msgid "number of submodules pulled in parallel" +msgstr "брой подмодули издърпани паралелно" + +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Неправилна стойност за „pull.ff“: „%s“" -#: builtin/pull.c:352 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" "Не можете да издърпвате при това пребазиране, защото има промени, които не " "са в индекса" -#: builtin/pull.c:358 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "Освен това в индекса има неподадени промени." -#: builtin/pull.c:360 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "Не можете да издърпвате при това пребазиране, защото в индекса има " "неподадени промени." -#: builtin/pull.c:436 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9037,14 +9639,14 @@ msgstr "" "Между указателите, които току що доставихте, няма подходящ кандидат, върху " "който да пребазирате." -#: builtin/pull.c:438 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Между указателите, които току що доставихте, няма подходящ кандидат, който " "да слеете." -#: builtin/pull.c:439 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -9052,7 +9654,7 @@ msgstr "" "Най вероятно сте подали шаблон за указатели, който не е напаснал с нищо в " "отдалеченото хранилище." -#: builtin/pull.c:442 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9063,40 +9665,44 @@ msgstr "" "Понеже това не е хранилището по подразбиране на текущия клон, трябва\n" "да укажете отдалечения клон на командния ред." -#: builtin/pull.c:447 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Извън всички клони." -#: builtin/pull.c:449 builtin/pull.c:464 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Укажете върху кой клон искате да пребазирате." -#: builtin/pull.c:451 builtin/pull.c:466 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Укажете кой клон искате да слеете." -#: builtin/pull.c:452 builtin/pull.c:467 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "За повече информация погледнете ръководството „git-pull(1)“" -#: builtin/pull.c:462 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "КЛОН" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/pull.c:471 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" msgstr "" -"Ако все пак искате да зададете информация за следен клон,\n" -"можете да направите това с командата:\n" -"\n" -" git branch --set-upstream-to=%s/СЛЕДЕН_КЛОН %s\n" -"\n" +"Ако искате да зададете информация за следен клон, можете да направите това с " +"командата:" -#: builtin/pull.c:476 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9105,11 +9711,15 @@ msgstr "" "За сливане е указан отдалеченият указател „%s“,\n" "но такъв не е доставен." -#: builtin/pull.c:830 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "опцията „--[no-]autostash“ изисква „--rebase“" + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "Обновяване на все още несъздаден клон с промените от индекса" -#: builtin/pull.c:859 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9119,7 +9729,7 @@ msgstr "" "доставянето обнови върха на текущия клон. Работното\n" "ви копие бе тривиално слято от подаване „%s“." -#: builtin/pull.c:864 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9136,11 +9746,11 @@ msgstr "" " $ git reset --hard\n" "за връщане към нормално състояние." -#: builtin/pull.c:879 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "Не може да сливате множество клони в празен върхов указател." -#: builtin/pull.c:883 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "Не може да пребазирате върху повече от един клон." @@ -9148,15 +9758,15 @@ msgstr "Не може да пребазирате върху повече от msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]" -#: builtin/push.c:88 +#: builtin/push.c:89 msgid "tag shorthand without <tag>" msgstr "съкращение за етикет без ЕТИКЕТ" -#: builtin/push.c:98 +#: builtin/push.c:99 msgid "--delete only accepts plain target ref names" msgstr "опцията „--delete“ приема за цел само прости имена на указатели" -#: builtin/push.c:142 +#: builtin/push.c:143 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -9165,7 +9775,7 @@ msgstr "" "За да включите тази опция за постоянно, погледнете документацията за " "настройката „push.default“ в „git help config“." -#: builtin/push.c:145 +#: builtin/push.c:146 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -9190,7 +9800,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:160 +#: builtin/push.c:161 #, c-format msgid "" "You are not currently on a branch.\n" @@ -9204,7 +9814,7 @@ msgstr "" "\n" " git push %s HEAD:ИМЕ_НА_ОТДАЛЕЧЕНИЯ_КЛОН\n" -#: builtin/push.c:174 +#: builtin/push.c:175 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -9218,14 +9828,14 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:182 +#: builtin/push.c:183 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "Текущият клон „%s“ следи няколко отдалечени клона, не можете просто да " "изтласкате." -#: builtin/push.c:185 +#: builtin/push.c:186 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -9237,67 +9847,14 @@ msgstr "" "Трябва да укажете коя версия да се изтласка, за обновяване на отдалечения " "клон." -#: builtin/push.c:208 -msgid "" -"push.default is unset; its implicit value has changed in\n" -"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" -"and maintain the traditional behavior, use:\n" -"\n" -" git config --global push.default matching\n" -"\n" -"To squelch this message and adopt the new behavior now, use:\n" -"\n" -" git config --global push.default simple\n" -"\n" -"When push.default is set to 'matching', git will push local branches\n" -"to the remote branches that already exist with the same name.\n" -"\n" -"Since Git 2.0, Git defaults to the more conservative 'simple'\n" -"behavior, which only pushes the current branch to the corresponding\n" -"remote branch that 'git pull' uses to update the current branch.\n" -"\n" -"See 'git help config' and search for 'push.default' for further " -"information.\n" -"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" -"'current' instead of 'simple' if you sometimes use older versions of Git)" -msgstr "" -"Настройката „push.default“ не е зададена. Стойността ѝ по подразбиране е " -"сменена\n" -"в Git 2.0 от „matching“ (всички съвпадащи клони) на „simple“ (само текущия\n" -"клон). За да подтиснете това съобщение и да използвате традиционното " -"поведение\n" -"на Git 1.x, изпълнете командата:\n" -"\n" -" git config --global push.default matching\n" -"\n" -"За да подтиснете това съобщение и да използвате новото поведение на Git 2." -"x,\n" -"изпълнете командата:\n" -"\n" -" git config --global push.default simple\n" -"\n" -"Когато настройката „push.default“ е „matching“, git ще изтласка всички " -"локални\n" -"клони, които имат отдалечен аналог със същото име.\n" -"\n" -"От версия 2.0 Git стандартно започва да ползва по-консервативния вариант\n" -"„simple“, при който „push“ изтласква само текущия клон към отдалечения, " -"следен\n" -"клон — същия, който „git pull“ използва, за да обнови текущия.\n" -"\n" -"За повече информация погледнете „git help config“ и потърсете „push." -"default“.\n" -"Новата стойност „simple“ бе въведена с версия 1.7.11 на Git. Ако понякога\n" -"ползвате стари версии на Git, задайте стойност „current“ вместо „simple“." - -#: builtin/push.c:275 +#: builtin/push.c:242 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Не сте указали версия за подаване, а настройката „push.default“ е " "„nothing“ (нищо без изрично указана версия да не се изтласква)" -#: builtin/push.c:282 +#: builtin/push.c:249 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -9311,7 +9868,7 @@ msgstr "" "преди отново да изтласкате промените. За повече информация вижте раздела\n" "„Note about fast-forwards“ в страницата от ръководството „git push --help“." -#: builtin/push.c:288 +#: builtin/push.c:255 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" @@ -9324,7 +9881,7 @@ msgstr "" "информация погледнете раздела „Note about fast-forwards“ в страницата от\n" "ръководството „git push --help“." -#: builtin/push.c:294 +#: builtin/push.c:261 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" @@ -9343,14 +9900,14 @@ msgstr "" "страницата\n" "от ръководството „git push --help“." -#: builtin/push.c:301 +#: builtin/push.c:268 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Изтласкването е отхвърлено, защото в отдалеченото хранилище съществува " "етикет,\n" "който ще припокриете с етикет от вашето хранилище." -#: builtin/push.c:304 +#: builtin/push.c:271 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" @@ -9360,22 +9917,22 @@ msgstr "" "указател, който вече сочи към обект, който не е подаване, както и тепърва\n" "да го промените да сочи към подобен обект.\n" -#: builtin/push.c:363 +#: builtin/push.c:331 #, c-format msgid "Pushing to %s\n" msgstr "Изтласкване към „%s“\n" -#: builtin/push.c:367 +#: builtin/push.c:335 #, c-format msgid "failed to push some refs to '%s'" msgstr "част от указателите не бяха изтласкани към „%s“" -#: builtin/push.c:397 +#: builtin/push.c:365 #, c-format msgid "bad repository '%s'" msgstr "неправилно указано хранилище „%s“" -#: builtin/push.c:398 +#: builtin/push.c:366 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -9397,108 +9954,104 @@ msgstr "" "\n" " git push ИМЕ\n" -#: builtin/push.c:413 +#: builtin/push.c:381 msgid "--all and --tags are incompatible" msgstr "опциите „--all“ и „--tags“ са несъвместими" -#: builtin/push.c:414 +#: builtin/push.c:382 msgid "--all can't be combined with refspecs" msgstr "опцията „--all“ е несъвместима с указването на версия" -#: builtin/push.c:419 +#: builtin/push.c:387 msgid "--mirror and --tags are incompatible" msgstr "опциите „--mirror“ и „--tags“ са несъвместими" -#: builtin/push.c:420 +#: builtin/push.c:388 msgid "--mirror can't be combined with refspecs" msgstr "опцията „--mirror“ е несъвместима с указването на версия" -#: builtin/push.c:425 +#: builtin/push.c:393 msgid "--all and --mirror are incompatible" msgstr "опциите „--all“ и „--mirror“ са несъвместими" -#: builtin/push.c:537 +#: builtin/push.c:505 msgid "repository" msgstr "хранилище" -#: builtin/push.c:538 builtin/send-pack.c:161 +#: builtin/push.c:506 builtin/send-pack.c:161 msgid "push all refs" msgstr "изтласкване на всички указатели" -#: builtin/push.c:539 builtin/send-pack.c:163 +#: builtin/push.c:507 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "огледално копие на всички указатели" -#: builtin/push.c:541 +#: builtin/push.c:509 msgid "delete refs" msgstr "изтриване на указателите" -#: builtin/push.c:542 +#: builtin/push.c:510 msgid "push tags (can't be used with --all or --mirror)" msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)" -#: builtin/push.c:545 builtin/send-pack.c:164 +#: builtin/push.c:513 builtin/send-pack.c:164 msgid "force updates" msgstr "принудително обновяване" # FIXME double check this -#: builtin/push.c:547 builtin/send-pack.c:175 +#: builtin/push.c:515 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "УКАЗАТЕЛ>:<ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:548 builtin/send-pack.c:176 +#: builtin/push.c:516 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:550 -msgid "check|on-demand|no" -msgstr "„check“ (проверка), „on-demand“ (при нужда) или „no“ (без)" - -#: builtin/push.c:551 +#: builtin/push.c:519 msgid "control recursive pushing of submodules" msgstr "управление на рекурсивното изтласкване на подмодулите" -#: builtin/push.c:553 builtin/send-pack.c:169 +#: builtin/push.c:521 builtin/send-pack.c:169 msgid "use thin pack" msgstr "използване на съкратени пакети" -#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158 +#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158 #: builtin/send-pack.c:159 msgid "receive pack program" msgstr "програма за получаването на пакети" -#: builtin/push.c:556 +#: builtin/push.c:524 msgid "set upstream for git pull/status" msgstr "задаване на отдалеченото хранилище за командите „git pull/status“" -#: builtin/push.c:559 +#: builtin/push.c:527 msgid "prune locally removed refs" msgstr "окастряне на указателите, които са премахнати от локалното хранилище" -#: builtin/push.c:561 +#: builtin/push.c:529 msgid "bypass pre-push hook" msgstr "без изпълнение на куката преди изтласкване (pre-push)" -#: builtin/push.c:562 +#: builtin/push.c:530 msgid "push missing but relevant tags" msgstr "" "изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото " "изтласкване, етикети" -#: builtin/push.c:565 builtin/send-pack.c:166 +#: builtin/push.c:533 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "подписване на изтласкването с GPG" -#: builtin/push.c:567 builtin/send-pack.c:170 +#: builtin/push.c:535 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "изискване на атомарни операции от отсрещната страна" -#: builtin/push.c:577 +#: builtin/push.c:549 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" "опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“" -#: builtin/push.c:579 +#: builtin/push.c:551 msgid "--delete doesn't make sense without any refs" msgstr "опцията „--delete“ изисква поне един указател на версия" @@ -9577,13 +10130,24 @@ msgstr "без прилагане на филтъра за частично из msgid "debug unpack-trees" msgstr "изчистване на грешки в командата „unpack-trees“" -# FIXME -#: builtin/reflog.c:428 +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "без извеждане на информация" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "Трябва да укажете директория." + +#: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "„%s“ не е правилна стойност за време за „%s“" -#: builtin/reflog.c:545 builtin/reflog.c:550 +#: builtin/reflog.c:540 builtin/reflog.c:545 #, c-format msgid "'%s' is not a valid timestamp" msgstr "„%s“ не е правилна стойност за време" @@ -9730,56 +10294,46 @@ msgstr "" "указването на следени клони е смислено само за отдалечени хранилища, от " "които се доставя" -#: builtin/remote.c:193 builtin/remote.c:643 +#: builtin/remote.c:190 builtin/remote.c:633 #, c-format msgid "remote %s already exists." msgstr "вече съществува отдалечено хранилище с име „%s“." -#: builtin/remote.c:197 builtin/remote.c:647 +#: builtin/remote.c:194 builtin/remote.c:637 #, c-format msgid "'%s' is not a valid remote name" msgstr "„%s“ е неправилно име за отдалечено хранилище" -#: builtin/remote.c:241 +#: builtin/remote.c:234 #, c-format msgid "Could not setup master '%s'" msgstr "Основният клон „%s“ не може да бъде настроен" -#: builtin/remote.c:341 +#: builtin/remote.c:336 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Обектите за доставяне за указателя „%s“ не могат да бъдат получени" -#: builtin/remote.c:442 builtin/remote.c:450 +#: builtin/remote.c:437 builtin/remote.c:445 msgid "(matching)" msgstr "(съвпадащи)" -#: builtin/remote.c:454 +#: builtin/remote.c:449 msgid "(delete)" msgstr "(за изтриване)" -#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606 -#, c-format -msgid "Could not append '%s' to '%s'" -msgstr "„%s“ не може да се добави към „%s“" - -#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875 +#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858 #, c-format msgid "No such remote: %s" msgstr "Такова отдалечено хранилище няма: %s" -#: builtin/remote.c:653 +#: builtin/remote.c:643 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Разделът „%s“ в настройките не може да бъде преименуван на „%s“" -#: builtin/remote.c:659 builtin/remote.c:827 -#, c-format -msgid "Could not remove config section '%s'" -msgstr "Разделът „%s“ в настройките не може да бъде изтрит" - # FIXME tabulator -#: builtin/remote.c:674 +#: builtin/remote.c:663 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -9790,27 +10344,17 @@ msgstr "" " %s\n" " Променете настройките ръчно, ако е необходимо." -#: builtin/remote.c:680 -#, c-format -msgid "Could not append '%s'" -msgstr "Разделът „%s“ не може да бъде добавен в настройките" - -#: builtin/remote.c:691 -#, c-format -msgid "Could not set '%s'" -msgstr "Разделът „%s“ не може да бъде зададен в настройките" - -#: builtin/remote.c:713 +#: builtin/remote.c:699 #, c-format msgid "deleting '%s' failed" msgstr "неуспешно изтриване на „%s“" -#: builtin/remote.c:747 +#: builtin/remote.c:733 #, c-format msgid "creating '%s' failed" msgstr "неуспешно създаване на „%s“" -#: builtin/remote.c:813 +#: builtin/remote.c:796 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -9824,125 +10368,132 @@ msgstr[1] "" "Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n" "Изтрийте ги чрез командата:" -#: builtin/remote.c:928 +#: builtin/remote.c:810 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Разделът „%s“ в настройките не може да бъде изтрит" + +#: builtin/remote.c:911 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)" -#: builtin/remote.c:931 +#: builtin/remote.c:914 msgid " tracked" msgstr " следен" -#: builtin/remote.c:933 +#: builtin/remote.c:916 msgid " stale (use 'git remote prune' to remove)" msgstr " стар (изтрийте чрез „git remote prune“)" # FIXME -#: builtin/remote.c:935 +#: builtin/remote.c:918 msgid " ???" msgstr " неясно състояние" # CHECK -#: builtin/remote.c:976 +#: builtin/remote.c:959 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" "неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече от " "1 клон" -#: builtin/remote.c:983 +#: builtin/remote.c:967 #, c-format -msgid "rebases onto remote %s" -msgstr "пребазиране върху отдалечения клон „%s“" +msgid "rebases interactively onto remote %s" +msgstr "интерактивно пребазиране върху отдалечения клон „%s“" -#: builtin/remote.c:986 +#: builtin/remote.c:971 #, c-format msgid " merges with remote %s" msgstr " сливане с отдалечения клон „%s“" -#: builtin/remote.c:987 +#: builtin/remote.c:972 msgid " and with remote" msgstr " и с отдалечения клон" -#: builtin/remote.c:989 +#: builtin/remote.c:974 #, c-format msgid "merges with remote %s" msgstr "сливане с отдалечения клон „%s“" -#: builtin/remote.c:990 +#: builtin/remote.c:975 msgid " and with remote" msgstr " и с отдалечения клон" -#: builtin/remote.c:1036 +#: builtin/remote.c:1021 msgid "create" msgstr "създаден" -#: builtin/remote.c:1039 +#: builtin/remote.c:1024 msgid "delete" msgstr "изтрит" -#: builtin/remote.c:1043 +#: builtin/remote.c:1028 msgid "up to date" msgstr "актуален" -#: builtin/remote.c:1046 +#: builtin/remote.c:1031 msgid "fast-forwardable" msgstr "може да се слее тривиално" -#: builtin/remote.c:1049 +#: builtin/remote.c:1034 msgid "local out of date" msgstr "локалният е изостанал" -#: builtin/remote.c:1056 +#: builtin/remote.c:1041 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s принудително изтласква към %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1044 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s изтласква към %-*s (%s)" -#: builtin/remote.c:1063 +#: builtin/remote.c:1048 #, c-format msgid " %-*s forces to %s" msgstr " %-*s принудително изтласква към %s" -#: builtin/remote.c:1066 +#: builtin/remote.c:1051 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s изтласква към %s" -#: builtin/remote.c:1134 +#: builtin/remote.c:1119 msgid "do not query remotes" msgstr "без заявки към отдалечените хранилища" -#: builtin/remote.c:1161 +#: builtin/remote.c:1146 #, c-format msgid "* remote %s" msgstr "● отдалечено хранилище „%s“" -#: builtin/remote.c:1162 +#: builtin/remote.c:1147 #, c-format msgid " Fetch URL: %s" msgstr " Адрес за доставяне: %s" -#: builtin/remote.c:1163 builtin/remote.c:1314 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(без адрес)" # FIXME spaces betwen Push and URL -#: builtin/remote.c:1172 builtin/remote.c:1174 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " Адрес за изтласкване: %s" -#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " клон сочен от HEAD: %s" -#: builtin/remote.c:1182 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -9951,159 +10502,159 @@ msgstr "" "хранилище е\n" " нееднозначен и е някой от следните):\n" -#: builtin/remote.c:1194 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Отдалечен клон:%s" msgstr[1] " Отдалечени клони:%s" -#: builtin/remote.c:1197 builtin/remote.c:1224 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (състоянието не бе проверено)" -#: builtin/remote.c:1206 +#: builtin/remote.c:1193 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:1214 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " Локалните указатели ще бъдат пренесени чрез „ push“" -#: builtin/remote.c:1221 +#: builtin/remote.c:1208 #, 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:1242 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище" -#: builtin/remote.c:1244 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "изтриване на refs/remotes/ИМЕ/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "Не може да се установи отдалеченият връх" -#: builtin/remote.c:1261 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Множество клони с върхове. Изберете изрично някой от тях чрез командата:" -#: builtin/remote.c:1271 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "„%s“ не може да бъде изтрит" -#: builtin/remote.c:1279 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "Неправилен указател: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "„%s“ не може да се настрои" -#: builtin/remote.c:1299 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr "„%s“ ще се превърне в обект извън клоните!" -#: builtin/remote.c:1300 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr "„%s“ се превърна в обект извън клоните!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "Окастряне на „%s“" -#: builtin/remote.c:1311 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "адрес: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " ● [ще бъде окастрено] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " ● [окастрено] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "окастряне на огледалата на отдалечените хранилища след доставяне" -#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Няма отдалечено хранилище на име „%s“" -#: builtin/remote.c:1461 +#: builtin/remote.c:1441 msgid "add branch" msgstr "добавяне на клон" -#: builtin/remote.c:1468 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "не е указано отдалечено хранилище" -#: builtin/remote.c:1485 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "запитване към адресите за изтласкване, а не за доставяне" -#: builtin/remote.c:1487 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "извеждане на всички адреси" -#: builtin/remote.c:1515 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "не е зададен адрес за отдалеченото хранилище „%s“" -#: builtin/remote.c:1541 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "промяна на адресите за изтласкване" -#: builtin/remote.c:1543 +#: builtin/remote.c:1523 msgid "add URL" msgstr "добавяне на адреси" -#: builtin/remote.c:1545 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "изтриване на адреси" # FIXME message - incompatible -#: builtin/remote.c:1552 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "опциите „--add“ и „--delete“ са несъвместими" -#: builtin/remote.c:1592 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Неправилен (стар) формат за адрес: %s" -#: builtin/remote.c:1600 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "Такъв адрес не е открит: %s" # FIXME CHECK MEANING -#: builtin/remote.c:1602 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие" -#: builtin/remote.c:1616 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "повече подробности. Поставя се пред подкоманда" @@ -10419,7 +10970,7 @@ msgstr "Индексът не може да бъде занулен към ве msgid "Could not write new index file." msgstr "Новият индекс не може да бъде записан." -#: builtin/rev-list.c:354 +#: builtin/rev-list.c:350 msgid "rev-list does not support display of notes" msgstr "командата „rev-list“ не поддържа извеждането на бележки" @@ -10634,12 +11185,6 @@ msgstr "" "изходният код да е 0, дори ако никой файл нe e напаснал с шаблона за " "изтриване" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"За да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n" -"или ги скатайте" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10681,29 +11226,24 @@ msgstr "извеждане на състоянието от отдалечена msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] [ПЪТ…]]" -#: builtin/shortlog.c:131 -#, c-format -msgid "Missing author: %s" -msgstr "Авторът липсва: %s" - -#: builtin/shortlog.c:230 +#: builtin/shortlog.c:242 msgid "sort output according to the number of commits per author" msgstr "подредба на подаванията по броя подавания от автор" -#: builtin/shortlog.c:232 +#: builtin/shortlog.c:244 msgid "Suppress commit descriptions, only provides commit count" msgstr "Без описания на подаванията — да се показва само броя подавания" -#: builtin/shortlog.c:234 +#: builtin/shortlog.c:246 msgid "Show the email address of each author" msgstr "Извеждане на адреса на е-поща за всеки автор" # FIXME why is this so short -#: builtin/shortlog.c:235 +#: builtin/shortlog.c:247 msgid "w[,i1[,i2]]" msgstr "ШИРОЧИНА[,ОТСТЪП_1[,ОТСТЪП_2]]" -#: builtin/shortlog.c:236 +#: builtin/shortlog.c:248 msgid "Linewrap output" msgstr "" "Пренасяне на редовете до тази обща ШИРОЧИНА (76), с ОТСТЪП_1 (6) за първия " @@ -10853,84 +11393,186 @@ msgid "skip and remove all lines starting with comment character" msgstr "пропускане на всички редове, които започват с „#“" #: builtin/stripspace.c:38 -msgid "prepend comment character and blank to each line" -msgstr "добавяне на „# “ на всеки ред" +msgid "prepend comment character and space to each line" +msgstr "добавяне на „# “ в началото на всеки ред" + +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "Такъв указател няма: %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "Очаква се пълно име на указател, а не „%s“" -#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:71 +#, c-format +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 msgid "alternative anchor for relative paths" msgstr "директория за определянето на относителните пътища" -#: builtin/submodule--helper.c:84 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "Неуспешно регистриране на адрес за пътя към подмодул „%s“" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "Регистриран е подмодул „%s“ (%s) за пътя към подмодул „%s“\n" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "" +"Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "Без извеждане на информация при инициализирането на подмодул" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper name [ПЪТ]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name ПЪТ" -#: builtin/submodule--helper.c:120 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Във файла „.gitmodules“ липсва информация за пътя „%s“" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "къде да се клонира новият подмодул" -#: builtin/submodule--helper.c:173 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "име на новия подмодул" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "адрес, от който да се клонира новият подмодул" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "дълбочина на плитките хранилища" -#: builtin/submodule--helper.c:188 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] " -"[--name ИМЕ] [--url АДРЕС][--depth ДЪЛБОЧИНА] [--] ПЪТ…]" +"[--name ИМЕ] [--depth ДЪЛБОЧИНА] --url АДРЕС --path ПЪТ…" -#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208 -#: builtin/submodule--helper.c:216 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "Директорията „%s“ не може да бъде създадена" -#: builtin/submodule--helper.c:204 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул" -#: builtin/submodule--helper.c:227 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "файлът „%s“ не може да бъде отворен" -#: builtin/submodule--helper.c:232 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "файлът „%s“ не може да се затвори" -#: builtin/submodule--helper.c:247 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "директорията на подмодула „%s“ не може да бъде получена" -#: builtin/submodule--helper.c:273 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" -msgstr "ФАТАЛНА ГРЕШКА: „submodule--helper“ трябва да се стартира с подкоманда" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "Пътят на подмодула „%s“ не е инициализиран" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "Вероятно искахте да използвате „update --init“?" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "Прескачане на неслетия подмодул „%s“" -#: builtin/submodule--helper.c:280 +#: builtin/submodule--helper.c:660 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "ФАТАЛНА ГРЕШКА: „%s“ не е подкоманда на „submodule--helper“" +msgid "Skipping submodule '%s'" +msgstr "Прескачане на подмодула „%s“" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "път към работното дърво" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "път към работното дърво, през границите на вложените подмодули" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "" +"„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или " +"„none“ (нищо да не се прави)" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "Плитко клониране, ограничено до указания брой версии" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "брой паралелни процеси" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "без извеждане на напредъка на клонирането" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "неправилен параметър към опцията „--update“" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "„submodule--helper“ трябва да се стартира с подкоманда" + +#: builtin/submodule--helper.c:862 +#, c-format +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "„%s“ не е подкоманда на „submodule--helper“" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10985,27 +11627,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v ЕТИКЕТ…" -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "името на етикета е твърде дълго: „%.*s“…" -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "етикетът „%s“ не е открит." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Изтрит е етикетът „%s“ (бе „%s“)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "етикетът „%s“ не може да бъде проверен" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -11018,7 +11655,7 @@ msgstr "" " %s\n" "Редовете, които започват с „%c“, ще бъдат пропуснати.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -11085,7 +11722,7 @@ msgstr "анотирането на етикети изисква съобщен #: builtin/tag.c:350 msgid "tag message" -msgstr "съобщение за етикет" +msgstr "СЪОБЩЕНИЕ за етикет" #: builtin/tag.c:352 msgid "annotated and GPG-signed tag" @@ -11125,7 +11762,7 @@ msgstr "извеждане само на неслетите етикети" #: builtin/tag.c:370 msgid "print only tags of the object" -msgstr "извеждане само на етикетите на обекта" +msgstr "извеждане само на етикетите на ОБЕКТА" #: builtin/tag.c:399 msgid "--column and -n are incompatible" @@ -11145,28 +11782,28 @@ msgstr "Опцията „-points-at“ изисква опцията „-l“." #: builtin/tag.c:425 msgid "--merged and --no-merged option are only allowed with -l" -msgstr "Опцииите „--merged“ и „--no-merged“ изискват опцията „-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“ са несъвместими." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "Прекалено много аргументи" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "„%s“ е неправилно име за етикет." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "етикетът „%s“ вече съществува" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Обновен етикет „%s“ (бе „%s“)\n" @@ -11175,210 +11812,223 @@ msgstr "Обновен етикет „%s“ (бе „%s“)\n" msgid "Unpacking objects" msgstr "Разпакетиране на обектите" -#: builtin/update-index.c:70 +#: builtin/update-index.c:79 #, c-format msgid "failed to create directory %s" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/update-index.c:76 +#: builtin/update-index.c:85 #, c-format msgid "failed to stat %s" msgstr "не може да бъде получена информация чрез „stat“ за „%s“" -#: builtin/update-index.c:86 +#: builtin/update-index.c:95 #, c-format msgid "failed to create file %s" msgstr "файлът „%s“ не може да бъде създаден" -#: builtin/update-index.c:94 +#: builtin/update-index.c:103 #, c-format msgid "failed to delete file %s" msgstr "файлът „%s“ не може да бъде изтрит" -#: builtin/update-index.c:101 builtin/update-index.c:203 +#: builtin/update-index.c:110 builtin/update-index.c:212 #, c-format msgid "failed to delete directory %s" msgstr "директорията „%s“ не може да бъде изтрита" -#: builtin/update-index.c:124 +#: builtin/update-index.c:133 #, c-format -msgid "Testing " -msgstr "Проба" +msgid "Testing mtime in '%s' " +msgstr "Проверка на времето на промяна (mtime) на файла „%s“" -#: builtin/update-index.c:136 +#: builtin/update-index.c:145 msgid "directory stat info does not change after adding a new file" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "добавянето на нов файл" -#: builtin/update-index.c:149 +#: builtin/update-index.c:158 msgid "directory stat info does not change after adding a new directory" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "добавянето на нова директория" -#: builtin/update-index.c:162 +#: builtin/update-index.c:171 msgid "directory stat info changes after updating a file" msgstr "" "информацията получена чрез „stat“ за директорията се променя след " "обновяването на нов файл" -#: builtin/update-index.c:173 +#: builtin/update-index.c:182 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "информацията получена чрез „stat“ за директорията се променя след добавянето " "на файл в поддиректория" -#: builtin/update-index.c:184 +#: builtin/update-index.c:193 msgid "directory stat info does not change after deleting a file" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "изтриването на файл" -#: builtin/update-index.c:197 +#: builtin/update-index.c:206 msgid "directory stat info does not change after deleting a directory" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "изтриването на директория" -#: builtin/update-index.c:204 +#: builtin/update-index.c:213 msgid " OK" msgstr " Добре" -#: builtin/update-index.c:564 +#: builtin/update-index.c:575 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]" -#: builtin/update-index.c:918 +#: builtin/update-index.c:930 msgid "continue refresh even when index needs update" msgstr "" "продължаване с обновяването, дори когато индексът трябва да бъде обновен" -#: builtin/update-index.c:921 +#: builtin/update-index.c:933 msgid "refresh: ignore submodules" msgstr "подмодулите да се игнорират при обновяването" -#: builtin/update-index.c:924 +#: builtin/update-index.c:936 msgid "do not ignore new files" msgstr "новите файлове да не се игнорират" -#: builtin/update-index.c:926 +#: builtin/update-index.c:938 msgid "let files replace directories and vice-versa" msgstr "файлове да могат да заменят директории и обратно" -#: builtin/update-index.c:928 +#: builtin/update-index.c:940 msgid "notice files missing from worktree" msgstr "предупреждаване при липсващи в работното дърво файлове" -#: builtin/update-index.c:930 +#: builtin/update-index.c:942 msgid "refresh even if index contains unmerged entries" msgstr "обновяване дори и индексът да съдържа неслети обекти" -#: builtin/update-index.c:933 +#: builtin/update-index.c:945 msgid "refresh stat information" msgstr "обновяване на информацията от функцията „stat“" -#: builtin/update-index.c:937 +#: builtin/update-index.c:949 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" "като опцията „--refresh“, но да се проверят и обектите, които са били приети " "за непроменени" -#: builtin/update-index.c:941 +#: builtin/update-index.c:953 msgid "<mode>,<object>,<path>" msgstr "РЕЖИМ,ОБЕКТ,ПЪТ" -#: builtin/update-index.c:942 +#: builtin/update-index.c:954 msgid "add the specified entry to the index" msgstr "добавяне на изброените обекти към индекса" -#: builtin/update-index.c:946 +#: builtin/update-index.c:958 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:947 +#: builtin/update-index.c:959 msgid "override the executable bit of the listed files" msgstr "изрично задаване на стойността на флага дали файлът е изпълним" -#: builtin/update-index.c:951 +#: builtin/update-index.c:963 msgid "mark files as \"not changing\"" msgstr "задаване на флаг, че файлът не се променя" -#: builtin/update-index.c:954 +#: builtin/update-index.c:966 msgid "clear assumed-unchanged bit" msgstr "изчистване на флага, че файлът не се променя" -#: builtin/update-index.c:957 +#: builtin/update-index.c:969 msgid "mark files as \"index-only\"" msgstr "задаване на флаг, че файловете са само за индекса" -#: builtin/update-index.c:960 +#: builtin/update-index.c:972 msgid "clear skip-worktree bit" msgstr "изчистване на флага, че файловете са само за индекса" -#: builtin/update-index.c:963 +#: builtin/update-index.c:975 msgid "add to index only; do not add content to object database" msgstr "добавяне само към индекса без добавяне към базата от данни за обектите" -#: builtin/update-index.c:965 +#: builtin/update-index.c:977 msgid "remove named paths even if present in worktree" msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво" -#: builtin/update-index.c:967 +#: builtin/update-index.c:979 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" "при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия " "байт" -#: builtin/update-index.c:969 +#: builtin/update-index.c:981 msgid "read list of paths to be updated from standard input" msgstr "изчитане на списъка с пътища за обновяване от стандартния вход" -#: builtin/update-index.c:973 +#: builtin/update-index.c:985 msgid "add entries from standard input to the index" msgstr "добавяне на елементите от стандартния вход към индекса" -#: builtin/update-index.c:977 +#: builtin/update-index.c:989 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "възстановяване на състоянието преди сливане или нужда от обновяване за " "изброените пътища" -#: builtin/update-index.c:981 +#: builtin/update-index.c:993 msgid "only update entries that differ from HEAD" msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“" -#: builtin/update-index.c:985 +#: builtin/update-index.c:997 msgid "ignore files missing from worktree" msgstr "игнориране на файловете, които липсват в работното дърво" -#: builtin/update-index.c:988 +#: builtin/update-index.c:1000 msgid "report actions to standard output" msgstr "извеждане на действията на стандартния изход" -#: builtin/update-index.c:990 +#: builtin/update-index.c:1002 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "забравяне на записаната информация за неразрешени конфликти — за командите " "от потребителско ниво" -#: builtin/update-index.c:994 +#: builtin/update-index.c:1006 msgid "write index in this format" msgstr "записване на индекса в този формат" -#: builtin/update-index.c:996 +#: builtin/update-index.c:1008 msgid "enable or disable split index" msgstr "включване или изключване на разделянето на индекса" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1010 msgid "enable/disable untracked cache" msgstr "включване/изключване на кеша за неследените файлове" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:1012 +msgid "test if the filesystem supports untracked cache" +msgstr "проверка дали файловата система поддържа кеш за неследени файлове" + +#: builtin/update-index.c:1014 msgid "enable untracked cache without testing the filesystem" msgstr "" "включване на кеша за неследените файлове без проверка на файловата система" +#: builtin/update-index.c:1134 +msgid "Untracked cache disabled" +msgstr "Кешът за неследените файлове е изключен" + +#: builtin/update-index.c:1146 +#, c-format +msgid "Untracked cache enabled for '%s'" +msgstr "Кешът за неследените файлове е изключен за „%s“" + #: builtin/update-ref.c:9 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [ОПЦИЯ…] -d ИМЕ_НА_УКАЗАТЕЛ [СТАРА_СТОЙНОСТ]" @@ -11426,7 +12076,7 @@ msgstr "git verify-tag [-v | --verbose] ПОДАВАНЕ…" msgid "print commit contents" msgstr "извеждане на съдържанието на подаването" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "извеждане на необработения изход от състоянието на „gpg“" @@ -11446,7 +12096,7 @@ msgstr "извеждане само на статистиката" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] ЕТИКЕТ…" -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "извеждане на съдържанието на ЕТИКЕТи" @@ -11462,71 +12112,75 @@ msgstr "git worktree prune [ОПЦИЯ…]" msgid "git worktree list [<options>]" msgstr "git worktree list [ОПЦИЯ…]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректория" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не съществува" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Изтриване на „worktrees/%s“: файлът „gitdir“ сочи несъществуващо " "местоположение" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "„%s“ не може да се изтрие" +msgid "failed to remove '%s'" +msgstr "директорията „%s“ не може да бъде изтрита" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "„%s“ вече съществува" -#: builtin/worktree.c:235 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/worktree.c:271 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Подготвяне на %s (идентификатор %s)" -#: builtin/worktree.c:319 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво" -#: builtin/worktree.c:321 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "създаване на нов клон" -#: builtin/worktree.c:323 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "създаване или зануляване на клони" -#: builtin/worktree.c:324 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "отделяне на указателя „HEAD“ към указаното подаване" -#: builtin/worktree.c:331 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "подготвяне на новото работно дърво" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга" @@ -11546,7 +12200,7 @@ msgstr "запис на обект-дърво за поддиректорият msgid "only useful for debugging" msgstr "само за изчистване на грешки" -#: credential-cache--daemon.c:255 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "извеждане на съобщенията за трасиране на стандартната грешка" @@ -11562,6 +12216,10 @@ msgstr "" "за\n" "някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“." +#: http.c:322 +msgid "Public key pinning not supported with cURL < 7.44.0" +msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.44.0" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "създаване на работно дърво (погледнете: „git help tutorial“)" @@ -11645,8 +12303,8 @@ msgid "Update remote refs along with associated objects" msgstr "Обновяване на отдалечените указатели и свързаните с тях обекти" #: common-cmds.h:32 -msgid "Forward-port local commits to the updated upstream head" -msgstr "Пребазиране на промени към нова основа" +msgid "Reapply commits on top of another base tip" +msgstr "Прилагане на подаванията върху друг връх" #: common-cmds.h:33 msgid "Reset current HEAD to the specified state" @@ -11690,7 +12348,7 @@ msgstr "по-малко подробности" msgid "use <n> digits to display SHA-1s" msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "" "при възможност преизползване на решението на конфликта за обновяване на " @@ -11853,7 +12511,6 @@ msgstr "" msgid "bisect run cannot continue any more" msgstr "двоичното търсене не може да продължи" -# FIXME initial space #: git-bisect.sh:531 #, sh-format msgid "" @@ -11919,16 +12576,16 @@ msgstr "" "За да откажете пребазирането и да се върнете към първоначалното състояние,\n" "изпълнете „git rebase --abort“." -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "Автоматично скатаното е приложено." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "„${stash_sha1}“ не може да бъде запазен" -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11938,34 +12595,30 @@ msgstr "" "надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n" "или да ги изхвърлите чрез „git stash drop“, когато поискате.\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането." -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" "Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да " "пребазирате в момента." -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "Опцията „--exec“ задължително изисква опцията „--interactive“" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Изглежда в момента не тече пребазиране" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране." -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Указателят „HEAD“ не може да бъде прочетен" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11973,12 +12626,12 @@ msgstr "" "Трябва да редактирате всички конфликти при сливането. След това\n" "отбележете коригирането им чрез командата „git add“" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "Връщането към „${head_name}“ е невъзможно" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11998,69 +12651,69 @@ msgstr "" "и отново започнете пребазирането. Текущото пребазиране се преустановява, за\n" "да не загубите случайно промени." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "неправилна основа за сравнение „${upstream_name}“" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" "указателят „${onto_name}“ може да сочи към повече от една основа за " "пребазирането" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "указателят „${onto_name}“ не сочи към никаква основа за пребазирането" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Указателят „${onto_name}“ не сочи към подаване" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „${branch_name}“" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "Не може да се скатае автоматично" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Автоматично скатано: „${stash_abbrev}“" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "Промените трябва или да се подадат, или да се скатаят." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Текущият клон „${branch_name}“ е напълно актуален." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" "Текущият клон „${branch_name}“ е напълно актуален. Пребазирането е " "принудително." -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Промените от „${mb}“ към „${onto}“:" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Първо, указателят „HEAD“ започва да сочи към базата, върху която пребазирате…" -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Тривиално сливане на „${branch_name}“ върху „${onto_name}“." @@ -12207,31 +12860,26 @@ msgstr "Не е указано име на клон" msgid "(To restore them type \"git stash apply\")" msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "не може да се махне компонент от адреса „${remoteurl}“" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Относителен път може да се ползва само от основната директория на работното " "дърво" # FIXME - what is this regex? -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" "адрес на хранилище: „${repo}“ трябва или да е абсолютен, или да започва с " "„./“ или „../“" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "„${sm_path}“ вече съществува в индекса" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12242,24 +12890,24 @@ msgstr "" "${sm_path}\n" "Използвайте опцията „-f“, ако за да го добавите наистина." -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Добавяне на съществуващото хранилище в „${sm_path}“ към индекса" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "„${sm_path}“ съществува, а не е хранилище на Git" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Открита е локална директория на Git — „${sm_name}“, която сочи към " "отдалечените хранилища:" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" @@ -12267,7 +12915,7 @@ msgstr "" "Ако искате да преизползвате тази локална директория на Git вместо да отново " "да клонирате:" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" @@ -12275,7 +12923,7 @@ msgstr "" "използвайте опцията „--force“. Ако локалната директория не сочи към " "правилното отдалечено хранилище" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -12285,77 +12933,55 @@ msgstr "" "аргумент на опцията „--name“." # FIXME активиране - какво всъщност става -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Активиране на локалното хранилище за подмодула „${sm_name}“ наново." -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Неуспешно добавяне на подмодула „${sm_path}“" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Неуспешно регистриране на подмодула „${sm_path}“" -#: git-submodule.sh:417 +#: git-submodule.sh:355 #, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "Влизане в „${prefix}${displaypath}“" +msgid "Entering '$displaypath'" +msgstr "Влизане в „${displaypath}“" -#: git-submodule.sh:437 +#: git-submodule.sh:375 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" -"Спиране при „${prefix}${displaypath}“ — изходният код от скрипта бе различен " -"от 0." +"Спиране при „${displaypath}“ — изходният код от скрипта бе различен от 0." -#: git-submodule.sh:483 +#: git-submodule.sh:448 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "" -"Във файла „.gitmodules“ не е открит адрес за пътя към подмодул " -"„${displaypath}“" - -#: git-submodule.sh:492 -#, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "Неуспешно регистриране на адрес за пътя към подмодул „${displaypath}“" +msgid "pathspec and --all are incompatible" +msgstr "указването на път е несъвместимо с опцията „--all“" -#: git-submodule.sh:494 +#: git-submodule.sh:453 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "" -"Регистриран е подмодул „${name}“, сочещ към адрес „${url}“, за пътя към " -"подмодул „${displaypath}“" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "Използвайте „--all“, за да премахнете всички подмодули" -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" -"Неуспешно регистриране на режима на обновяване за пътя към подмодул " -"„${displaypath}“" - -#: git-submodule.sh:549 -#, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "Използвайте „.“, за да премахнете всички подмодули" - -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" "Пътят към подмодул „${displaypath}“ в работното дърво съдържа директория „." "git“" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" @@ -12363,7 +12989,7 @@ msgstr "" "(използвайте командата „rm -rf“, за да го изтриете заедно с цялата му " "история)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -12372,147 +12998,142 @@ msgstr "" "Пътят към подмодул „${displaypath}“ в работното дърво съдържа локални " "промени. Можете да ги пренебрегнете и отмените с опцията „-f“" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Директорията „${displaypath}“ е изчистена" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" "Директорията към работното дърво на подмодула „${displaypath}“ не може да " "бъде изтрита" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" "Празната директория за подмодула „${displaypath}“ не може да бъде създадена" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Премахната е регистрацията на подмодул „${name}“, сочещ към адрес „${url}“, " "за пътя „${displaypath}“" -#: git-submodule.sh:705 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"Пътят към подмодул „${displaypath}“ не е инициализиран.\n" -"Пробвайте с командата „update --init“." - -#: git-submodule.sh:718 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Текущата версия за подмодула в „${displaypath}“ липсва" -#: git-submodule.sh:727 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“" -#: git-submodule.sh:751 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Неуспешно доставяне в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:765 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно изтегляне на версия „${sha1}“ в пътя към подмодул „${displaypath}“'" -#: git-submodule.sh:766 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Път към подмодул „${displaypath}“: изтеглена е версия „${sha1}“" -#: git-submodule.sh:770 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно пребазиране на версия „${sha1}“ в пътя към подмодул " "„${displaypath}“" -#: git-submodule.sh:771 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Път към подмодул „${displaypath}“: пребазиране върху версия „${sha1}“" -#: git-submodule.sh:776 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно сливане на версия „${sha1}“ в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:777 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Път към подмодул „${displaypath}“: сливане с версия „${sha1}“" -#: git-submodule.sh:782 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Неуспешно изпълнение на командата „${command} ${sha1}“ в пътя към подмодул " -"„${prefix}${sm_path}“" +"„${displaypath}“" -#: git-submodule.sh:783 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "Път към подмодул „${prefix}${sm_path}“: „${command} ${sha1}“" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“" -#: git-submodule.sh:813 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" "Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:921 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "Опциите „--cached“ и „--files“ са несъвместими" -#: git-submodule.sh:973 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "неочакван режим „${mod_dst}“" -#: git-submodule.sh:993 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_src}“" -#: git-submodule.sh:996 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_dst}“" -#: git-submodule.sh:999 +#: git-submodule.sh:915 #, 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:1024 +#: git-submodule.sh:940 msgid "blob" msgstr "обект BLOB" -#: git-submodule.sh:1142 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" "Неуспешна обработка на поддиректориите в пътя към подмодул „${sm_path}“" -#: git-submodule.sh:1206 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Синхронизиране на адреса за пътя към подмодул „${displaypath}“" + +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "За повече информация погледнете ръководството на „git-${cmd}(1)“" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-03-16 00:16+0800\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" "PO-Revision-Date: 2015-01-21 15:01+0800\n" "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" "Language-Team: German <>\n" @@ -31,7 +31,7 @@ msgstr "" "dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n" "und zu committen." -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)." @@ -75,7 +75,7 @@ msgstr "Format" msgid "archive format" msgstr "Archivformat" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "Präfix" @@ -83,11 +83,11 @@ msgstr "Präfix" msgid "prepend prefix to each pathname in the archive" msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:720 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/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 msgid "file" msgstr "Datei" @@ -119,7 +119,8 @@ msgstr "besser komprimieren" msgid "list supported archive formats" msgstr "unterstützte Archivformate auflisten" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "Repository" @@ -277,11 +278,16 @@ msgstr "mehrdeutiger Objekt-Name: '%s'" msgid "Not a valid branch point: '%s'." msgstr "Ungültiger Branchpunkt: '%s'" -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' ist bereits in '%s' ausgecheckt" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert." + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -292,7 +298,7 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" msgid "unrecognized header: %s%s (%d)" msgstr "nicht erkannter Kopfbereich: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "Konnte '%s' nicht öffnen" @@ -301,10 +307,10 @@ msgstr "Konnte '%s' nicht öffnen" msgid "Repository lacks these prerequisite commits:" msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: 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 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" @@ -343,21 +349,21 @@ msgstr "\"rev-list\" abgebrochen" msgid "ref '%s' is excluded by the rev-list options" msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "Erstellung eines leeren Pakets zurückgewiesen." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "kann '%s' nicht erstellen" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "Erstellung der Paketindexdatei abgebrochen" @@ -366,8 +372,8 @@ msgstr "Erstellung der Paketindexdatei abgebrochen" msgid "invalid color value: %.*s" msgstr "Ungültiger Farbwert: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "konnte %s nicht parsen" @@ -401,22 +407,22 @@ msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s" msgid "failed to expand user dir in: '%s'" msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "ungültiger zlib Komprimierungsgrad %d" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "Ungültiger Modus für Objekterstellung: %s" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "" "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen." -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "" "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf." @@ -438,24 +444,27 @@ msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d" msgid "%s has multiple values" msgstr "%s hat mehrere Werte" -#: config.c:2226 +#: config.c:2224 #, c-format -msgid "Could not set '%s' to '%s'" +msgid "could not set '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' setzen." +#: config.c:2226 +#, c-format +msgid "could not unset '%s'" +msgstr "Konnte '%s' nicht aufheben." + #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Konnte 'git rev-list' nicht ausführen" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "Fehler beim Schreiben nach rev-list: %s" +msgid "failed write to rev-list" +msgstr "Fehler beim Schreiben nach rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe" #: date.c:95 msgid "in the future" @@ -530,27 +539,27 @@ msgstr[1] "vor %lu Jahren" msgid "failed to read orderfile '%s'" msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'." -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "Führe Erkennung für ungenaue Umbenennung aus" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Unbekannter \"dirstat\" Parameter '%s'\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -559,16 +568,16 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow erfordert genau eine Pfadspezifikation" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -577,22 +586,22 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "" "Cache für unversionierte Dateien ist auf diesem System oder\n" "für dieses Verzeichnis deaktiviert." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "konnte gpg nicht ausführen" @@ -606,28 +615,28 @@ msgstr "gpg beim Signieren der Daten fehlgeschlagen" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "konnte temporäre Datei '%s' nicht erstellen: %s" +msgid "could not create temporary file '%s'" +msgstr "konnte temporäre Datei '%s' nicht erstellen" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "Fehler beim Schreiben der Signatur nach '%s': %s" +msgid "failed writing detached signature to '%s'" +msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': konnte %s nicht lesen" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "'%s': %s" +msgid "failed to stat '%s'" +msgstr "Konnte '%s' nicht lesen" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "'%s': read() zu kurz %s" +msgid "'%s': short read" +msgstr "'%s': read() zu kurz" #: help.c:205 #, c-format @@ -693,12 +702,37 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"Konnte '%s.lock' nicht erstellen: %s.\n" +"\n" +"Ein anderer Git-Prozess scheint in diesem Repository ausgeführt\n" +"zu werden, zum Beispiel ein noch offener Editor von 'git commit'.\n" +"Bitte stellen Sie sicher, dass alle Prozesse beendet wurden und\n" +"versuchen Sie es erneut. Falls es immer noch fehlschlägt, könnte\n" +"ein früherer Git-Prozess in diesem Repository abgestürzt sein:\n" +"Löschen Sie die Datei manuell um fortzufahren." + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "Konnte '%s.lock' nicht erstellen: %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." @@ -745,7 +779,7 @@ msgstr "kann Objekt %s '%s' nicht lesen" msgid "blob expected for %s '%s'" msgstr "Blob erwartet für %s '%s'" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "Fehler beim Öffnen von '%s'" @@ -882,7 +916,7 @@ msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)" msgid "Auto-merging %s" msgstr "automatischer Merge von %s" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "Submodul" @@ -911,50 +945,50 @@ msgstr "" "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s " "hinzu." -#: merge-recursive.c:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Füge %s hinzu" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Fataler Merge-Fehler. Sollte nicht passieren." -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Bereits aktuell!" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "unverarbeiteter Pfad??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "Merge:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden" msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden" -#: merge-recursive.c:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "Merge hat keinen Commit zurückgegeben" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "Konnte Index nicht schreiben." @@ -986,28 +1020,28 @@ msgstr "Ungültiger %s Wert: '%s'" msgid "unable to parse object: %s" msgstr "Konnte Objekt '%s' nicht parsen." -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "..." -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "Verwendung: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " oder: %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-NUM" @@ -1016,7 +1050,7 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "fehlerhafter Objekt-Name '%s'" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "Konnte Gruppenschreibrecht für %s nicht setzen." @@ -1088,7 +1122,7 @@ msgstr "" ":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n" "Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "Konnte --pretty Format nicht parsen." @@ -1114,23 +1148,23 @@ msgstr "" "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "Konnte Referenz %s nicht entfernen: %s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "Konnte Referenzen nicht entfernen: %s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "Konnte Referenz %s nicht löschen" @@ -1269,96 +1303,96 @@ msgstr "Format: %%(end) Atom fehlt" msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen." -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s folgt üblicherweise %s, nicht %s" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s folgt sowohl %s als auch %s" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "Interner Fehler" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD zeigt auf keinen Branch" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "Kein solcher Branch: '%s'" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert." -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten " "Branch" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "kein Ziel für \"push\" (push.default ist 'nothing')" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" "Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n" -#: remote.c:2084 +#: remote.c:2085 #, 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] "Ihr Branch ist vor '%s' um %d Commit.\n" msgstr[1] "Ihr Branch ist vor '%s' um %d Commits.\n" -#: remote.c:2090 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1368,12 +1402,12 @@ msgstr[0] "" msgstr[1] "" "Ihr Branch ist zu '%s' um %d Commits hinterher, und kann vorgespult werden.\n" -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1388,22 +1422,22 @@ msgstr[1] "" "Ihr Branch und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Commits.\n" -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch " "zusammenzuführen)\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein." -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Ihr aktueller Branch '%s' hat noch keine Commits." -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "Die Optionen --first-parent und --bisect sind inkompatibel." @@ -1455,7 +1489,7 @@ msgstr "" "mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n" "'git commit' ein" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "Konnte nicht nach %s schreiben" @@ -1467,12 +1501,11 @@ msgstr "Fehler bei Nachbereitung von %s" #: sequencer.c:208 msgid "Your local changes would be overwritten by cherry-pick." -msgstr "" -"Ihre lokalen Änderungen würden von \"cherry-pick\" überschrieben werden." +msgstr "Ihre lokalen Änderungen würden durch den Cherry-Pick überschrieben werden." #: sequencer.c:210 msgid "Your local changes would be overwritten by revert." -msgstr "Ihre lokalen Änderungen würden von \"revert\" überschrieben werden." +msgstr "Ihre lokalen Änderungen würden durch den Revert überschrieben werden." #: sequencer.c:213 msgid "Commit your changes or stash them to proceed." @@ -1615,12 +1648,12 @@ msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\"" msgid "Could not create sequencer directory %s" msgstr "Konnte \"sequencer\"-Verzeichnis %s nicht erstellen" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "Fehler beim Einpacken von %s." -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" @@ -1632,63 +1665,72 @@ msgstr "kann HEAD nicht auflösen" msgid "cannot abort from a branch yet to be born" msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "Kann %s nicht öffnen: %s" +msgid "cannot open %s" +msgstr "kann '%s' nicht öffnen" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "Kann %s nicht lesen: %s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:888 +#: sequencer.c:887 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt" -#: sequencer.c:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "Konnte %s nicht formatieren." -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s: ungültiger Commit" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "Kann nicht als allerersten Commit einen Revert ausführen." -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "Kann nicht als allerersten Commit einen Cherry-Pick ausführen." -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "Fehler beim Lesen von %s" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "Unbekannte Repository-Erweiterungen gefunden:" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)" @@ -1718,31 +1760,40 @@ msgstr "" "indem Sie \"git config advice.objectNameWarning false\"\n" "ausführen." -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n" "Sie zuerst die Konflikte auf" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "Negative Werte für submodule.fetchJobs nicht erlaubt" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "Ungültiger Wert für %s" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1802,7 +1853,240 @@ msgstr "konnte temporäre Datei nicht zu %s umbenennen" msgid "Could not read ref %s" msgstr "Konnte Referenz %s nicht lesen." -#: unpack-trees.c:203 +#: 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." +msgstr "" +"Ihre lokalen Änderungen in den folgenden Dateien würden beim Auschecken\n" +"überschrieben werden:\n" +"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches wechseln." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"Ihre lokalen Änderungen in den folgenden Dateien würden beim Auschecken\n" +"überschrieben werden:\n" +"%%s" + +#: unpack-trees.c:69 +#, 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." +msgstr "" +"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n" +"überschrieben werden:\n" +"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n" +"überschrieben werden:\n" +"%%s" + +#: unpack-trees.c:74 +#, 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." +msgstr "" +"Ihre lokalen Änderungen in den folgenden Dateien würden durch %s\n" +"überschrieben werden:\n" +"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Ihre lokalen Änderungen würden durch %s überschrieben werden.\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"Durch die Aktualisierung der folgenden Verzeichnisse würden unversionierte\n" +"Dateien in diesen Verzeichnissen verloren gehen:\n" +"%s" + +#: unpack-trees.c:85 +#, 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." +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n" +"den Checkout entfernt werden:\n" +"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n" +"Checkout entfernt werden:\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n" +"Merge entfernt werden:\n" +"%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n" +"Merge entfernt werden:\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n" +"%s entfernt werden:\n" +"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n" +"%s entfernt werden:\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n" +"Checkout überschrieben werden:\n" +"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n" +"Checkout überschrieben werden:\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n" +"Merge überschrieben werden:\n" +"%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n" +"Merge überschrieben werden:\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n" +"%s überschrieben werden:\n" +"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n" +"%s überschrieben werden:\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"Kann partiellen Checkout nicht aktualisieren: die folgenden Einträge sind nicht\n" +"aktuell:\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Die folgenden Dateien im Arbeitsbereich würden durch die Aktualisierung\n" +"des partiellen Checkouts überschrieben werden:\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Die folgenden Dateien im Arbeitsbereich würden durch die Aktualisierung\n" +"des partiellen Checkouts entfernt werden:\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "Abbruch\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "Checke Dateien aus" @@ -1840,210 +2124,206 @@ msgstr "ungültiges '..' Pfadsegment" msgid "could not open '%s' for reading and writing" msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen." -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "konnte nicht auf '%s' zugreifen: %s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "konnte nicht auf '%s' zugreifen" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen." -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "Konnte nicht nach '%s' schreiben." -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "Konnte '%s' nicht schließen." -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Nicht zusammengeführte Pfade:" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" " (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-" "Area)" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" " (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-" "Area)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung entsprechend zu " "markieren)" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "zum Commit vorgemerkte Änderungen:" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit " "vorzumerken)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Änderungen zum Commit " "vorzumerken)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (benutzen Sie \"git checkout -- <Datei>...\", um die Änderungen im " "Arbeitsverzeichnis zu verwerfen)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (committen oder verwerfen Sie den unversionierten oder geänderten Inhalt " "in den Submodulen)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit " "vorzumerken)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "beide gelöscht:" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "von uns hinzugefügt:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "von denen gelöscht:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "von denen hinzugefügt:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "von uns gelöscht:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "von beiden hinzugefügt:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "von beiden geändert:" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "Bug: unbehandelter Unmerged-Status %x" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "neue Datei:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "kopiert:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "gelöscht:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "geändert:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "umbenannt:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "Typänderung:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "unbekannt:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "nicht gemerged:" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "neue Commits, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "geänderter Inhalt, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "unversionierter Inhalt, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "Fehler: unbehandelter Differenz-Status %c" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Submodule geändert, aber nicht aktualisiert:" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Änderungen in Submodul zum Committen:" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2051,40 +2331,40 @@ msgstr "" "Ändern Sie nicht die obige Zeile.\n" "Alles unterhalb von ihr wird entfernt." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Sie haben nicht zusammengeführte Pfade." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge." -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (benutzen Sie \"git am --abort\", um den ursprünglichen Branch " @@ -2249,43 +2529,43 @@ msgstr "" " (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch " "zurückzukehren)" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "Auf Branch " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "interaktives Rebase im Gange; auf " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "Rebase im Gange; auf " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEAD losgelöst bei " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEAD losgelöst von " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Branch." -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "Initialer Commit" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "Unversionierte Dateien" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2296,32 +2576,32 @@ msgstr "" "'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n" "neue Dateien selbstständig hinzuzufügen (siehe 'git help status')." -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "Unversionierte Dateien nicht aufgelistet%s" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:1513 +#: wt-status.c:1535 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder " "\"git commit -a\")\n" -#: wt-status.c:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "keine Änderungen zum Commit vorgemerkt\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2330,56 +2610,56 @@ msgstr "" "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien (benutzen " "Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1522 +#: wt-status.c:1544 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n" -#: wt-status.c:1525 +#: wt-status.c:1547 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "nichts zu committen (Erstellen/Kopieren Sie Dateien und benutzen Sie \"git " "add\" zum Versionieren)\n" -#: wt-status.c:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "nichts zu committen\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien " "anzuzeigen)\n" -#: wt-status.c:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "Initialer Commit auf " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (kein Branch)" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "entfernt" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "hinterher " -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "voraus " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "Konnte '%s' nicht entfernen." @@ -2393,7 +2673,7 @@ msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..." msgid "unexpected diff status %c" msgstr "unerwarteter Differenz-Status %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "Aktualisierung der Dateien fehlgeschlagen" @@ -2407,7 +2687,7 @@ msgid "Unstaged changes after refreshing the index:" msgstr "" "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "Konnte den Index nicht lesen" @@ -2445,14 +2725,14 @@ msgstr "" "ignoriert:\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:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: 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 msgid "dry run" msgstr "Probelauf" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: 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 "erweiterte Ausgaben" @@ -2460,7 +2740,7 @@ msgstr "erweiterte Ausgaben" msgid "interactive picking" msgstr "interaktives Auswählen" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "Blöcke interaktiv auswählen" @@ -2532,16 +2812,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Meinten Sie vielleicht 'git add .'?\n" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "Index-Datei beschädigt" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" @@ -2569,16 +2849,6 @@ msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" msgid "fseek failed" msgstr "\"fseek\" fehlgeschlagen" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "Konnte '%s' nicht zum Lesen öffnen: %s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "Konnte '%s' nicht zum Schreiben öffnen: %s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2588,82 +2858,82 @@ msgstr "konnte Patch '%s' nicht parsen" msgid "Only one StGIT patch series can be applied at once" msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden." -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "ungültiger Zeitstempel" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "Ungültige \"Date\"-Zeile" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "Ungültiger Offset in der Zeitzone" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "Patch-Formaterkennung fehlgeschlagen." -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "Fehler beim Aufteilen der Patches." -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "Konnte Index-Datei nicht schreiben." -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" "Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus." -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip" "\" aus." -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Um den ursprünglichen Branch wiederherzustellen und die Anwendung der " "Patches abzubrechen, führen Sie \"%s --abort\" aus." -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "Patch ist leer. War dessen Aufteilung falsch?" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "Ungültige Identifikationszeile: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "Konnte Commit '%s' nicht parsen." -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge " "zurückzufallen." -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "" "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen ..." -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2671,39 +2941,39 @@ msgstr "" "Haben Sie den Patch per Hand editiert?\n" "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden." -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..." -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "Merge der Änderungen fehlgeschlagen." -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "auf leere Historie anwenden" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "Kann nicht fortsetzen: %s existiert nicht" -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem " "Terminal verbunden ist." -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "Commit-Beschreibung ist:" @@ -2711,35 +2981,35 @@ msgstr "Commit-Beschreibung ist:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "Wende an: %.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "Keine Änderungen -- Patches bereits angewendet." -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2750,7 +3020,7 @@ msgstr "" "diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n" "auslassen." -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2758,17 +3028,17 @@ msgstr "" "Sie haben immer noch nicht zusammengeführte Pfade im Index.\n" "Haben Sie vergessen 'git add' zu benutzen?" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Konnte Objekt '%s' nicht parsen." -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "Fehler beim Bereinigen des Index" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2776,153 +3046,155 @@ msgstr "" "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n" "Keine Zurücksetzung zu ORIG_HEAD." -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Ungültiger Wert für --patch-format: %s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<Optionen>] [(<mbox>|<E-Mail-Verzeichnis>)...]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<Optionen>] (--continue | --skip | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "interaktiv ausführen" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "historische Option -- kein Effekt" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "weniger Ausgaben" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "nach UTF-8 umkodieren (Standard)" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "-k an git-mailinfo übergeben" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "-b an git-mailinfo übergeben" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "-m an git-mailinfo übergeben" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "alles vor einer Scheren-Zeile entfernen" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "Aktion" -#: 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:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: 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 msgid "pass it through git-apply" msgstr "an git-apply übergeben" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "Wurzelverzeichnis" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: 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 "Pfad" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 -#: parse-options.h:132 parse-options.h:134 parse-options.h:244 +#: 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/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 +#: parse-options.h:134 parse-options.h:244 msgid "n" msgstr "Anzahl" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "Anzahl" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "Format" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "Patch-Format" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "Synonyme für --continue" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "den aktuellen Patch auslassen" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "" "ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen" -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "Autor-Datum als Commit-Datum verwenden" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "aktuellen Zeitstempel als Autor-Datum verwenden" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "GPG-Schlüsselkennung" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "Commits mit GPG signieren" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(intern für git-rebase verwendet)" -#: builtin/am.c:2340 +#: builtin/am.c:2339 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." @@ -2930,16 +3202,16 @@ msgstr "" "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n" "entfernt. Bitte verwenden Sie diese nicht mehr." -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "Fehler beim Lesen des Index" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben." -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2948,7 +3220,7 @@ msgstr "" "Stray %s Verzeichnis gefunden.\n" "Benutzen Sie \"git am --abort\", um es zu entfernen." -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt." @@ -2981,41 +3253,41 @@ msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s" msgid "unable to find filename in patch at line %d" msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden." -#: builtin/apply.c:940 +#: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile " "%d" -#: builtin/apply.c:944 +#: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d" -#: builtin/apply.c:945 +#: builtin/apply.c:943 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d" -#: builtin/apply.c:952 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d" -#: builtin/apply.c:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: unerwartete Zeile: %.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -3030,65 +3302,65 @@ msgstr[1] "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "neue Datei hängt von alten Inhalten ab" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "neue Datei %s hängt von alten Inhalten ab" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter Binär-Patch bei Zeile %d" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht öffnen oder lesen" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "Ungültiger Zeilenanfang: '%c'" -#: builtin/apply.c:2896 +#: 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)." @@ -3096,12 +3368,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)" msgstr[1] "" "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)" -#: builtin/apply.c:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3110,337 +3382,347 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in Binär-Patch für '%s'" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "Konnte %s nicht lesen" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "'%s' ist hinter einer symbolischen Verknüpfung" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "Pfad %s wurde umbenannt/gelöscht" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s ist nicht im Index" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s entspricht nicht der Version im Index" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "Lösch-Patch hinterlässt Dateiinhalte" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "Ungültiger Pfad '%s'" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s existiert bereits im Arbeitsverzeichnis" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s" -#: builtin/apply.c:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "Prüfe Patch %s ..." -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: 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 für Pfad '%s' fehlgeschlagen" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "konnte %s nicht aus dem Index entfernen" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "fehlerhafter Patch für Submodul %s" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "schließe Datei '%s'" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "interner Fehler" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..." msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..." -#: builtin/apply.c:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: builtin/apply.c:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "Kann %s nicht öffnen: %s" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Block #%d zurückgewiesen." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Patch '%s' ausgelassen." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "Konnte Index-Datei nicht lesen" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "keine Änderungen im angegebenen Pfad anwenden" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "Änderungen nur im angegebenen Pfad anwenden" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden " "entfernen" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "hinzugefügte Zeilen des Patches ignorieren" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe " "ausgegeben" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "" "die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "" "anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe " "ausgeben" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" "anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "" "sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "" "Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "" "einen temporären Index, basierend auf den integrierten Index-Informationen, " "erstellen" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "" "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "den Patch in umgekehrter Reihenfolge anwenden" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "keinen Kontext erwarten" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "sich überlappende Patch-Blöcke erlauben" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "" "Die Option --3way kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "" "Die Option --index kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "" "Die Option --cached kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "kann Patch '%s' nicht öffnen" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "unterdrückte %d Whitespace-Fehler" msgstr[1] "unterdrückte %d Whitespace-Fehler" -#: builtin/apply.c:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3506,102 +3788,102 @@ msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)" msgid "Blaming lines" msgstr "Verarbeite Zeilen" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Ursprungs-Commit nicht als Grenzen behandeln (Standard: aus)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "Statistiken zum Arbeitsaufwand anzeigen" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "Anzeige in einem Format für maschinelle Auswertung" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "" "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)" -#: builtin/blame.c:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "" "Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)" -#: builtin/blame.c:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "Unterschiede im Whitespace ignorieren" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen" -#: builtin/blame.c:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "Bewertung" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1" @@ -3611,31 +3893,31 @@ msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1" #. 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "vor 4 Jahren, und 11 Monaten" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<Optionen>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<Optionen>] [-l] [-f] <Branchname> [<Startpunkt>]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<Optionen>] [-r] (-d | -D) <Branchname>..." -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<Optionen>] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3644,7 +3926,7 @@ msgstr "" "entferne Branch '%s', der zusammengeführt wurde mit\n" " '%s', aber noch nicht mit HEAD zusammengeführt wurde." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3653,12 +3935,12 @@ msgstr "" "entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n" " '%s', obwohl er mit HEAD zusammengeführt wurde." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen." -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3668,303 +3950,323 @@ msgstr "" "Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D " "%s' aus." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen." -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "kann -a nicht mit -d benutzen" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen." -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "" -"Kann Branch '%s' nicht entfernen, da Sie sich gerade auf diesem befinden." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'." -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "Remote-Tracking-Branch '%s' nicht gefunden" -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "Branch '%s' nicht gefunden." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "Fehler beim Entfernen des Branches '%s'" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branch %s entfernt (war %s).\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: entfernt]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: %d hinterher]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[%d hinterher]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: %d voraus]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[%d voraus]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: %d voraus, %d hinterher]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[%d voraus, %d hinterher]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** ungültige Referenz ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(kein Branch, Rebase von Branch %s im Gange)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(kein Branch, binäre Suche begonnen bei %s)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD losgelöst bei %s)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD losgelöst von %s)" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(kein Branch)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "Branch %s wird auf %s umgesetzt" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "Binäre Suche von Branch %s zu %s im Gange" + +#: builtin/branch.c:560 msgid "cannot rename the current branch while not on any." msgstr "" "Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden." -#: builtin/branch.c:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Branchname: '%s'" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "Umbenennung des Branches fehlgeschlagen" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Branch '%s' umbenannt" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!" -#: builtin/branch.c:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" -msgstr "Konnte Beschreibungsvorlage für Branch nicht schreiben: %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "Konnte Beschreibungsvorlage für Branch nicht schreiben." -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "Allgemeine Optionen" -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "Informationsmeldungen unterdrücken" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "den Übernahmemodus einstellen (siehe git-pull(1))" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "Informationen zum Upstream-Branch ändern" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "Upstream" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "Informationen zum Upstream-Branch ändern" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "farbige Ausgaben verwenden" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "auf Remote-Tracking-Branches wirken" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "nur Branches ausgeben, welche diesen Commit beinhalten" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "spezifische Aktionen für \"git-branch\":" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches auflisten" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "vollständig zusammengeführten Branch entfernen" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "Branch löschen (auch wenn nicht zusammengeführt)" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "einen Branch und dessen Reflog verschieben/umbenennen" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "" "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "Branchnamen auflisten" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "das Reflog des Branches erzeugen" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "die Beschreibung für den Branch bearbeiten" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "nur zusammengeführte Branches ausgeben" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "nur nicht zusammengeführte Branches ausgeben" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "Branches in Spalten auflisten" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "Schüssel" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "sortiere nach diesem Feld" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: 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/tag.c:369 msgid "object" msgstr "Objekt" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "nur Branches von diesem Objekt ausgeben" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenz auflösen." -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "Die Optionen --column und --verbose sind inkompatibel." -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "Branchname erforderlich" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "Noch kein Commit in Branch '%s'." -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "Branch '%s' nicht vorhanden." -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "zu viele Branches für eine Umbenennen-Operation angegeben" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3972,43 +4274,43 @@ msgstr "" "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n" "keinen Branch zeigt." -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "Kein solcher Branch '%s'" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "Branch '%s' existiert nicht" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "" "zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen" -#: builtin/branch.c:784 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n" "auf keinen Branch zeigt." -#: builtin/branch.c:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "'HEAD' darf nicht manuell erstellt werden" -#: builtin/branch.c:810 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem " "Branchnamen verwendet werden." -#: builtin/branch.c:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -4017,7 +4319,7 @@ msgstr "" "Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --" "track oder --set-upstream-to\n" -#: builtin/branch.c:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -4028,16 +4330,6 @@ msgstr "" "Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, führen " "Sie aus:\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -4140,7 +4432,7 @@ msgstr "Dateinamen von der Standard-Eingabe lesen" msgid "terminate input and output records by a NUL character" msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "Fortschrittsanzeige unterdrücken" @@ -4233,8 +4525,9 @@ msgid "write the content to temporary files" msgstr "den Inhalt in temporäre Dateien schreiben" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: 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 msgid "string" msgstr "Zeichenkette" @@ -4285,80 +4578,80 @@ msgstr "Pfad '%s': kann nicht zusammenführen" msgid "Unable to add merge result for '%s'" msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen." -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln" -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "beschädigte Index-Datei" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengeführt." -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen." -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD ist jetzt bei" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "Konnte HEAD nicht aktualisieren." -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Branch '%s' neu\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Zu umgesetztem Branch '%s' gewechselt\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Zu neuem Branch '%s' gewechselt\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "Zu Branch '%s' gewechselt\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4381,7 +4674,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4408,152 +4701,152 @@ msgstr[1] "" " git branch <neuer-Branchname> %s\n" "\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "Vorherige Position von HEAD war" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "Sie sind auf einem Branch, der noch geboren wird" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "nur eine Referenz erwartet, %d gegeben." -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein \"Tree\"-Objekt: %s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: 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 msgid "branch" msgstr "Branch" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "einen neuen Branch erzeugen und auschecken" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "einen Branch erstellen/umsetzen und auschecken" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "das Reflog für den neuen Branch erzeugen" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "HEAD zu benanntem Commit setzen" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "neuer Branch" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "neuer Branch ohne Eltern-Commit" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "Auschecken erzwingen (verwirft lokale Änderungen)" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "ignorierte Dateien aktualisieren (Standard)" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "Stil" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "Konfliktstil (merge oder diff3)" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "second guess 'git checkout <no-such-branch>'" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "" "Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis " "ausgecheckt wurde, deaktivieren" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: 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/send-pack.c:168 msgid "force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus." -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "Bei der Option --track muss ein Branchname angegeben werden." -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "Vermisse Branchnamen; versuchen Sie -b" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4563,12 +4856,12 @@ msgstr "" "Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelöst " "werden kann?" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4720,8 +5013,8 @@ msgstr "interaktives Clean" msgid "remove whole directories" msgstr "ganze Verzeichnisse löschen" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: 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 msgid "pattern" msgstr "Muster" @@ -4761,105 +5054,113 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "kein Auschecken" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "ein Bare-Repository erstellen" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "ein Spiegelarchiv erstellen (impliziert --bare)" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "von einem lokalen Repository klonen" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "lokal keine harten Verweise verwenden, immer Kopien" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "als verteiltes Repository einrichten" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "Submodule im Klon initialisieren" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "Anzahl der parallel zu klonenden Submodule" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "Vorlagenverzeichnis" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "Repository referenzieren" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "--reference nur während des Klonens benutzen" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "Name" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "<Name> statt 'origin' für Upstream-Repository verwenden" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 -#: builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201 msgid "depth" msgstr "Tiefe" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "" "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "nur einen Branch klonen, HEAD oder --branch" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr ".git-Verzeichnis" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "Schlüssel=Wert" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "Konfiguration innerhalb des neuen Repositories setzen" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "nur IPv4-Adressen benutzen" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "nur IPv6-Adressen benutzen" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4867,62 +5168,57 @@ msgstr "" "Konnte keinen Verzeichnisnamen erraten.\n" "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an." -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "Referenziertes Repository '%s' wird noch nicht als verknüpftes\n" "Arbeitsverzeichnis unterstützt." -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "Referenziertes Repository '%s' ist kein lokales Repository." -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "" "Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)." -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "" "Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") " "eingehängt." -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "Konnte '%s' nicht lesen" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s existiert und ist kein Verzeichnis" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "Konnte %s nicht lesen\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "Konnte Verweis '%s' nicht erstellen" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "Konnte Datei nicht nach '%s' kopieren" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "Fertig.\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4932,132 +5228,132 @@ msgstr "" "Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n" "und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "Prüfe Konnektivität ... " -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet." -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "kann %s nicht aktualisieren" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann " "nicht ausgecheckt werden.\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "Sie müssen ein Repository zum Klonen angeben." -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Die Optionen --bare und --origin %s sind inkompatibel." -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht." -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "Tiefe %s ist keine positive Zahl" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis." -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in Bare-Repository '%s' ...\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s' ...\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie " "stattdessen file://" -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "" "Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --" "local" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local wird ignoriert" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "Weiß nicht wie %s zu klonen ist." -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." @@ -5200,67 +5496,67 @@ msgstr "" "Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n" "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD." -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "Konnte temporären Index nicht erstellen." -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "interaktives Hinzufügen fehlgeschlagen" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "Konnte temporären Index nicht aktualisieren." -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "Konnte new_index Datei nicht schreiben" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist." -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist." -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "Konnte temporäre Index-Datei nicht schreiben." -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "Commit '%s' fehlt Autor-Kopfbereich" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "Commit '%s' hat fehlerhafte Autor-Zeile" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "Ungültiges Datumsformat: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5268,38 +5564,38 @@ msgstr "" "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n" "der aktuellen Commit-Beschreibung verwendet wird." -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "Konnte Commit %s nicht nachschlagen" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "Konnte Log nicht von Standard-Eingabe lesen." -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "Konnte Log-Datei '%s' nicht lesen" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "Konnte MERGE_MSG nicht lesen" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "Konnte MERGE_MSG nicht lesen" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "Konnte Commit-Vorlage nicht schreiben" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5314,7 +5610,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5329,7 +5625,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5339,7 +5635,7 @@ msgstr "" "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5352,157 +5648,157 @@ msgstr "" "entfernen.\n" "Eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommit-Ersteller: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" "Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem " "vorhandenen Autor überein" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungültiger Modus '%s' für unversionierte Dateien" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "Die Optionen --long und -z sind inkompatibel." -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "" "Die Optionen --reset-author und --author können nicht gemeinsam verwendet " "werden." -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "Sie haben nichts für \"--amend\"." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "" "Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden." -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden." -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden." -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden." -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Es kann nur eine Option von --include/--only/--all/--interactive/--patch " "verwendet werden." -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 msgid "No paths with --include/--only does not make sense." msgstr "" "Die Optionen --include und --only können nur mit der Angabe von Pfaden " "verwendet werden." -#: builtin/commit.c:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "Klug ... den letzten Commit mit einem geänderten Index nachbessern." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an" -#: builtin/commit.c:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger \"cleanup\" Modus %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden." -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "Status im Kurzformat anzeigen" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "Branchinformationen anzeigen" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "Status im Langformat anzeigen (Standard)" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "Einträge mit NUL-Zeichen abschließen" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "Modus" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: " "all)" -#: builtin/commit.c:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "ignorierte Dateien anzeigen" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "wann" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5510,203 +5806,203 @@ msgstr "" "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. " "(Standard: all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "unversionierte Dateien in Spalten auflisten" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellten Commit nicht nachschlagen." -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "Konnte neulich erstellten Commit nicht analysieren." -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "losgelöster HEAD" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (Basis-Commit)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "Optionen für Commit-Beschreibung" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "Beschreibung von Datei lesen" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "Autor" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "Autor eines Commits überschreiben" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "Datum" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "Datum eines Commits überschreiben" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "Beschreibung" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "Commit-Beschreibung" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "Commit" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des " "angegebenen Commits verwenden" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des " "angegebenen Commits verwenden" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)" -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "'Signed-off-by:'-Zeile hinzufügen" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "angegebene Vorlagendatei verwenden" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "Bearbeitung des Commits erzwingen" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "Standard" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "" "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "Status in die Commit-Beschreibungsvorlage einfügen" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "Commit mit GPG signieren" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "Optionen für Commit-Inhalt" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "alle geänderten Dateien committen" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "interaktives Hinzufügen von Dateien" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "interaktives Hinzufügen von Änderungen" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "nur die angegebenen Dateien committen" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "\"pre-commit hook\" umgehen" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "anzeigen, was committet werden würde" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "vorherigen Commit ändern" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "\"post-rewrite hook\" umgehen" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "Aufzeichnung einer leeren Änderung erlauben" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Commit-Beschreibung nicht lesen: %s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5855,7 +6151,7 @@ msgstr "" msgid "unable to parse default color value" msgstr "konnte Standard-Farbwert nicht parsen" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5870,7 +6166,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen." @@ -5906,7 +6202,7 @@ msgstr "annotiertes Tag %s hat keinen eingebetteten Namen" msgid "tag '%s' is really '%s' here" msgstr "Tag '%s' ist eigentlich '%s' hier" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "%s ist kein gültiger Objekt-Name" @@ -5999,7 +6295,7 @@ msgstr "die jüngsten <n> Tags betrachten (Standard: 10)" msgid "only consider tags matching <pattern>" msgstr "nur Tags, die <Muster> entsprechen, betrachten" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft" @@ -6035,21 +6331,21 @@ msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung" msgid "invalid option: %s" msgstr "Ungültige Option: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "Kein Git-Repository" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "Objekt '%s' ist ungültig." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "Mehr als zwei Blobs angegeben: '%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "unbehandeltes Objekt '%s' angegeben" @@ -6122,19 +6418,19 @@ msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<Optionen>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "fordert von allen Remote-Repositories an" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "das Überschreiben von lokalen Branches erzwingen" @@ -6142,7 +6438,7 @@ msgstr "das Überschreiben von lokalen Branches erzwingen" msgid "fetch from multiple remotes" msgstr "von mehreren Remote-Repositories anfordern" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "alle Tags und verbundene Objekte anfordern" @@ -6154,21 +6450,21 @@ msgstr "nicht alle Tags anfordern (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "Anzahl der parallel anzufordernden Submodule" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "" "Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository " "befinden" -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "bei-Bedarf" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "heruntergeladenes Paket behalten" @@ -6176,16 +6472,16 @@ msgstr "heruntergeladenes Paket behalten" msgid "allow updating of HEAD ref" msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "zu einem vollständigen Repository konvertieren" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "Verzeichnis" @@ -6197,15 +6493,15 @@ msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen" msgid "default mode for recursion" msgstr "Standard-Modus für Rekursion" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "Refmap" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "Refmap für 'fetch' angeben" @@ -6264,11 +6560,6 @@ msgstr "Aktualisierung erzwungen" msgid "(non-fast-forward)" msgstr "(kein Vorspulen)" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "kann %s nicht öffnen: %s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6479,55 +6770,55 @@ msgstr "Prüfe Konnektivität" msgid "Checking object directories" msgstr "Prüfe Objekt-Verzeichnisse" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<Optionen>] [<Objekt>...]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "unerreichbare Objekte anzeigen" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "unreferenzierte Objekte anzeigen" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "Tags melden" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "Hauptwurzeln melden" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "ebenso Pakete und alternative Objekte betrachten" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "nur Konnektivität prüfen" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "genauere Prüfung aktivieren" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "unreferenzierte Objekte nach .git/lost-found schreiben" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "Prüfe Objekte" @@ -6637,226 +6928,226 @@ msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen" msgid "unable to grep from object of type %s" msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "Schalter '%c' erwartet einen numerischen Wert" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "kann '%s' nicht öffnen" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "im Index anstatt im Arbeitsverzeichnis suchen" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "in versionierten und unversionierten Dateien suchen" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "Zeilen ohne Übereinstimmungen anzeigen" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "nur ganze Wörter suchen" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "binäre Dateien als Text verarbeiten" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "keine Muster in Binärdateien finden" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "höchstens <Tiefe> Ebenen durchlaufen" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "Muster als feste Zeichenketten interpretieren" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "Perl-kompatible reguläre Ausdrücke verwenden" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "Zeilennummern anzeigen" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "keine Dateinamen anzeigen" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "Dateinamen anzeigen" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "Synonym für --files-with-matches" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "NUL-Zeichen nach Dateinamen ausgeben" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "Übereinstimmungen hervorheben" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "" "eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "" "den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser Datei " "anzeigen" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "<n> Threads benutzen" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "Kurzform für -C NUM" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "die umgebende Funktion anzeigen" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "Muster von einer Datei lesen" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "<Muster> finden" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "Muster kombinieren, die mit -e angegeben wurden" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "" "nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "Anzeigeprogramm" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "keine Muster angegeben" -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ungültige Anzahl von Threads angegeben (%d)" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "" "Die Option --open-files-in-pager kann nur innerhalb des " "Arbeitsverzeichnisses verwendet werden." -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" "Die Optionen --cached und --untracked können nicht mit --no-index verwendet " "werden." -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "" "Die Optionen --no-index und --untracked können nicht mit Commits verwendet " "werden." -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "Die Option --[no-]exclude-standard kann nicht mit versionierten Inhalten " "verwendet werden." -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden." @@ -6947,8 +7238,8 @@ msgstr "Version des emacsclient '%d' ist zu alt (< 22)." #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "Fehler beim Ausführen von '%s': %s" +msgid "failed to exec '%s'" +msgstr "Fehler beim Ausführen von '%s'" #: builtin/help.c:205 #, c-format @@ -7207,107 +7498,109 @@ msgstr "Fehler beim Auflösen der Unterschiede" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "abgeschlossen mit %d lokalen Objekten" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "abgeschlossen mit %d lokalem Objekt" +msgstr[1] "abgeschlossen mit %d lokalen Objekten" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "Paket hat %d unaufgelöste Unterschied" msgstr[1] "Paket hat %d unaufgelöste Unterschiede" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschädigt" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "Fehler beim Schließen der Paketdatei" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen" -#: builtin/index-pack.c:1587 +#: builtin/index-pack.c:1589 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "kein Unterschied: %d Objekt" msgstr[1] "kein Unterschied: %d Objekte" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1596 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt" msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte" -#: builtin/index-pack.c:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "%s ist ungültig" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." @@ -7346,27 +7639,27 @@ msgstr "kann '%s' nicht nach '%s' kopieren" msgid "ignoring template %s" msgstr "ignoriere Vorlage %s" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "keine Vorlagen in '%s' gefunden" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "kopiere keine Vorlagen mit einer falschen Formatversion %d von '%s'" +msgid "not copying templates from '%s': %s" +msgstr "kopiere keine Vorlagen von '%s': %s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s existiert bereits" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "kann nicht mit Dateityp %d umgehen" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "Konnte %s nicht nach %s verschieben" @@ -7374,24 +7667,24 @@ msgstr "Konnte %s nicht nach %s verschieben" #. 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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git-Repository in %s%s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "Reinitialisierte existierendes" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "Initialisierte leeres" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr " gemeinsames" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7399,25 +7692,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--" "shared[=<Berechtigungen>]] [<Verzeichnis>]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "Berechtigungen" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "kann Verzeichnis %s nicht erstellen" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "kann nicht in Verzeichnis %s wechseln" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7426,7 +7719,7 @@ msgstr "" "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s " "(oder --git-dir=<Verzeichnis>)" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen." @@ -7472,266 +7765,318 @@ msgstr "git show [<Optionen>] <Objekt>..." msgid "invalid --decorate option: %s" msgstr "Ungültige Option für --decorate: %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "Ausgabe der Unterschiede unterdrücken" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "Quelle anzeigen" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "\"mailmap\"-Datei verwenden" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "decorate-Optionen" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "letzte Ausgabe: %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ungültige Datei" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "Kann Objekt %s nicht lesen." -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "Unbekannter Typ: %d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "Name des Ausgabeverzeichnisses ist zu lang." -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "Kann Patch-Datei %s nicht öffnen" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "Brauche genau einen Commit-Bereich." -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "Kein Commit-Bereich." -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "Anschreiben benötigt E-Mail-Format" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "Unbekannter Commit %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 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Konnte '%s' nicht als gültige Referenz auflösen." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "Konnte keine exakte Merge-Basis finden." + +#: builtin/log.c:1235 +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 "" +"Fehler beim Bestimmen des Upstream-Branches. Wenn Sie den Basis-Commit\n" +"automatisch speichern lassen möchten, benutzen Sie bitte\n" +"'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n" +"Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "Fehler beim Finden einer exakten Merge-Basis." + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein." + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein." + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "kann Patch-Id nicht lesen" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "[PATCH] auch mit mehreren Patches verwenden" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "Ausgabe der Patches in Standard-Ausgabe" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "ein Deckblatt erzeugen" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "Dateiendung" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "<Dateiendung> anstatt '.patch' verwenden" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "die Serie als n-te Fassung kennzeichnen" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "[<Präfix>] anstatt [PATCH] verwenden" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "erzeugte Dateien in <Verzeichnis> speichern" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "[PATCH] nicht entfernen/hinzufügen" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "keine binären Unterschiede ausgeben" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "Hash mit Nullen in \"From\"-Header ausgeben" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "" "keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "E-Mail-Einstellungen" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "Header" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "E-Mail-Header hinzufügen" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "E-Mail" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "\"To:\"-Header hinzufügen" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "\"Cc:\"-Header hinzufügen" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "Ident" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn " "fehlend)" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "aus erster E-Mail eine Antwort zu <message-id> machen" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "Grenze" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "den Patch anhängen" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "den Patch direkt in die Nachricht einfügen" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "Signatur" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "eine Signatur hinzufügen" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "Basis-Commit" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "eine Signatur aus einer Datei hinzufügen" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "keine Dateinamen der Patches anzeigen" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "Die Optionen -n und -k schließen sich gegenseitig aus." -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "Die Optionen --subject-prefix und -k schließen sich gegenseitig aus." -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "Die Option --name-only kann nicht verwendet werden." -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "Die Option --name-status kann nicht verwendet werden." -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "Die Option --check kann nicht verwendet werden." -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "Konnte Signatur-Datei '%s' nicht lesen" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -7739,11 +8084,6 @@ msgstr "" "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> " "manuell an.\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "Unbekannter Commit %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<Optionen>] [<Datei>...]" @@ -7943,175 +8283,179 @@ msgstr "git merge [<Optionen>] <Beschreibung> HEAD <Commit>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "Schalter 'm' erfordert einen Wert." -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Konnte Merge-Strategie '%s' nicht finden.\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "Verfügbare Strategien sind:" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "Verfügbare benutzerdefinierte Strategien sind:" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(Synonym für --stat)" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits " "hinzufügen" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "einen einzelnen Commit anstatt eines Merges erzeugen" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "Bearbeitung der Beschreibung vor dem Commit" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "Vorspulen erlauben (Standard)" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "abbrechen, wenn kein Vorspulen möglich ist" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "Strategie" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "zu verwendende Merge-Strategie" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "Option=Wert" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "Option für ausgewählte Merge-Strategie" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "den sich im Gange befindlichen Merge abbrechen" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "Konnte \"stash\" nicht ausführen." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "\"stash\" fehlgeschlagen" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "kein gültiges Objekt: %s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "read-tree fehlgeschlagen" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (nichts zu quetschen)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: 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 "Konnte nicht nach '%s' schreiben." -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "Schreibe SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "Schließe SQUASH_MSG ab" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' zeigt auf keinen Commit" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ungültiger branch.%s.mergeoptions String: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "Es wird nur der Merge von zwei Branches behandelt." -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Unbekannte Option für merge-recursive: -X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "konnte nicht von '%s' lesen" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge " "abzuschließen.\n" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -8127,55 +8471,55 @@ msgstr "" "Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "Leere Commit-Beschreibung" -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen " "Sie dann das Ergebnis.\n" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "'%s' ist kein Commit" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "Sie befinden sich auf keinem Branch." -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "Kein Remote-Repository für den aktuellen Branch." -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "" "Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert." -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Kein Remote-Tracking-Branch für %s von %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "Konnte '%s' nicht schließen" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Es gibt keinen Merge zum Abbrechen (MERGE_HEAD fehlt)" -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8183,7 +8527,7 @@ msgstr "" "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen." -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8191,105 +8535,109 @@ msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen." -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)." -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "Sie können --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "" "Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen." -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet " "werden." -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenführen können" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen." -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s." -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s." -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s hat keine GPG-Signatur." -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "Verweigere den Merge von nicht zusammenhängenden Historien." + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s ...\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie behandelt diesen Merge.\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8400,7 +8748,7 @@ msgstr "git mv [<Optionen>] <Quelle>... <Ziel>" msgid "Directory %s is in index and no submodule?" msgstr "Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder " @@ -8481,48 +8829,48 @@ msgstr "%s, Quelle=%s, Ziel=%s" msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<Optionen>] <Commit>..." -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<Optionen>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<Optionen>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "nur Namen anzeigen (keine SHA-1)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "nur Tags verwenden, um die Commits zu benennen" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "nur Referenzen verwenden die <Muster> entsprechen" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "von der Standard-Eingabe lesen" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)" @@ -8671,24 +9019,16 @@ msgstr "Konnte Notiz-Objekt nicht schreiben" msgid "The note contents have been left in %s" msgstr "Die Notiz-Inhalte wurden in %s belassen" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "konnte '%s' nicht öffnen oder lesen" -#: 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:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Konnte '%s' nicht als gültige Referenz auflösen." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8701,7 +9041,7 @@ msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen." #: 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:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "zu viele Parameter" @@ -8748,7 +9088,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "Überschreibe existierende Notizen für Objekt %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "Entferne Notiz für Objekt %s\n" @@ -8790,15 +9130,15 @@ msgstr "" "Die Optionen -m/-F/-c/-C sind für den Unterbefehl 'edit' veraltet.\n" "Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "Allgemeine Optionen" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "Merge-Optionen" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -8806,51 +9146,51 @@ msgstr "" "löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "nicht zusammengeführte Notizen eintragen" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "" "Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen " "committet werden" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "Konfliktauflösung beim Merge von Notizen abbrechen" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "Merge von Notizen abbrechen" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "Ein Merge von Notizen nach %s ist bereits im Gange bei %s" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "Objekt %s hat keine Notiz\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "Objektnamen von der Standard-Eingabe lesen" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "Notiz-Referenz" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "Notizen von <Notiz-Referenz> verwenden" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" @@ -8874,176 +9214,182 @@ msgstr "" msgid "deflate error (%d)" msgstr "Fehler beim Komprimieren (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "" +"Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n" +"aufgetrennt." + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "Schreibe Objekte" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -"Deaktiviere Schreiben des Bitmap-Index, da einige Objekte nicht in\n" -"eine Pack-Datei geschrieben wurden" +"Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-Datei\n" +"geschrieben wurden." -#: builtin/pack-objects.c:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "Komprimiere Objekte" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "Nicht unterstützte Index-Version %s" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "Ungültige Index-Version '%s'" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "keine Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "" "Forschrittsanzeige während der Phase des Schreibens der Objekte anzeigen" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "" "die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "maximale Größe für jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "gepackte Objekte ignorieren" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "Paketfenster durch Objekte begrenzen" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "" "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2619 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "maximale Länge der erlaubten Differenzverkettung im resultierenden Paket" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "existierende Unterschiede wiederverwenden" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "existierende Objekte wiederverwenden" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA Objekte verwenden" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 msgid "use threads when searching for best delta matches" msgstr "" "Threads bei der Suche nach den besten Übereinstimmungen bei Unterschieden " "verwenden" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "keine leeren Pakete erzeugen" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 msgid "limit the objects to those that are not yet packed" msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "" "Objekte einschließen, die von Einträgen des Reflogs referenziert werden" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "Objekte einschließen, die vom Index referenziert werden" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "Paket in die Standard-Ausgabe schreiben" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "nicht erreichbare Objekte behalten" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "Zeit" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "dünnere Pakete erzeugen" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "" "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "Pakete ignorieren, die .keep Dateien haben" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "Komprimierungsgrad für Paketierung" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "Bitmap-Index zusammen mit Pack-Index schreiben" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "Zähle Objekte" @@ -9071,15 +9417,15 @@ msgstr "Lösche doppelte Objekte" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <Zeit>] [--] [<head>...]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "nicht löschen, nur anzeigen" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "gelöschte Objekte melden" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "Objekte älter als <Zeit> verfallen lassen" @@ -9091,52 +9437,56 @@ msgstr "kann \"prune\" in precious-objects Repository nicht ausführen" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "Optionen bezogen auf Merge" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "Integration von Änderungen durch Rebase statt Merge" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "Vorspulen erlauben" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "Optionen bezogen auf Fetch" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Ungültiger Wert für pull.ff: %s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" "Kann \"pull\" mit \"rebase\" nicht ausführen: Sie haben Änderungen, die " "nicht zum Commit vorgemerkt sind." -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "Zusätzlich beinhaltet die Staging-Area nicht committete Änderungen." -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "Kann \"pull\" mit \"rebase\" nicht ausführen: Die Staging-Area beinhaltet " "nicht committete Änderungen." -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9144,14 +9494,14 @@ msgstr "" "Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben " "angefordert wurden." -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Es gibt keine Kandidaten für Merge innerhalb der Referenzen, die eben " "angefordert wurden." -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -9159,7 +9509,7 @@ msgstr "" "Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n" "haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt." -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9171,42 +9521,46 @@ msgstr "" "Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n" "der Befehlszeile angeben." -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Im Moment auf keinem Branch." -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" "Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen " "möchten." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenführen möchten." -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "Siehe git-pull(1) für weitere Details." -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<Remote-Repository>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<Branch>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch." -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" msgstr "" -"Wenn Sie Tracking-Informationen für diesen Branch setzen möchten, können " -"Sie\n" -"dies tun mit:\n" -"\n" -" git branch --set-upstream-to=%s/<Branch> %s\n" +"Wenn Sie Tracking-Informationen für diesen Branch setzen möchten, können Sie\n" +"dies tun mit:" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9216,13 +9570,17 @@ msgstr "" "des Remote-Repositories durchzuführen, aber diese Referenz\n" "wurde nicht angefordert." -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "--[no-]autostash ist nur mit --rebase zulässig." + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit " "vorgemerkt sind." -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9232,7 +9590,7 @@ msgstr "" "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n" "Spule Ihr Arbeitsverzeichnis von Commit %s vor." -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9249,11 +9607,11 @@ msgstr "" "$ git reset --hard\n" "zur Wiederherstellung aus." -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen." -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "Kann Rebase nicht auf mehrere Branches ausführen." @@ -9623,12 +9981,24 @@ msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren" #: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" -msgstr "Anwendung des Filters für spärliches Auschecken überspringen" +msgstr "Anwendung des Filters für partielles Auschecken überspringen" #: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "Entpacken der Bäume protokollieren" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <Git-Verzeichnis>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "weniger Ausgaben" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "Sie müssen ein Repository angeben." + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9960,21 +10330,23 @@ msgstr "* Remote-Repository %s" msgid " Fetch URL: %s" msgstr " URL zum Abholen: %s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(keine URL)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " URL zum Versenden: %s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " Hauptbranch: %s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -9982,159 +10354,159 @@ msgstr "" " Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden " "sein):\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Remote-Branch:%s" msgstr[1] " Remote-Branches:%s" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (Zustand nicht abgefragt)" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokaler Branch konfiguriert für 'git pull':" msgstr[1] " Lokale Branches konfiguriert für 'git pull':" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokale Referenzen werden von 'git push' gespiegelt" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokale Referenz konfiguriert für 'git push'%s:" msgstr[1] " Lokale Referenzen konfiguriert für 'git push'%s:" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "entfernt refs/remotes/<Name>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "Kann HEAD des Remote-Repositories nicht bestimmen" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen " "aus mit:" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "Konnte %s nicht entfernen" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "keine gültige Referenz: %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "Konnte %s nicht einrichten" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s wird unreferenziert!" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s wurde unreferenziert!" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "entferne veraltete Branches von %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [würde veralteten Branch entfernen] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr "* [veralteten Branch entfernt] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\"" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Kein solches Remote-Repository '%s'" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "Branch hinzufügen" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "kein Remote-Repository angegeben" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "nur URLs für Push ausgeben" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "alle URLs ausgeben" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "Keine URLs für Remote-Repository '%s' konfiguriert." -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "URLs für \"push\" manipulieren" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "URL hinzufügen" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "URLs löschen" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "" "Die Optionen --add und --delete können nicht gemeinsam verwendet werden." -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ungültiges altes URL Format: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "Keine solche URL gefunden: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden" @@ -10652,13 +11024,6 @@ msgstr "rekursive Entfernung erlauben" msgid "exit with a zero status even if nothing matched" msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder " -"benutzen\n" -"Sie \"stash\", um fortzufahren." - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10869,81 +11234,182 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "Referenz nicht gefunden: %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "Vollständiger Referenzname erwartet, %s erhalten" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "Kann eine Komponente von URL '%s' nicht extrahieren" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "Alternativer Anker für relative Pfade" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration." + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "" +"Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n" +"Konfiguration." + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<Pfad>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <Pfad>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "Pfad für neues Submodul" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "Name des neuen Submoduls" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "URL von der das Submodul geklont wird" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" -msgstr "" -"git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference " -"<Repository>] [--name <Name>] [--url <URL>][--depth <Tiefe>] [--] [<Pfad>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +msgstr "git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference <Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth <Tiefe>] --url <URL> --path <Pfad>" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "Kann Datei '%s' nicht öffnen" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "Konnte Datei '%s' nicht schließen." -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden." -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" -msgstr "fatal: submodule--helper muss mit einem Unterbefehl aufgerufen werden" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "Submodul-Pfad '%s' nicht initialisiert" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "Meinten Sie vielleicht 'update --init'?" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "Überspringe nicht zusammengeführtes Submodul %s" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "Überspringe Submodul '%s'" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "Pfad zum Arbeitsverzeichnis" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "rebase, merge, checkout oder none" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "" +"Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten bei\n" +"der angegebenen Anzahl von Commits." + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "Parallele Ausführungen" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "keine Fortschrittsanzeige beim Klonen" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "Fehlerhafter Wert für --update Parameter" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "submodule--helper muss mit einem Unterbefehl aufgerufen werden" + +#: builtin/submodule--helper.c:862 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "fatal: '%s' ist kein gültiger Unterbefehl von submodule--helper" +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10998,27 +11464,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <Tagname>..." -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "Tagname zu lang: %.*s..." -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "Tag '%s' nicht gefunden." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tag '%s' gelöscht (war %s)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "Konnte Tag '%s' nicht verifizieren" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -11031,7 +11492,7 @@ msgstr "" " %s\n" "ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -11163,21 +11624,21 @@ msgstr "Die Optionen --merged und --no-merged sind nur mit -l erlaubt." msgid "only one -F or -m option is allowed." msgstr "nur eine -F oder -m Option ist erlaubt." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "zu viele Parameter" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ist kein gültiger Tagname." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "Tag '%s' existiert bereits" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aktualisiert (war %s)\n" @@ -11445,7 +11906,7 @@ msgstr "git verify-commit [-v | --verbose] <Commit>..." msgid "print commit contents" msgstr "Commit-Inhalte ausgeben" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "unbearbeitete Ausgabe des Status von gpg ausgeben" @@ -11465,7 +11926,7 @@ msgstr "nur Statistiken anzeigen" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <Tag>..." -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "Tag-Inhalte ausgeben" @@ -11481,70 +11942,74 @@ msgstr "git worktree prune [<Optionen>]" msgid "git worktree list [<options>]" msgstr "git worktree list [<Optionen>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Lösche worktrees/%s: ungültige gitdir-Datei" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "Fehler beim Löschen: %s" +msgid "failed to remove '%s'" +msgstr "Fehler beim Löschen von '%s'" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "'%s' existiert bereits" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Bereite %s vor (Identifikation %s)" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "<Branch> auschecken, auch wenn dieser bereits in einem anderen " "Arbeitsverzeichnis ausgecheckt ist" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "neuen Branch erstellen" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "Branch erstellen oder umsetzen" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "HEAD bei benanntem Commit loslösen" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "das neue Arbeitsverzeichnis auschecken" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B und --detach schließen sich gegenseitig aus" @@ -11564,7 +12029,7 @@ msgstr "das \"Tree\"-Objekt für ein Unterverzeichnis <Präfix> schreiben" msgid "only useful for debugging" msgstr "nur nützlich für Fehlersuche" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben" @@ -11579,7 +12044,7 @@ msgstr "" "oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n" "Konzept zu erfahren." -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" "Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n" @@ -11719,7 +12184,7 @@ msgstr "weniger Ausgaben" msgid "use <n> digits to display SHA-1s" msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "" "Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren" @@ -11941,16 +12406,16 @@ msgstr "" "Um den ursprünglichen Branch wiederherzustellen und den Rebase abzubrechen,\n" "führen Sie \"git rebase --abort\" aus." -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "\"autostash\" angewendet." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kann $stash_sha1 nicht speichern." -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11960,33 +12425,29 @@ msgstr "" "Ihre Änderungen sind im Stash sicher.\n" "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen." -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "\"git-am\" scheint im Gange zu sein. Kann Rebase nicht durchführen." -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "Die Option --exec muss mit --interactive verwendet werden." - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Kein Rebase im Gange?" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet " "werden." -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11994,12 +12455,12 @@ msgstr "" "Sie müssen alle Merge-Konflikte editieren und diese dann\n" "mittels \"git add\" als aufgelöst markieren" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "Konnte nicht zu $head_name zurückgehen" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -12020,67 +12481,67 @@ msgstr "" "und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n" "etwas Schützenswertes vorhanden ist." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ungültiger Upstream-Branch $upstream_name" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: es gibt mehr als eine Merge-Basis" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: es gibt keine Merge-Basis" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "$onto_name zeigt auf keinen gültigen Commit" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal: Branch $branch_name nicht gefunden" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "Kann \"autostash\" nicht ausführen." -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "\"autostash\" erzeugt: $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" "Aktueller Branch $branch_name ist auf dem neuesten Stand, Rebase erzwungen." -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Änderungen von $mb zu $onto:" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n" "darauf neu anzuwenden ..." -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name zu $onto_name vorgespult." @@ -12225,28 +12686,23 @@ msgstr "Kein Branchname spezifiziert" msgid "(To restore them type \"git stash apply\")" msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "Kann eine Komponente von URL '$remoteurl' nicht extrahieren" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Relative Pfade können nur von der obersten Ebene des Arbeitsverzeichnisses " "benutzt werden." -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ist bereits zum Commit vorgemerkt" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12257,24 +12713,24 @@ msgstr "" "$sm_path\n" "Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten." -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu." -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Repository" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Remote-" "Repositories:" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" @@ -12282,7 +12738,7 @@ msgstr "" "Wenn Sie dieses lokale Git-Verzeichnis wiederverwenden möchtest, anstatt " "erneut zu klonen" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" @@ -12290,7 +12746,7 @@ msgstr "" "benutzen Sie die Option '--force'. Wenn das lokale Git-Verzeichnis nicht das " "korrekte Repository ist" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -12299,77 +12755,56 @@ msgstr "" "oder Sie sich unsicher sind, was das bedeutet, wählen Sie einen anderen " "Namen mit der Option '--name'." -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'." -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kann Submodul '$sm_path' nicht auschecken" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration." -#: git-submodule.sh:417 -#, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "Betrete '$prefix$displaypath'" - -#: git-submodule.sh:437 -#, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." -msgstr "Stoppe bei '$prefix$displaypath'; Skript gab nicht-Null Status zurück." - -#: git-submodule.sh:483 -#, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "Keine URL für Submodul-Pfad '$displaypath' in .gitmodules gefunden" - -#: git-submodule.sh:492 +#: git-submodule.sh:355 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "" -"Fehler beim Eintragen der URL für Submodul-Pfad '$displaypath' in die " -"Konfiguration." +msgid "Entering '$displaypath'" +msgstr "Betrete '$displaypath'" -#: git-submodule.sh:494 +#: git-submodule.sh:375 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "" -"Submodul '$name' ($url) für Pfad '$displaypath' in die Konfiguration " -"eingetragen." +msgid "Stopping at '$displaypath'; script returned non-zero status." +msgstr "Stoppe bei '$displaypath'; Skript gab nicht-Null Status zurück." -#: git-submodule.sh:511 +#: git-submodule.sh:448 #, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" -"Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad " -"'$displaypath' in der Konfiguration." +msgid "pathspec and --all are incompatible" +msgstr "Pfadspezifikationen und --all sind inkompatibel." -#: git-submodule.sh:549 +#: git-submodule.sh:453 #, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" +msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" -"Verwenden Sie '.' wenn Sie wirklich alle Submodule\n" -"deinitialisieren möchten." +"Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n" +"möchten." -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" "Arbeitsverzeichnis des Submoduls in '$displaypath' enthält ein .git-" "Verzeichnis" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" @@ -12377,7 +12812,7 @@ msgstr "" "(benutzen Sie 'rm -rf' wenn Sie dieses Submodul wirklich mitsamt\n" "seiner Historie löschen möchten)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -12386,142 +12821,178 @@ msgstr "" "Arbeitsverzeichnis von Submodul in '$displaypath' enthält lokale Änderungen; " "verwenden Sie '-f', um diese zu verwerfen" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Verzeichnis '$displaypath' bereinigt." -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" "Konnte Arbeitsverzeichnis des Submoduls in '$displaypath' nicht löschen." -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" "Konnte kein leeres Verzeichnis für Submodul in '$displaypath' erstellen." -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der Konfiguration " "entfernt." -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"Submodul-Pfad '$displaypath' ist nicht initialisiert.\n" -"Vielleicht möchten Sie 'update --init' benutzen?" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden." -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken." -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" -msgstr "" -"Ausführung von '$command $sha1' in Submodul-Pfad '$prefix$sm_path' " -"fehlgeschlagen" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" +msgstr "Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "Submodul-Pfad '$prefix$sm_path': '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "Submodul-Pfad '$displaypath': '$command $sha1'" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "" "Die Optionen --cached und --files können nicht gemeinsam verwendet werden." -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src" -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst" -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst" -#: git-submodule.sh:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "Blob" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisiere Submodul-URL für '$displaypath'" +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "Siehe git-${cmd}(1) für weitere Details." + +#~ msgid "'%s': %s" +#~ msgstr "'%s': %s" + +#~ msgid "unable to access '%s': %s" +#~ msgstr "konnte nicht auf '%s' zugreifen: %s" + +#~ msgid "could not open '%s' for reading: %s" +#~ msgstr "Konnte '%s' nicht zum Lesen öffnen: %s" + +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "Konnte '%s' nicht zum Schreiben öffnen: %s" + +#~ msgid " git branch -d %s\n" +#~ msgstr " git branch -d %s\n" + +#~ msgid " git branch --set-upstream-to %s\n" +#~ msgstr " git branch --set-upstream-to %s\n" + +#~ msgid "cannot open %s: %s\n" +#~ msgstr "kann %s nicht öffnen: %s\n" + +#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed" +#~ msgstr "" +#~ "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder " +#~ "benutzen\n" +#~ "Sie \"stash\", um fortzufahren." + +#~ msgid "could not verify the tag '%s'" +#~ msgstr "Konnte Tag '%s' nicht verifizieren" + +#~ msgid "failed to remove: %s" +#~ msgstr "Fehler beim Löschen: %s" + +#~ msgid "The --exec option must be used with the --interactive option" +#~ msgstr "Die Option --exec muss mit --interactive verwendet werden." + +#~ msgid "" +#~ "Submodule path '$displaypath' not initialized\n" +#~ "Maybe you want to use 'update --init'?" +#~ msgstr "" +#~ "Submodul-Pfad '$displaypath' ist nicht initialisiert.\n" +#~ "Vielleicht möchten Sie 'update --init' benutzen?" + #~ msgid "Forward-port local commits to the updated upstream head" #~ msgstr "lokale Commits auf einem aktuellerem Upstream-Branch neu aufbauen" @@ -12592,9 +13063,6 @@ msgstr "Synchronisiere Submodul-URL für '$displaypath'" #~ msgid "Could not append '%s'" #~ msgstr "Konnte '%s' nicht anhängen." -#~ msgid "Could not set '%s'" -#~ msgstr "Konnte '%s' nicht setzen" - #~ msgid "Missing author: %s" #~ msgstr "fehlender Autor: %s" @@ -12732,13 +13200,6 @@ msgstr "Synchronisiere Submodul-URL für '$displaypath'" #~ msgstr "" #~ "\"pull\" ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#~ msgid "" -#~ "You have not concluded your merge (MERGE_HEAD exists).\n" -#~ "Please, commit your changes before you can merge." -#~ msgstr "" -#~ "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" -#~ "Bitte committen Sie Ihre Änderungen, bevor Sie \"merge\" ausführen können." - #~ msgid "no branch specified" #~ msgstr "Kein Branch spezifiziert" @@ -12951,13 +13412,6 @@ msgstr "Synchronisiere Submodul-URL für '$displaypath'" #~ msgstr "Eingabepfade sind durch ein NUL Zeichen abgeschlossen" #~ msgid "" -#~ "The following untracked files would NOT be saved but need to be removed " -#~ "by stash save:" -#~ msgstr "" -#~ "Die folgenden unbeobachteten Dateien würden NICHT gespeichert werden,\n" -#~ "müssen aber durch \"stash save\" entfernt werden:" - -#~ msgid "" #~ "Aborting. Consider using either the --force or --include-untracked option." #~ msgstr "" #~ "Abgebrochen. Benutzen Sie entweder die Option --force oder --include-" @@ -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-03-16 00:16+0800\n" -"PO-Revision-Date: 2016-03-14 20:26+0100\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-05-26 22:46+0200\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" @@ -96,7 +96,7 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nécessaire pour marquer la résolution et valider." -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." @@ -140,7 +140,7 @@ msgstr "fmt" msgid "archive format" msgstr "format d'archive" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "préfixe" @@ -148,9 +148,9 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 builtin/blame.c:2548 +#: 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:720 builtin/hash-object.c:100 builtin/ls-files.c:459 +#: 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 msgid "file" @@ -184,7 +184,8 @@ msgstr "compression efficace" msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "dépôt" @@ -343,11 +344,16 @@ msgstr "Nom d'objet ambigu : '%s'." msgid "Not a valid branch point: '%s'." msgstr "Point d'embranchement invalide : '%s'." -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' est déjà extrait dans '%s'" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "la HEAD de la copie de travail %s n'est pas mise à jour" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -358,7 +364,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 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -367,10 +373,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:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: 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 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" @@ -409,21 +415,21 @@ 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:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "l'index de groupe a disparu" @@ -432,8 +438,8 @@ msgstr "l'index de groupe a disparu" msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" @@ -468,21 +474,21 @@ msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" msgid "failed to expand user dir in: '%s'" msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" @@ -503,24 +509,27 @@ msgstr "" msgid "%s has multiple values" msgstr "%s a des valeurs multiples" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "impossible de régler '%s' à '%s'" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" -msgstr "Impossible de régler '%s' à '%s'" +msgid "could not unset '%s'" +msgstr "impossible de désinitialiser '%s'" #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "impossible d'écrire dans la rev-list : %s" +msgid "failed write to rev-list" +msgstr "impossible d'écrire dans la rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "impossible de fermer l'entrée standard du rev-list : %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "impossible de fermer l'entrée standard du rev-list" #: date.c:95 msgid "in the future" @@ -595,28 +604,28 @@ msgstr[1] "il y a %lu ans" msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Impossible d'analyser le pourcentage de modification de dirstat '%s'\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Paramètre dirstat inconnu '%s'\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -625,16 +634,16 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -643,20 +652,20 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2123 +#: dir.c:1942 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." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "impossible de lancer gpg." @@ -670,28 +679,28 @@ msgstr "gpg n'a pas pu signer les données" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "impossible de créer un fichier temporaire '%s' : %s" +msgid "could not create temporary file '%s'" +msgstr "impossible de créer un fichier temporaire '%s'" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "impossible d'écrire la signature détachée dans '%s' : %s" +msgid "failed writing detached signature to '%s'" +msgstr "impossible d'écrire la signature détachée dans '%s'" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "'%s' : %s" +msgid "failed to stat '%s'" +msgstr "échec du stat de '%s'" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "'%s' : lecture tronquée %s" +msgid "'%s': short read" +msgstr "'%s' : lecture tronquée" #: help.c:205 #, c-format @@ -758,12 +767,36 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"Impossible de créer '%s.lock' : %s.\n" +"\n" +"Il semble qu'un autre processus git est déjà lancé dans ce dépôt,\n" +"par exemple un éditeur ouvert par 'git commit'. Veuillez vous assurer\n" +"que tous les processus sont terminés et réessayez. Si l'echec persiste,\n" +"un processus git peut avoir planté :\n" +"supprimez le fichier manuellement pour poursuivre." + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "Impossible de créer '%s.lock' : %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" @@ -810,7 +843,7 @@ msgstr "impossible de lire l'objet %s '%s'" msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" @@ -946,7 +979,7 @@ msgstr "%s sauté (fusion identique à l'existant)" msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "sous-module" @@ -974,50 +1007,50 @@ 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:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Échec fatal de fusion, qui ne devrait jamais arriver." -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Déjà à jour !" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "Chemin non traité ??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, 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:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -1047,28 +1080,28 @@ msgstr "Mauvaise valeur de %s : '%s'" msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "..." -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " ou : %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-NUM" @@ -1077,7 +1110,7 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "nom d'objet malformé '%s'" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "Impossible de rendre %s inscriptible pour le groupe" @@ -1150,7 +1183,7 @@ 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:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" @@ -1176,23 +1209,23 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "Impossible d'ouvrir '%s' en écriture" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "Impossible de supprimer la référence %s : %s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "impossible de supprimer les références : %s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "impossible de supprimer la référence %s" @@ -1331,96 +1364,96 @@ msgstr "format: atome %%(end) manquant" msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: remote.c:745 +#: remote.c:746 #, 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:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "Erreur interne" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurée pour la branche '%s'" -#: remote.c:1695 +#: remote.c:1696 #, 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:1711 #, 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:1726 #, 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:1737 #, 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:1750 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:1772 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:2074 #, 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:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2080 +#: remote.c:2081 #, 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:2085 #, 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:2091 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:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1432,11 +1465,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:2102 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:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1451,21 +1484,21 @@ 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:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "votre branche actuelle '%s' ne contient encore aucun commit" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" @@ -1516,7 +1549,7 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "Impossible d'écrire dans %s" @@ -1676,12 +1709,12 @@ msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" msgid "Could not create sequencer directory %s" msgstr "Impossible de créer le répertoire de séquenceur %s" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "Erreur lors de l'emballage de %s." -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" @@ -1693,63 +1726,72 @@ msgstr "impossible de résoudre HEAD" msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "impossible d'ouvrir %s : %s" +msgid "cannot open %s" +msgstr "impossible d'ouvrir %s" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "impossible de lire %s : %s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:888 +#: sequencer.c:887 #, 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:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "Impossible de formater %s." -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "Impossible d'annuler en tant que commit initial" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "Impossible de picorer vers une HEAD vide" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" +#: setup.c:468 +#, 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 +msgid "unknown repository extensions found:" +msgstr "extensions de dépôt inconnues trouvées :" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, 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:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -1780,32 +1822,41 @@ msgstr "" "message\n" "en lançant \"git config advice.objectNameWarning false\"" -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Modification impossible de .gitmodules non fusionné, résolvez les conflits " "d'abord" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, 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:74 +#: submodule.c:76 #, 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:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Impossible de supprimer l'élément de .gitmodules pour %s" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "échec de la mise en index du .gitmodules mis à jour" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "Valeur invalide pour %s" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1865,7 +1916,219 @@ msgstr "impossible de renommer un fichier temporaire en %s" msgid "Could not read ref %s" msgstr "impossible de lire la réf %s" -#: unpack-trees.c:203 +#: 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." +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n" +"%%sVeuillez valider ou remiser vos modifications avant de basculer de branche." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n" +"%%s" + +#: unpack-trees.c:69 +#, 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." +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n" +"%%sVeuillez valider ou remiser vos modifications avant la fusion." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n" +"%%s" + +#: unpack-trees.c:74 +#, 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." +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 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"La mise à jour des répertoires suivants effacerait les fichiers non suivis contenus :\n" +"%s" + +#: unpack-trees.c:85 +#, 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." +msgstr "" +"Les fichiers suivants non suivis seraient effacés par l'extraction :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient effacés par l'extraction :\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Les fichiers suivants non suivis seraient effacés par la fusion :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant la fusion." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient effacés par la fusion :\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Les fichiers suivants non suivis seraient effacés par %s :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant %s." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient effacés par %s :\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Les fichiers suivants non suivis seraient effacés par la fusion :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant la fusion." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient écrasés par la fusion :\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Les fichiers suivants non suivis seraient écrasés par %s :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant %s." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient écrasés par %s :\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont pas à jour :\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Les fichiers suivants de la copie de travail seraient écrasés par la mise à jour par extraction creuse :\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Les fichiers suivants de la copie de travail seraient supprimés par la mise à jour par extraction creuse :\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "Abandon\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "Extraction des fichiers" @@ -1903,201 +2166,197 @@ msgstr "segment de chemin '..' invalide" msgid "could not open '%s' for reading and writing" msgstr "impossible d'ouvrir '%s' en lecture/écriture" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "impossible d'accéder à '%s' : %s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accéder à '%s'" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "impossible d'accéder au répertoire de travail courant" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "Impossible d'ouvrir '%s' en écriture" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "Impossible d'écrire dans %s" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "impossible de fermer %s" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Chemins non fusionnés :" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme " "résolu)" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera " "validé)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications " "dans la copie de travail)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "supprimé des deux côtés :" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "ajouté par nous :" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "supprimé par eux :" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "ajouté par eux :" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "supprimé par nous :" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "ajouté de deux côtés :" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "modifié des deux côtés :" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "bogue : état de non-fusion non géré %x" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "nouveau fichier :" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "copié :" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "supprimé :" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "modifié :" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "renommé :" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "modif. type :" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "inconnu :" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "non fusionné :" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "nouveaux commits, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "contenu modifié, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "contenu non suivi, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "bogue : état de diff non géré %c" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2105,39 +2364,39 @@ msgstr "" "Ne touchez pas à la ligne ci-dessus\n" "Tout ce qui suit sera éliminé." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée." -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" @@ -2286,43 +2545,43 @@ msgstr "Vous êtes en cours de bissection." 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:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2334,32 +2593,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1513 +#: wt-status.c:1535 #, 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:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2368,57 +2627,57 @@ 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:1522 +#: wt-status.c:1544 #, 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:1525 +#: wt-status.c:1547 #, 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:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, 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:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "Validation initiale sur " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" # à priori on parle d'une branche ici -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "disparue" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "derrière " -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "devant " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "échec lors de l'unlink de '%s'" @@ -2432,7 +2691,7 @@ msgstr "git add [<options>] [--] <chemin>..." msgid "unexpected diff status %c" msgstr "status de diff inattendu %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" @@ -2445,7 +2704,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:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "Impossible de lire l'index" @@ -2482,14 +2741,14 @@ msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .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:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: 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 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: 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 "mode verbeux" @@ -2497,7 +2756,7 @@ msgstr "mode verbeux" msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "sélection interactive des sections" @@ -2569,16 +2828,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" @@ -2606,16 +2865,6 @@ msgstr "Impossible de copier les notes de '%s' vers '%s'" msgid "fseek failed" msgstr "échec de fseek" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "impossible d'ouvrir '%s' en lecture : %s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "impossible d'ouvrir '%s' en écriture : %s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2625,78 +2874,78 @@ msgstr "impossible d'analyser le patch '%s'" msgid "Only one StGIT patch series can be applied at once" msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "horodatage invalide" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "ligne de Date invalide" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "décalage horaire invalide" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "Échec de découpage des patchs." -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "impossible d'écrire le fichier d'index" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"." -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"." -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --" "abort\"." -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "Le patch est vide. Le découpage était-il bon ?" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " "points." -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilisation de l'information de l'index pour reconstruire un arbre de base..." -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2704,38 +2953,38 @@ msgstr "" "Avez-vous édité le patch à la main ?\n" "Il ne s'applique pas aux blobs enregistrés dans son index." -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour à un patch de la base et fusion à 3 points..." -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "application à un historique vide" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "impossible d'être interactif sans entrée standard connectée à un terminal." -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -2743,35 +2992,35 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : " -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "le patch a échoué à %s %.*s" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "La copie du patch qui a échoué se trouve dans : %s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2782,7 +3031,7 @@ msgstr "" "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2790,17 +3039,17 @@ msgstr "" "Vous avez toujours des chemins non fusionnés dans votre index\n" "Auriez-vous oublié de faire 'git add' ?" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "échec du nettoyage de l'index" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2808,154 +3057,156 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<options>] [(<mbox>|<Maildir>)...]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --quit | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "exécution interactive" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "être silencieux" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "ajouter une ligne Signed-off-by au message de validation" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par défaut)" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k à git-mailinfo" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b à git-mailinfo" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m à git-mailinfo" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "action" -#: 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:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: 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 msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "racine" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: 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 "chemin" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185 +#: 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/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 #: parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "num" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "format" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "format de présentation des patchs" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "surcharger le message d'erreur lors d'un échec d'application de patch" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "continuer à appliquer les patchs après résolution d'un conflit" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "" "restaurer la branche originale et abandonner les applications de patch." -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "id-clé" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2340 +#: builtin/am.c:2339 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." @@ -2963,17 +3214,17 @@ msgstr "" "L'option -b/--binary ne fait plus rien depuis longtemps,\n" "et elle sera supprimée. Veuillez ne plus l'utiliser." -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "échec à la lecture de l'index" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "le répertoire précédent de rebasage %s existe toujours mais mbox donnée." -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2982,7 +3233,7 @@ msgstr "" "Répertoire abandonné %s trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "" "Pas de résolution de l'opération en cours, nous ne sommes pas dans une " @@ -3017,44 +3268,44 @@ msgstr "regexec a retourné %d pour l'entrée : %s" msgid "unable to find filename in patch at line %d" msgstr "nom de fichier du patch introuvable à la ligne %d" -#: builtin/apply.c:940 +#: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " "ligne %d" -#: builtin/apply.c:944 +#: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " "à la ligne %d" -#: builtin/apply.c:945 +#: builtin/apply.c:943 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " "à la ligne %d" -#: builtin/apply.c:952 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" -#: builtin/apply.c:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -3069,77 +3320,77 @@ msgstr[1] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composants de préfixe de chemin (ligne %d)" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: builtin/apply.c:2896 +#: 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] "La section n°%d a réussi à la ligne %d (offset %d ligne)." msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)." -#: builtin/apply.c:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3148,330 +3399,340 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s " "trouvé)" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "échec de la lecture de %s" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s : %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" -#: builtin/apply.c:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "création du magasin de stockage pour le fichier nouvellement créé %s " "impossible" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "erreur interne" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." -#: builtin/apply.c:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: builtin/apply.c:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "impossible d'ouvrir %s : %s" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Chemin '%s' non traité." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "entrée non reconnue" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "" "afficher le nombre de lignes ajoutées et supprimées en notation décimale" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "au lieu d'appliquer le patch, voir si le patch est applicable" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "" "construire un index temporaire fondé sur l'information de l'index embarqué" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "" "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs " "d'espace" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolérer des erreurs de détection de retours chariot manquants en fin de " "fichier" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au compte de lignes dans les en-têtes de section" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "--3way hors d'un dépôt" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "--index hors d'un dépôt" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "--cached hors d'un dépôt" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "ouverture impossible du patch '%s'" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erreur d'espace ignorée" msgstr[1] "%d erreurs d'espace ignorées" -#: builtin/apply.c:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3537,104 +3798,104 @@ msgstr "<options-de-révision> sont documentés dans git-rev-list(1)" msgid "Blaming lines" msgstr "Assignation de blâme au lignes" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 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:2531 +#: builtin/blame.c:2532 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:2532 +#: builtin/blame.c:2533 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:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "Forcer l'affichage de l'état d'avancement" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 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:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 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:2544 +#: builtin/blame.c:2545 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:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 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:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "score" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 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" @@ -3645,32 +3906,32 @@ 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..." -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<options>] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3679,7 +3940,7 @@ msgstr "" "suppression de la branche '%s' qui a été fusionnée dans\n" " '%s', mais pas dans HEAD." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3688,12 +3949,12 @@ msgstr "" "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n" " '%s', même si elle est fusionnée dans HEAD." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Impossible de rechercher l'objet commit pour '%s'" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3702,301 +3963,322 @@ 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'." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "Échec de la mise à jour du fichier de configuration" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "impossible d'utiliser -a avec -d" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "Impossible de rechercher l'objet commit pour HEAD" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "Impossible de supprimer la branche '%s' sur laquelle vous êtes." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "branche de suivi '%s' non trouvée." -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "branche '%s' non trouvée." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Erreur lors de la suppression de la branche de suivi '%s'" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "Erreur lors de la suppression de la branche '%s'" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Branche de suivi %s supprimée (précédemment %s).\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branche %s supprimée (précédemment %s).\n" # féminin pour une branche -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: disparue]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: en retard de %d]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[en retard de %d]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s : en avance de %d]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[en avance de %d]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s : en avance de %d, en retard de %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[en avance de %d, en retard de %d]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** référence invalide ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(aucune branche, rebasage de %s)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a démarré sur %s)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD détachée sur %s)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD détachée depuis %s)" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(aucune branche)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "La branche %s est en cours de rebasage sur %s" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "La branche %s est en cours de bissection sur %s" + +#: builtin/branch.c:560 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:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'un branche mal nommée '%s'" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, 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:564 +#: builtin/branch.c:601 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:586 -#, c-format -msgid "could not write branch description template: %s" -msgstr "impossible d'écrire le modèle de description de branche : %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "impossible d'écrire le modèle de description de branche" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:617 +#: builtin/branch.c:653 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:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "amont" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "modifier l'information amont" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "afficher seulement les branches qui sont fusionnées" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "afficher seulement les branches qui ne sont pas fusionnées" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "clé" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "nom du champ servant à trier" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: 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/tag.c:369 msgid "object" msgstr "objet" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "afficher seulement les branches de l'objet" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "trop de branches pour une opération de renommage" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "trop de branches pour spécifier une branche amont" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -4004,41 +4286,41 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "trop de branches pour désactiver un amont" -#: builtin/branch.c:784 +#: builtin/branch.c:820 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:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "créer manuellement 'HEAD' n'a pas de sens" -#: builtin/branch.c:810 +#: builtin/branch.c:846 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:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -4047,7 +4329,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:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -4058,16 +4340,6 @@ msgstr "" "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n" "\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -4169,7 +4441,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:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -4261,8 +4533,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:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: 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 msgid "string" msgstr "chaîne" @@ -4312,81 +4585,81 @@ msgstr "chemin '%s' : impossible de fusionner" msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en " "même temps." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "fichier d'index corrompu" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4409,7 +4682,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4438,151 +4711,151 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, 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:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, 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:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: 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 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "détacher la HEAD à la validation nommée" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "style" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 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:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 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:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: 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/send-pack.c:168 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "Nom de branche manquant ; essayez -b" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4592,12 +4865,12 @@ msgstr "" "en même temps.\n" "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, 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:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4749,8 +5022,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:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: 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 msgid "pattern" msgstr "motif" @@ -4790,103 +5063,112 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "créer un dépôt nu" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "créer un dépôt miroir (implique dépôt nu)" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, toujours copier" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "régler comme dépôt partagé" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "nombre de sous-modules clonés en parallèle" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "nom" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201 msgid "depth" msgstr "profondeur" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "tous les sous-modules clonés seront superficiels" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "clé=valeur" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4894,59 +5176,54 @@ msgstr "" "Aucun nom de répertoire n'a pu être deviné\n" "Veuillez spécifier un répertoire dans la ligne de commande" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, 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é." -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, 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." -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "échec du stat de '%s'" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "échec du stat de %s\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4956,130 +5233,130 @@ msgstr "" "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" "et réessayer l'extraction avec 'git checkout -f HEAD'\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "Vérification de la connectivité... " -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "impossible de mettre à jour %s" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD distante réfère à une référence non existante, impossible de " "l'extraire.\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "impossible d'écrire les paramètres dans le fichier de configuration" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "impossible de unlinker le fichier temporaire alternates" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide." -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "impossible de créer le répertoire de la copie de travail '%s'" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "Je ne sais pas cloner %s" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -5222,66 +5499,66 @@ msgstr "" "Puis \"git cherry-pick --continue\" continuera le picorage \n" "des commits restants.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "impossible de créer l'index temporaire" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "échec de l'ajout interactif" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "impossible de mettre à jour l'index temporaire" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "Impossible de mettre à jour l'arbre de cache principal" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "impossible d'écrire le fichier new_index" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "impossible de lire l'index" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "entête d'auteur manquant dans le commit '%s'" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "le commit '%s' a une ligne d'auteur malformée" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5289,38 +5566,38 @@ msgstr "" "impossible de sélectionner un caractère de commentaire\n" "qui n'est pas utilisé dans le message de validation actuel" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "impossible de lire MERGE_MSG" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "impossible de lire MERGE_MSG" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5335,7 +5612,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5350,7 +5627,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5360,7 +5637,7 @@ msgstr "" "commençant par '%c' seront ignorées, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5371,150 +5648,150 @@ msgstr "" "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n" "si vous le souhaitez. Un message vide abandonne la validation.\n" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun " "auteur existant" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens" -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup." -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Une seule option parmi --include/--only/--all/--interactive/--patch peut " "être utilisée." -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 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:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "Malin... correction du dernier avec un index sale." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 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:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 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:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "afficher le statut avec concision" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "afficher le statut en format long (par défaut)" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "mode" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 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:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "afficher les fichiers ignorés" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "quand" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5522,201 +5799,201 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "HEAD détachée" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (commit racine)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "auteur" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "date" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "message" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "message de validation" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "commit" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 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:1586 +#: builtin/commit.c:1602 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:1587 +#: builtin/commit.c:1603 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:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "défaut" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "inclure le statut dans le modèle de message de validation" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "signer la validation avec GPG" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "éviter d'utiliser le crochet pre-commit" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, 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:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abandon de la validation du à un message de validation vide\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5865,7 +6142,7 @@ msgstr "" msgid "unable to parse default color value" msgstr "impossible de lire la valeur de couleur par défaut" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5880,7 +6157,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "création impossible du fichier de configuration '%s'" @@ -5916,7 +6193,7 @@ msgstr "l'étiquette annotée %s n'a pas de nom embarqué" msgid "tag '%s' is really '%s' here" msgstr "l'étiquette '%s' est en fait '%s'" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "%s n'est pas un nom d'objet valide" @@ -6011,7 +6288,7 @@ msgstr "" msgid "only consider tags matching <pattern>" msgstr "ne considérer que les étiquettes correspondant à <motif>" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrégés en dernier recours" @@ -6045,21 +6322,21 @@ msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique" msgid "invalid option: %s" msgstr "option invalide : %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "Ce n'est pas un dépôt git !" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "objet spécifié '%s' invalide." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "plus de deux blobs spécifiés : '%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "objet non géré '%s' spécifié." @@ -6133,19 +6410,19 @@ msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" -msgstr "récupérer depuis tous le dépôts distants" +msgstr "récupérer depuis tous les dépôts distants" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" @@ -6153,7 +6430,7 @@ msgstr "forcer l'écrasement de la branche locale" msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" @@ -6165,21 +6442,21 @@ msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules récupérés en parallèle" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "" "éliminer les branches de suivi distant si la branche n'existe plus dans le " "dépôt distant" -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" @@ -6187,15 +6464,15 @@ msgstr "conserver le paquet téléchargé" msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "répertoire" @@ -6207,15 +6484,15 @@ msgstr "préfixer ceci à la sortie du chemin du sous-module" msgid "default mode for recursion" msgstr "mode par défaut pour la récursion" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" @@ -6273,11 +6550,6 @@ msgstr "mise à jour forcée" msgid "(non-fast-forward)" msgstr "(pas d'avance rapide)" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "impossible d'ouvrir %s : %s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6480,56 +6752,56 @@ msgstr "Vérification de la connectivité" msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<options>] [<objet>...]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "afficher les objets en suspens" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "afficher les étiquettes" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "signaler les nœuds racines" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 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:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "considérer les reflogs comme nœuds tête (par défaut)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "ne vérifier que la connectivité" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "activer une vérification plus strict" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "afficher la progression" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "Vérification des objets" @@ -6637,223 +6909,223 @@ msgstr "impossible de lire l'arbre (%s)" msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend un valeur numérique" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: builtin/grep.c:644 +#: builtin/grep.c:646 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:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:702 +#: builtin/grep.c:704 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:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:716 +#: builtin/grep.c:718 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:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:739 +#: builtin/grep.c:741 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:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "aucun motif fourni." -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/grep.c:873 +#: builtin/grep.c:875 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:899 +#: builtin/grep.c:901 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:904 +#: builtin/grep.c:906 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:907 +#: builtin/grep.c:909 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:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "--cached et des arbres sont fournis en même temps." @@ -6944,8 +7216,8 @@ msgstr "la version d'emacsclient '%d' est trop ancienne (<22)." #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "échec de l'exécution de '%s' : %s" +msgid "failed to exec '%s'" +msgstr "échec de l'exécution de '%s'" #: builtin/help.c:205 #, c-format @@ -7204,108 +7476,110 @@ msgstr "confusion extrême" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "complété avec %d objets locaux" +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:1263 +#: builtin/index-pack.c:1265 #, 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:1267 +#: builtin/index-pack.c:1269 #, 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:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "impossible d'écrire le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "impossible de fermer le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, 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:1587 +#: builtin/index-pack.c:1589 #, 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:1594 +#: builtin/index-pack.c:1596 #, 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:1624 +#: builtin/index-pack.c:1609 +#, 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:1638 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, 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:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" @@ -7344,28 +7618,27 @@ msgstr "impossible de copier '%s' vers '%s'" msgid "ignoring template %s" msgstr "modèle %s ignoré" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "modèles non trouvés %s" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "" -"pas de copie des modèles étant dans une mauvaise version du format %d de '%s'" +msgid "not copying templates from '%s': %s" +msgstr "pas de copie des modèles depuis '%s' : %s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s existe déjà" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "impossible de traiter le fichier de type %d" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "impossible de déplacer %s vers %s" @@ -7373,24 +7646,24 @@ msgstr "impossible de déplacer %s vers %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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "Dépôt Git%2$s %1$s dans %3$s%4$s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "existant réinitialisé" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "vide initialisé" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr " partagé" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7398,25 +7671,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--" "shared[=<permissions>]] [<répertoire>]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "permissions" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "impossible de créer le répertoire (mkdir) %s" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se déplacer vers le répertoire (chdir) %s" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7425,7 +7698,7 @@ msgstr "" "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --" "git-dir=<répertoire>)" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accéder à l'arbre de travail '%s'" @@ -7471,268 +7744,319 @@ msgstr "git show [<options>] <objet>..." msgid "invalid --decorate option: %s" msgstr "option --decorate invalide : %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "afficher la source" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "Utiliser le fichier de correspondance de mail" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "décorer les options" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "" "Traiter seulement l'intervalle de lignes n,m du fichier en commençant le " "compte à 1" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "Impossible de lire l'objet %s" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "Type inconnu : %d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "le nom du répertoire de sortie est trop long" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "Impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "Exactement une plage nécessaire." -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "Ceci n'est pas une plage." -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "La lettre de motivation doit être au format e-mail" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "Deux répertoires de sortie ?" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "Commit inconnu %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 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Impossible de résoudre '%s' comme une référence valide." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "Impossible de trouver la base de fusion exacte." + +#: builtin/log.c:1235 +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 "" +"Impossible de récupérer l'amont, si vous voulez enregistrer le commit de base automatiquement,\n" +"veuillez utiliser git branch --set-upstream-to pour suivre une branche distante\n" +"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> manuellement." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "Impossible de trouver la base de fusion exacte" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "le commit de base devrait être l'ancêtre de la liste de révisions" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "le commit de base ne devrait pas faire partie de la liste de révisions" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "impossible d'obtenir l'id du patch" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "" "utiliser une séquence simple de nombres pour les nom des fichiers de sortie" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "démarrer la numérotation des patchs à <n> au lieu de 1" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "écrire une empreinte à zéro dans l'entête From" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "afficher le format du patch au lieu du défaut (patch + stat)" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "en-tête" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "ajouter l'en-tête d'e-mail" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "e-mail" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "ident" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "limite" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "signature" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "commit-de-base" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "Ajouter un arbre prérequis à la série de patchs" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n et -k sont mutuellement exclusifs." -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix et -k sont mutuellement exclusifs." -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "sortie standard, ou répertoire, lequel ?" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "Impossible de créer le répertoire '%s'" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "Échec de création des fichiers en sortie" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -7740,11 +8064,6 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spécifier " "<branche_amont> manuellement.\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "Commit inconnu %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<options>] [<fichier>...]" @@ -7942,175 +8261,179 @@ msgstr "git merge [<options>] <message> HEAD <commit>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "Les stratégies disponibles sont :" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 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:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 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:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 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:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "éditer le message avant la validation" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "Vérifier que la validation a une signature GPG valide" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:219 +#: builtin/merge.c:220 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:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "permettre la fusion d'historiques sans rapport" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "échec du remisage" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "read-tree a échoué" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (rien à compresser)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressée -- HEAD non mise à jour\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: 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 "Impossible d'écrire dans '%s'" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "Écriture de SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "Finition de SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, 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:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 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:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, 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:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -8127,54 +8450,54 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, 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:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "'%s' n'est pas une validation" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:940 +#: builtin/merge.c:951 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:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 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:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8182,7 +8505,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8190,102 +8513,106 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 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:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 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:1267 +#: builtin/merge.c:1279 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:1269 +#: builtin/merge.c:1281 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:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 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:1332 +#: builtin/merge.c:1344 #, 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:1335 +#: builtin/merge.c:1347 #, 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:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, 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:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "refus de fusionner des historiques sans relation" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, 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:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, 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:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8396,7 +8723,7 @@ msgstr "git mv [<options>] <source>... <destination>" 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/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Veuillez indexer vos modifications de .gitmodules ou les remiser pour " @@ -8476,49 +8803,49 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<options>] <validation>..." -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<options>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<options>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "afficher seulement les noms (pas de SHA-1)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "utiliser seulement les étiquettes pour nommer les validations" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "utiliser seulement les références correspondant à <motif>" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" "afficher toutes les validations accessibles depuis toutes les références" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "lire depuis l'entrée standard" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "autoriser l'affichage des noms `non définis` (par défaut)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" @@ -8666,24 +8993,16 @@ 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:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" -#: 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:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Impossible de résoudre '%s' comme une référence valide." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8696,7 +9015,7 @@ msgstr "Impossible de lire les informations de note d'un objet non-blob '%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:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "trop de paramètres" @@ -8743,7 +9062,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "Écrasement des notes existantes pour l'objet %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "Suppression de la note pour l'objet %s\n" @@ -8784,15 +9103,15 @@ msgstr "" "Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n" "Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "Options générales" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "Options de fusion" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -8800,50 +9119,50 @@ msgstr "" "résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "Validation des notes non fusionnées" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "finaliser la fusion de notes en validant les notes non fusionnées" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "Abandon de la résolution de fusion des notes" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "abandonner la fusion de notes" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "Une fusion de notes dans %s est déjà en cours avec %s" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "L'objet %s n'a pas de note\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "" "la tentative de suppression d'une note non existante n'est pas une erreur" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "références-notes" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "Sous-commande inconnue : %s" @@ -8867,175 +9186,179 @@ msgstr "" msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +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:776 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 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:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 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:2599 +#: builtin/pack-objects.c:2604 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:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 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:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 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:2614 +#: builtin/pack-objects.c:2619 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:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 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:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 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:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 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:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 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:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "heure" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 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:2661 +#: builtin/pack-objects.c:2666 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:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "Décompte des objets" @@ -9063,15 +9386,15 @@ msgstr "Suppression des objets dupliqués" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "afficher les objets éliminés" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "faire expirer les objets plus vieux que <heure>" @@ -9083,51 +9406,55 @@ msgstr "impossible de nettoyer dans un dépôt d'objets précieux" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "Options relatives à la fusion" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "vérifier que le commit nommé a une signature GPG valide" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "remiser avant et réappliquer après le rebasage automatiquement" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "Options relatives au rapatriement" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "nombre de sous-modules tirés en parallèle" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valeur invalide pour pull.ff : %s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" "impossible de tirer avec rebasage. Vous avez des modifications non indexées." -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "De plus, votre index contient des modifications non validées." -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "impossible de tirer avec rebasage : votre index contient des modifications " "non validées." -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9135,14 +9462,14 @@ msgstr "" "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous " "venez de récupérer." -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Il n'y a pas de candidate avec laquelle fusionner parmi les références que " "vous venez de récupérer." -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -9150,7 +9477,7 @@ msgstr "" "Généralement, cela signifie que vous avez indiqué un spécificateur\n" "de référence joker qui n'a pas eu de correspondance sur le serveur distant." -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9162,39 +9489,42 @@ msgstr "" "configuration\n" "pour la branche actuelle, vous devez spécifier la branche avec la commande." -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Vous n'êtes actuellement sur aucune branche." -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Veuillez spécifier une branche avec laquelle fusionner." -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "Référez-vous à git-pull(1) pour de plus amples détails." -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<distant>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<branche>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Pas d'information de suivi distant pour la branche actuelle." -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" -msgstr "" -"Si vous souhaitez indiquer l'information de suivi distant pour cette " -"branche, vous pouvez le faire avec :\n" -"\n" -" git branch --set-upstream-to=%s/<branche> %s\n" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "Si vous souhaitez indiquer l'information de suivi distant pour cette branche, vous pouvez le faire avec :" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9204,13 +9534,17 @@ msgstr "" "'%s'\n" "du serveur distant, mais cette référence n'a pas été récupérée." -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase." + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Mise à jour d'une branche non encore créée avec les changements ajoutés dans " "l'index." -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9221,7 +9555,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9239,11 +9573,11 @@ msgstr "" "$ git reset --hard\n" "pour régénérer." -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tête vide." -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." @@ -9622,6 +9956,18 @@ msgstr "sauter l'application du filtre d'extraction creuse" msgid "debug unpack-trees" msgstr "déboguer unpack-trees" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <répertoire-git>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "quiet" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "Vous devez spécifier un répertoire." + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9953,21 +10299,23 @@ msgstr "* distante %s" msgid " Fetch URL: %s" msgstr " URL de rapatriement : %s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(pas d'URL)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " URL push : %s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " Branche HEAD : %s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -9975,158 +10323,158 @@ msgstr "" " Branche HEAD (la HEAD distante est ambiguë, peut être l'une des " "suivantes) :\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branche distante :%s" msgstr[1] " Branches distantes :%s" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (statut non demandé)" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branche locale configurée pour 'git pull' :" msgstr[1] " Branches locales configurées pour 'git pull' :" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " Les références locales seront reflétées par 'git push'" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Référence locale configurée pour 'git push'%s :" msgstr[1] " Références locales configurées pour 'git push'%s :" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "définir refs/remotes/<nom>/HEAD selon la distante" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "supprimer refs/remotes/<nom>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "Impossible de déterminer la HEAD distante" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Il y a de multiples branches HEAD distantes. Veuillez en choisir une " "explicitement avec :" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "Impossible de supprimer %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "Référence non valide : %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "Impossible de paramétrer %s" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s se retrouvera en suspens !" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s se retrouve en suspens !" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "Élimination de %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL : %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [serait éliminé] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [éliminé] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "éliminer les distants après le rapatriement" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Pas de serveur remote '%s'" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "ajouter une branche" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "pas de serveur distant spécifié" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "interroger les URLs de poussée plutôt que les URLs de récupération" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "retourner toutes les URLs" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "aucune URL configurée pour le dépôt distant '%s'" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "manipuler les URLs push" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "ajouter une URL" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "supprimer des URLs" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete n'a aucun sens" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Motif d'URL ancien invalide : %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "Pas d'URL trouvée : %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "Pas de suppression de toutes les URLs non-push" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" @@ -10642,12 +10990,6 @@ msgstr "autoriser la suppression récursive" 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:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"Veuillez indexer vos modifications de .gitmodules ou remisez-les pour " -"continuer" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10862,86 +11204,180 @@ 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:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "Référence inexistante : %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "Nom de référence complet attendu, %s obtenu" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "impossible de supprimer un composant de l'URL '%s'" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "ancre alternative pour les chemins relatifs" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, 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:366 +#, 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:370 +#, 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:380 +#, 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:387 +#, 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:406 +msgid "Suppress output for initializing a submodule" +msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<chemin>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper <nom> <chemin>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, 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:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "emplacement où le sous-module sera cloné" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "nom du nouveau sous-module" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "URL depuis laquelle cloner le sous-module" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "profondeur de l'historique des clones superficiels" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" -msgstr "" -"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference " -"<dépôt>] [--name <nom>] [--url <url>][--depth <profondeur>] [--] " -"[<chemin>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +msgstr "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference <dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le répertoire '%s'" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, 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:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "impossible d'ouvrir le fichier '%s'" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "impossible de fermer le fichier %s" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, 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:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" -msgstr "" -"fatal : la sous-commande submodule--helper doit être appelée avec une sous-" -"commande" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "Le chemin de sous-module '%s' n'est pas initialisé" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "Vous voudriez sûrement utiliser 'update --init' ?" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "Sous-module non fusionné %s non traité" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "Sous-module '%s' non traité" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "chemin dans la copie de travail" + +#: builtin/submodule--helper.c:771 +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:775 +msgid "rebase, merge, checkout or none" +msgstr "valeurs possibles : rebase, merge, checkout ou none" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:779 +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:782 +msgid "parallel jobs" +msgstr "jobs parallèles" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "ne pas afficher la progression du clonage" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "valeur invalide pour la mise à jour du paramètre" + +#: builtin/submodule--helper.c:855 +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:862 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "fatal : '%s' n'est pas une sous-commande valide de submodule--helper" +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10996,27 +11432,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <nométiquette>..." -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "nom d'étiquette trop long : %.*s..." -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "étiquette '%s' non trouvée." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Étiquette '%s' supprimée (elle était sur %s)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "impossible de vérifier l'étiquette '%s'" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -11029,7 +11460,7 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -11161,21 +11592,21 @@ msgstr "les options --merged et --no-merged ne sont autorisées qu'avec -l" msgid "only one -F or -m option is allowed." msgstr "une seule option -F ou -m est autorisée." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "trop de paramètres" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' n'est pas un nom d'étiquette valide." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "l'étiquette '%s' existe déjà" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" @@ -11438,7 +11869,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:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "afficher les messages bruts de gpg" @@ -11458,7 +11889,7 @@ msgstr "afficher seulement les statistiques" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <étiquette>..." -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "afficher le contenu de l'étiquette" @@ -11474,73 +11905,77 @@ msgstr "git worktree prune [<options>]" msgid "git worktree list [<options>]" msgstr "git worktree prune [<options>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Suppression de worktrees/%s : répertoire invalide" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Suppression de worktrees/%s : fichier gitdir invalide" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Suppression de worktrees/%s : le fichier gitdir point sur un endroit " "inexistant" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "échec de la suppression de %s" +msgid "failed to remove '%s'" +msgstr "échec de la suppression de '%s'" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "'%s' existe déjà" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Préparation de %s (identifiant %s)" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "extraire la <branche> même si elle est déjà extraite dans une autre copie de " "travail" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "remplissage de la nouvelle copie de travail" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" @@ -11560,7 +11995,7 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le débogage" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "afficher les messages de debug sur stderr" @@ -11574,7 +12009,7 @@ 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:321 +#: http.c:322 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" @@ -11706,7 +12141,7 @@ msgstr "être plus silencieux" msgid "use <n> digits to display SHA-1s" msgstr "utiliser <n> chiffres pour afficher les SHA-1s" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "" "met à jour l'index avec les résolutions de conflit réutilisées si possible" @@ -11926,16 +12361,16 @@ msgstr "" "Pour extraire la branche d'origine et stopper le rebasage, lancez \"git " "rebase --abort\"." -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "Autoremisage appliqué." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Impossible de stocker $stash_sha1" -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11945,33 +12380,29 @@ msgstr "" "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:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: git-rebase.sh:213 +#: 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:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "L'option --exec doit être utilisée avec l'option --interactive" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: git-rebase.sh:370 +#: 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:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11979,12 +12410,12 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "Impossible de revenir à $head_name" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -12006,65 +12437,65 @@ msgstr "" "chose\n" "d'important ici." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "invalide $upstream_name en amont" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, 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:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, 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:504 +#: git-rebase.sh:502 #, 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:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal : pas de branche : $branch_name" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Autoremisage créé : $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La branche courante $branch_name est à jour." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, 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:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Changements de $mb sur $onto :" -#: git-rebase.sh:613 +#: git-rebase.sh:611 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:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name mise à jour en avance rapide sur $onto_name." @@ -12208,28 +12639,23 @@ 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:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "impossible de supprimer un composant de l'URL '$remoteurl'" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 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:291 +#: git-submodule.sh:229 #, 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:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' existe déjà dans l'index" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12240,24 +12666,24 @@ msgstr "" "$sm_path\n" "Utilisez -f si vous voulez vraiment l'ajouter." -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, 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:332 +#: git-submodule.sh:270 #, 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:340 +#: git-submodule.sh:278 #, 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:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" @@ -12265,7 +12691,7 @@ msgstr "" "Si vous voulez réutiliser ce répertoire git local au lieu de cloner à " "nouveau depuis" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" @@ -12273,7 +12699,7 @@ msgstr "" "utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt " "correct" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -12282,74 +12708,53 @@ msgstr "" "ou vous ne savez pas ce que cela signifie de choisir un autre nom avec " "l'option '--name'." -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, 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:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Impossible d'extraire le sous-module '$sm_path'" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Échec d'ajout du sous-module '$sm_path'" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Échec d'enregistrement du sous-module '$sm_path'" -#: git-submodule.sh:417 +#: git-submodule.sh:355 #, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "Entrée dans '$prefix$displaypath'" +msgid "Entering '$displaypath'" +msgstr "Entrée dans '$displaypath'" -#: git-submodule.sh:437 +#: git-submodule.sh:375 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." -msgstr "" -"Arrêt sur '$prefix$displaypath' ; le script a retourné un statut non nul." +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:483 +#: git-submodule.sh:448 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "" -"URL non trouvée pour le chemin de sous-module '$displaypath' dans .gitmodules" +msgid "pathspec and --all are incompatible" +msgstr "un spécificateur de chemin et --all sont incompatibles" -#: git-submodule.sh:492 +#: git-submodule.sh:453 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "" -"Échec d'enregistrement de l'URL pour le chemin de sous-module '$displaypath'" - -#: git-submodule.sh:494 -#, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "Sous-module '$name' ($url) enregistré pour le chemin '$displaypath'" - -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" -"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module " -"'$displaypath'" - -#: git-submodule.sh:549 -#, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "" -"Utilisez '.' si vous voulez vraiment réinitialiser tous les sous-modules" +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:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" "La copie de travail du sous-module '$displaypath' contient un répertoire .git" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" @@ -12357,7 +12762,7 @@ msgstr "" "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " "historique)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -12366,146 +12771,181 @@ msgstr "" "La copie de travail du sous-module '$displaypath' contient des modifications " "locales ; utilisez '-f' pour les annuler" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Répertoire '$displaypath' nettoyé" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, 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:580 +#: git-submodule.sh:484 #, 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:589 +#: git-submodule.sh:493 #, 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:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"Chemin de sous-module '$displaypath' non initialisé\n" -"Peut-être souhaitez-vous utiliser 'update --init' ?" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, 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:745 +#: git-submodule.sh:644 #, 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:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, 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:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, 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:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, 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:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" -msgstr "" -"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module " -"'$prefix$sm_path'" +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:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "Chemin de sous-module '$prefix$sm_path' : '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" -#: git-submodule.sh:944 +#: git-submodule.sh:837 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:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode $mod_dst inattendu" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, 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:1019 +#: git-submodule.sh:912 #, 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:1022 +#: git-submodule.sh:915 #, 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:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "blob" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, 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:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." + +#~ msgid "'%s': %s" +#~ msgstr "'%s' : %s" + +#~ 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" + +#~ msgid " git branch --set-upstream-to %s\n" +#~ msgstr " git branch --set-upstream-to %s\n" + +#~ msgid "cannot open %s: %s\n" +#~ msgstr "impossible d'ouvrir %s : %s\n" + +#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed" +#~ msgstr "" +#~ "Veuillez indexer vos modifications de .gitmodules ou remisez-les pour " +#~ "continuer" + +#~ msgid "could not verify the tag '%s'" +#~ msgstr "impossible de vérifier l'étiquette '%s'" + +#~ msgid "failed to remove: %s" +#~ msgstr "échec de la suppression de %s" + +#~ msgid "The --exec option must be used with the --interactive option" +#~ msgstr "L'option --exec doit être utilisée avec l'option --interactive" + +#~ msgid "" +#~ "Submodule path '$displaypath' not initialized\n" +#~ "Maybe you want to use 'update --init'?" +#~ msgstr "" +#~ "Chemin de sous-module '$displaypath' non initialisé\n" +#~ "Peut-être souhaitez-vous utiliser 'update --init' ?" + #~ msgid "Forward-port local commits to the updated upstream head" #~ msgstr "" #~ "Reporter les validations locales sur le sommet mis à jour d'une branche " @@ -12578,9 +13018,6 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" #~ msgid "Could not append '%s'" #~ msgstr "Impossible d'ajouter '%s'" -#~ msgid "Could not set '%s'" -#~ msgstr "Impossible de définir '%s'" - #~ msgid "Missing author: %s" #~ msgstr "Auteur manquant : %s" @@ -12923,12 +13360,5 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" #~ msgstr "les chemins en entrée sont terminés par le caractère nul" #~ msgid "" -#~ "The following untracked files would NOT be saved but need to be removed " -#~ "by stash save:" -#~ msgstr "" -#~ "Les fichiers suivants non suivis ne seront PAS sauvés mais doivent être " -#~ "supprimés par le remisage :" - -#~ msgid "" #~ "Aborting. Consider using either the --force or --include-untracked option." #~ msgstr "Abandon. Utilisez l'option --force ou --include-untracked." diff --git a/po/git.pot b/po/git.pot index 72ef798cde..c9be5dfebe 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-03-16 00:16+0800\n" +"POT-Creation-Date: 2016-05-24 23:42+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" @@ -29,7 +29,7 @@ msgid "" "as appropriate to mark resolution and make a commit." msgstr "" -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" @@ -71,7 +71,7 @@ msgstr "" msgid "archive format" msgstr "" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "" @@ -79,9 +79,9 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 +#: 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 msgid "file" @@ -115,7 +115,8 @@ msgstr "" msgid "list supported archive formats" msgstr "" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "" @@ -251,11 +252,16 @@ msgstr "" msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -266,7 +272,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "" @@ -275,10 +281,10 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: 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 msgid "revision walk setup failed" msgstr "" @@ -317,21 +323,21 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "" @@ -340,8 +346,8 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "" @@ -375,21 +381,21 @@ msgstr "" msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "" @@ -408,9 +414,14 @@ msgstr "" msgid "%s has multiple values" msgstr "" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" +msgid "could not unset '%s'" msgstr "" #: connected.c:69 @@ -418,13 +429,11 @@ msgid "Could not run 'git rev-list'" msgstr "" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" +msgid "failed write to rev-list" msgstr "" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" msgstr "" #: date.c:95 @@ -500,62 +509,62 @@ msgstr[1] "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "" -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "" @@ -569,12 +578,12 @@ msgstr "" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" +msgid "could not create temporary file '%s'" msgstr "" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" +msgid "failed writing detached signature to '%s'" msgstr "" #: grep.c:1718 @@ -582,14 +591,14 @@ msgstr "" msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" +msgid "failed to stat '%s'" msgstr "" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" +msgid "'%s': short read" msgstr "" #: help.c:205 @@ -648,12 +657,29 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "" + #: merge.c:41 msgid "failed to read the cache" msgstr "" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "" @@ -700,7 +726,7 @@ msgstr "" msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "" @@ -827,7 +853,7 @@ msgstr "" msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "" @@ -854,50 +880,50 @@ msgstr "" msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "" @@ -927,28 +953,28 @@ msgstr "" msgid "unable to parse object: %s" msgstr "" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "" -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr "" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "" @@ -957,7 +983,7 @@ msgstr "" msgid "malformed object name '%s'" msgstr "" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "" @@ -1022,7 +1048,7 @@ msgid "" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "" @@ -1044,23 +1070,23 @@ msgid "" "Using version %i" msgstr "" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "" @@ -1199,93 +1225,93 @@ msgstr "" msgid "malformed object name %s" msgstr "" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" -#: remote.c:2084 +#: remote.c:2085 #, 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:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1293,11 +1319,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1308,20 +1334,20 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "" @@ -1365,7 +1391,7 @@ msgid "" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "" @@ -1523,12 +1549,12 @@ msgstr "" msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "" @@ -1540,63 +1566,72 @@ msgstr "" msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" +msgid "cannot open %s" msgstr "" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "" -#: sequencer.c:888 +#: sequencer.c:887 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -1614,29 +1649,38 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1696,7 +1740,175 @@ msgstr "" msgid "Could not read ref %s" msgstr "" -#: unpack-trees.c:203 +#: 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." +msgstr "" + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:69 +#, 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." +msgstr "" + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:74 +#, 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." +msgstr "" + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" + +#: unpack-trees.c:85 +#, 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." +msgstr "" + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "" + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "" @@ -1734,230 +1946,226 @@ msgstr "" msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "" -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "" -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "" -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "" -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" @@ -2096,43 +2304,43 @@ msgstr "" msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "" -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2140,82 +2348,82 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "" -#: wt-status.c:1513 +#: wt-status.c:1535 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1522 +#: wt-status.c:1544 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1525 +#: wt-status.c:1547 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1531 +#: wt-status.c:1553 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "" -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "" -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "" -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -2229,7 +2437,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "" @@ -2242,7 +2450,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "" @@ -2278,14 +2486,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: 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 msgid "dry run" msgstr "" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: 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 "" @@ -2293,7 +2501,7 @@ msgstr "" msgid "interactive picking" msgstr "" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "" @@ -2361,16 +2569,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: 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:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "" @@ -2398,16 +2606,6 @@ msgstr "" msgid "fseek failed" msgstr "" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2417,109 +2615,109 @@ msgstr "" msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "" @@ -2527,231 +2725,233 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" msgstr "" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "" -#: 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:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: 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 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: 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:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 +#: 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/show-ref.c:175 builtin/tag.c:340 #: parse-options.h:132 parse-options.h:134 parse-options.h:244 msgid "n" msgstr "" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2340 +#: builtin/am.c:2339 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "" @@ -2784,37 +2984,37 @@ msgstr "" msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:940 +#: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:944 +#: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:945 +#: builtin/apply.c:943 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:952 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2825,396 +3025,406 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2896 +#: 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] "" msgstr[1] "" -#: builtin/apply.c:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "" + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3280,99 +3490,99 @@ msgstr "" msgid "Blaming lines" msgstr "" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "" @@ -3382,392 +3592,413 @@ 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." +msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "" -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr "" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "" + +#: builtin/branch.c:560 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" msgstr "" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "" -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: 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/tag.c:369 msgid "object" msgstr "" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "" -#: builtin/branch.c:784 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:810 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:813 +#: builtin/branch.c:849 #, 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:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3775,16 +4006,6 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr "" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr "" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -3880,7 +4101,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "" @@ -3970,8 +4191,9 @@ msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: 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 msgid "string" msgstr "" @@ -4021,79 +4243,79 @@ msgstr "" msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4108,7 +4330,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4125,162 +4347,162 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: 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 msgid "branch" msgstr "" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: 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/send-pack.c:168 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, 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:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4410,8 +4632,8 @@ msgstr "" msgid "remove whole directories" msgstr "" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: 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 msgid "pattern" msgstr "" @@ -4447,286 +4669,290 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 -#: builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 +#: builtin/pull.c:201 msgid "depth" msgstr "" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "" -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "" @@ -4829,103 +5055,103 @@ msgid "" "the remaining commits.\n" msgstr "" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" +#: builtin/commit.c:737 builtin/commit.c:745 +msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:734 -msgid "could not read SQUASH_MSG" +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:785 +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -4935,7 +5161,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -4945,14 +5171,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4960,341 +5186,341 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5437,7 +5663,7 @@ msgstr "" msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5447,7 +5673,7 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "" @@ -5483,7 +5709,7 @@ msgstr "" msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "" @@ -5570,7 +5796,7 @@ msgstr "" msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "" @@ -5604,21 +5830,21 @@ msgstr "" msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -5691,19 +5917,19 @@ msgstr "" msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "" @@ -5711,7 +5937,7 @@ msgstr "" msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "" @@ -5723,19 +5949,19 @@ msgstr "" msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "" @@ -5743,15 +5969,15 @@ msgstr "" msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "" @@ -5763,15 +5989,15 @@ msgstr "" msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "" @@ -5829,11 +6055,6 @@ msgstr "" msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6028,55 +6249,55 @@ msgstr "" msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "" @@ -6170,214 +6391,214 @@ msgstr "" msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "" -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "" @@ -6464,7 +6685,7 @@ msgstr "" #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" +msgid "failed to exec '%s'" msgstr "" #: builtin/help.c:205 @@ -6719,107 +6940,109 @@ msgstr "" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "" +msgstr[1] "" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1587 +#: builtin/index-pack.c:1589 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1596 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "" @@ -6858,27 +7081,27 @@ msgstr "" msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" +msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "" @@ -6886,55 +7109,55 @@ msgstr "" #. 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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr "" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -6978,273 +7201,316 @@ msgstr "" msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "" -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "" + +#: 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 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "" + +#: builtin/log.c:1235 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "" + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "" @@ -7432,170 +7698,174 @@ msgstr "" msgid "git merge --abort" msgstr "" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "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:132 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "" -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: 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 "" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7605,157 +7875,161 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "" -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7863,7 +8137,7 @@ msgstr "" msgid "Directory %s is in index and no submodule?" msgstr "" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" @@ -7941,48 +8215,48 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "" -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "" @@ -8123,24 +8397,16 @@ msgstr "" msgid "The note contents have been left in %s" msgstr "" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "" -#: 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:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "" - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8153,7 +8419,7 @@ msgstr "" #: 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:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "" @@ -8198,7 +8464,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "" @@ -8234,63 +8500,63 @@ msgid "" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -8310,165 +8576,169 @@ msgstr "" msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2619 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "" @@ -8496,15 +8766,15 @@ msgstr "" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "" @@ -8516,65 +8786,69 @@ msgstr "" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "" -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -8582,46 +8856,57 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" msgstr "" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "" + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -8629,7 +8914,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -8640,11 +8925,11 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "" @@ -8950,6 +9235,18 @@ msgstr "" msgid "debug unpack-trees" msgstr "" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "" + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9261,176 +9558,178 @@ msgstr "" msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "" @@ -9916,10 +10215,6 @@ msgstr "" msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10112,78 +10407,177 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "" + +#: builtin/submodule--helper.c:862 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" +msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" #: builtin/symbolic-ref.c:7 @@ -10234,27 +10628,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "" -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "" -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "" -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10263,7 +10652,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10390,21 +10779,21 @@ msgstr "" msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" @@ -10652,7 +11041,7 @@ msgstr "" msgid "print commit contents" msgstr "" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "" @@ -10672,7 +11061,7 @@ msgstr "" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "" -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "" @@ -10688,68 +11077,72 @@ msgstr "" msgid "git worktree list [<options>]" msgstr "" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" +msgid "failed to remove '%s'" msgstr "" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" @@ -10769,7 +11162,7 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "" @@ -10780,7 +11173,7 @@ msgid "" "to read about a specific subcommand or concept." msgstr "" -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" @@ -10908,7 +11301,7 @@ msgstr "" msgid "use <n> digits to display SHA-1s" msgstr "" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "" @@ -11101,58 +11494,54 @@ msgid "" "\"." msgstr "" -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "" -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "" -#: git-rebase.sh:169 +#: git-rebase.sh:172 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:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:380 +#: 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:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11165,64 +11554,64 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -11364,26 +11753,21 @@ msgstr "" msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11391,235 +11775,217 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:417 -#, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "" - -#: git-submodule.sh:437 +#: git-submodule.sh:355 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgid "Entering '$displaypath'" msgstr "" -#: git-submodule.sh:483 +#: git-submodule.sh:375 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" +msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" -#: git-submodule.sh:492 +#: git-submodule.sh:448 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" +msgid "pathspec and --all are incompatible" msgstr "" -#: git-submodule.sh:494 +#: git-submodule.sh:453 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" +msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" - -#: git-submodule.sh:549 -#, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "" - -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "" + +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "" @@ -7,14 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2010-09-20 14:44+0000\n" -"PO-Revision-Date: 2010-06-05 19:06 +0000\n" -"Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n" +"POT-Creation-Date: 2016-06-17 18:55+0000\n" +"PO-Revision-Date: 2016-06-17 19:17+0000\n" +"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Git Mailing List <git@vger.kernel.org>\n" "Language: is\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.5\n" #. TRANSLATORS: This is a test. You don't need to translate it. #: t/t0200/test.c:5 @@ -72,22 +73,31 @@ msgstr "TILRAUN: Perl tilraunastrengur" msgid "TEST: A Perl test variable %s" msgstr "TILRAUN: Perl tilraunastrengur með breytunni %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:355 +#: builtin/init-db.c:402 #, c-format -msgid "%s%s Git repository in %s%s\n" -msgstr "%s%s Git lind í %s%s\n" +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "Endurgerði Git lind í %s%s\n" -#: builtin/init-db.c:356 -msgid "Reinitialized existing" -msgstr "Endurgerði" +#: builtin/init-db.c:403 +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "Endurgerði Git lind í %s%s\n" + +#: builtin/init-db.c:407 +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "Bjó til tóma sameiginlega Git lind í %s%s\n" + +#: builtin/init-db.c:408 +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "Bjó til tóma Git lind í %s%s\n" + +#~ msgid "Reinitialized existing" +#~ msgstr "Endurgerði" -#: builtin/init-db.c:356 -msgid "Initialized empty" -msgstr "Bjó til tóma" +#~ msgid "Initialized empty" +#~ msgstr "Bjó til tóma" -#: builtin/init-db.c:357 -msgid " shared" -msgstr " sameiginlega" +#~ msgid " shared" +#~ msgstr " sameiginlega" @@ -57,8 +57,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-03-16 00:16+0800\n" -"PO-Revision-Date: 2016-03-16 10:30+0900\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-06-12 01:20+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-" "ko>\n" @@ -81,7 +81,7 @@ msgstr "" "작업 폴더에서 문제를 바로잡은 다음, 'git add/rm <파일>'을 적절히\n" "사용해 해결 표시하고 커밋하십시오." -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "병합 작업을 다 마치지 않았습니다 (MERGE_HEAD 파일이 있습니다)." @@ -125,7 +125,7 @@ msgstr "형식" msgid "archive format" msgstr "압축 형식" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "접두어" @@ -133,9 +133,9 @@ msgstr "접두어" msgid "prepend prefix to each pathname in the archive" msgstr "아카이브의 각 경로 이름의 앞에 지정한 경로를 붙입니다" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 builtin/blame.c:2548 +#: 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:720 builtin/hash-object.c:100 builtin/ls-files.c:459 +#: 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 msgid "file" @@ -169,7 +169,8 @@ msgstr "더 작게 압축" msgid "list supported archive formats" msgstr "지원하는 압축 형식의 목록을 표시합니다" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "저장소" @@ -323,11 +324,16 @@ msgstr "애매한 오브젝트 이름: '%s'." msgid "Not a valid branch point: '%s'." msgstr "올바른 브랜치 위치가 아닙니다: '%s'." -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s'은(는) 이미 '%s' 위치에 받아져 있습니다" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "작업 폴더 %s의 헤드가 업데이트되지 않았습니다" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -338,7 +344,7 @@ msgstr "'%s' 파일이 버전2 번들 파일로 보이지 않습니다" msgid "unrecognized header: %s%s (%d)" msgstr "인식할 수 없는 헤더: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "'%s'을(를) 열 수 없습니다" @@ -347,10 +353,10 @@ msgstr "'%s'을(를) 열 수 없습니다" msgid "Repository lacks these prerequisite commits:" msgstr "저장소에 필수적인 다음 커밋이 없습니다:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: 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 msgid "revision walk setup failed" msgstr "리비전 walk 준비가 실패했습니다" @@ -387,21 +393,21 @@ msgstr "rev-list 명령이 죽었습니다" msgid "ref '%s' is excluded by the rev-list options" msgstr "rev-list 옵션에서 '%s' 레퍼런스가 제외되었습니다" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "알 수 없는 인자: %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "빈 번들은 만들지 않습니다." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "'%s'을(를) 만들 수 없습니다" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "index-pack 명령이 죽었습니다" @@ -410,8 +416,8 @@ msgstr "index-pack 명령이 죽었습니다" msgid "invalid color value: %.*s" msgstr "잘못된 색 값: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "parse %s을(를) 파싱할 수 없습니다" @@ -445,21 +451,21 @@ msgstr "잘못된 수치 설정 값 '%s' (키 '%s'): %s" msgid "failed to expand user dir in: '%s'" msgstr "다음에 사용자 디렉터리 확장에 실패: '%s'" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "%d번은 올바른 zlib 압축 단계가 아닙니다" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "오브젝트 생성 모드가 올바르지 않습니다: %s" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "명령행 설정을 파싱할 수 없습니다" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "설정 파일을 읽는 중 알 수 없는 오류가 생겼습니다" @@ -478,24 +484,27 @@ msgstr "'%2$s' 파일의 %3$d번 줄 '%1$s' 설정 변수가 잘못되었습니 msgid "%s has multiple values" msgstr "%s은(는) 여러 개 값이 있습니다" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "'%s'을(를) '%s'(으)로 설정할 수 없습니다" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" -msgstr "'%s'을(를) '%s'에 설정할 수 없습니다" +msgid "could not unset '%s'" +msgstr "'%s' 설정을 지울 수 없습니다" #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "'git rev-list'를 실행할 수 없습니다" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "rev-list 쓰기에 실패했습니다: %s" +msgid "failed write to rev-list" +msgstr "rev-list 쓰기에 실패했습니다" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "rev-list의 표준입력을 닫는데 실패했습니다: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "rev-list의 표준입력을 닫는데 실패했습니다" #: date.c:95 msgid "in the future" @@ -561,26 +570,26 @@ msgstr[0] "%lu년 전" msgid "failed to read orderfile '%s'" msgstr "'%s' 순서 파일을 읽는데 실패했습니다" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "부정확한 이름 바꾸기 탐색을 수행하는 중" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " dirstat 자름 퍼센트 값 '%s' 파싱에 실패했습니다\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 알 수 없는 dirstat 파라미터 '%s'\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "'diff.submodule' 설정 변수에 알 수 없는 값: '%s'" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -589,16 +598,16 @@ msgstr "" "'diff.submodule' 설정 변수에 오류:\n" "%s'" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "외부 diff 프로그램이 죽음, %s 위치에서 멈춤" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow 옵션에는 정확히 하나의 경로명세가 필요합니다" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -607,20 +616,20 @@ msgstr "" "--dirstat/-X 옵션 파라미터를 파싱하는데 실패했습니다:\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "--submodule 옵션 파라미터 파싱에 실패했습니다: '%s'" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "커널 이름과 정보를 가져오는데 실패했습니다" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "이 시스템 또는 위치에서는 추적되지 않는 캐시를 사용하지 않습니다." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "gpg를 실행할 수 없습니다." @@ -634,28 +643,28 @@ msgstr "gpg에서 데이터를 서명하는데 실패했습니다." #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "임시 파일 '%s'을(를) 만들 수 없습니다: %s" +msgid "could not create temporary file '%s'" +msgstr "'%s' 임시 파일을 만들 수 없습니다" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "분리된 서명을 '%s'에 쓰는데 실패했습니다: %s" +msgid "failed writing detached signature to '%s'" +msgstr "분리된 서명을 '%s'에 쓰는데 실패했습니다" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': %s을(를) 읽을 수 없습니다" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "'%s': %s" +msgid "failed to stat '%s'" +msgstr "'%s'에 대해 stat()이 실패했습니다" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "'%s': %s에서 읽다가 잘림" +msgid "'%s': short read" +msgstr "'%s': 읽다가 잘림" #: help.c:205 #, c-format @@ -718,12 +727,36 @@ msgstr[0] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"'%s.lock' 파일을 만들 수 없습니다: %s.\n" +"\n" +"이 저장소에서 다른 깃 프로세스가 실행 중인 것으로 보입니다. (예를\n" +"들어 'git commit' 명령으로 편집기가 열려 있다든지.) 모든 프로세스를\n" +"끝냈는지 확인하시고 다시 시도해 보십시오. 그래도 계속 실패하면, 이\n" +"저장소에서 깃 프로세스가 전에 이상 종료했을 수도 있습니다:\n" +"수동으로 해당 파일을 제거하고 계속하십시오." + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "'%s.lock'을 만들 수 없습니다: %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "캐시를 읽는데 실패했습니다" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "새 인덱스 파일을 쓸 수 없습니다" @@ -770,7 +803,7 @@ msgstr "%s '%s' 오브젝트를 읽을 수 없음" msgid "blob expected for %s '%s'" msgstr "%s '%s'에 대해 블롭을 예상" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "'%s'을(를) 여는데 실패" @@ -904,7 +937,7 @@ msgstr "건너뛰기: %s (기존과 같게 병합)" msgid "Auto-merging %s" msgstr "자동 병합: %s" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "하위 모듈" @@ -933,49 +966,49 @@ msgstr "" "충돌! (%s): 이름이 %s인 디렉터리가 %s에 있습니다. %s을(를) %s(으)로 추가합니" "다" -#: merge-recursive.c:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "추가: %s" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "치명적인 병합 실패, 일어날 수 없는 상황." -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "이미 업데이트 상태입니다!" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "%s 및 %s 트리의 병합이 실패했습니다" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "처리되지 않은 경로??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "병합:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "과거의 공통 커밋 %u개 발견:" -#: merge-recursive.c:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "병합 결과에 커밋이 없습니다" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "'%s' 오브젝트를 파싱할 수 없습니다" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "인덱스를 쓸 수 없습니다." @@ -1005,28 +1038,28 @@ msgstr "잘못된 %s 값: '%s'" msgid "unable to parse object: %s" msgstr "오브젝트를 파싱할 수 없습니다: %s" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "..." -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "사용법: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " 또는: %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-NUM" @@ -1035,7 +1068,7 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "잘못된 형식의 오브젝트 이름 '%s'" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "%s을(를) 그룹에서 쓰기 가능하도록 만들 수 없습니다" @@ -1103,7 +1136,7 @@ msgstr "" ":(exclude) 패턴으로 제외할 사항이 없습니다.\n" "':/' 또는 '.' 추가를 잊으신 것 아닙니까?" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "--pretty 형식을 파싱할 수 없습니다" @@ -1129,23 +1162,23 @@ msgstr "" "GIT_INDEX_VERSION이 설정되었지만, 이 값이 잘못되었습니다.\n" "%i 버전을 사용합니다" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "%s 레퍼런스를 삭제할 수 없습니다: %s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "레퍼런스를 삭제할 수 없습니다: %s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "%s 레퍼런스를 제거할 수 없습니다" @@ -1284,103 +1317,103 @@ msgstr "형식: %%(end) 아톰이 없습니다" msgid "malformed object name %s" msgstr "잘못된 형식의 오브젝트 이름 %s" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "%s 및 %s을(를) 모두 %s에 가져올 수 없습니다" -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s은(는) 보통 %s을(를) 추적하고, %s을(를) 추적하지 않습니다" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s은(는) %s 및 %s 모두 추적합니다" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "내부 오류" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD가 브랜치를 가리키지 않습니다" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "그런 브랜치가 없습니다: '%s'" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "'%s' 브랜치에 대해 업스트림을 설정하지 않았습니다" -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "업스트림 '%s' 브랜치가 리모트 추적 브랜치로 저장되지 않았습니다" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "리모트 '%2$s'의 푸시 대상 '%1$s'에 로컬 추적 브랜치가 없습니다" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "'%s' 브랜치에 푸시 리모트가 없습니다" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "'%s'에 대한 푸시 레퍼런스명세에 '%s'이(가) 들어 있지 않습니다" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "푸시의 대상이 없습니다 (push.default가 'nothing'입니다)" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "하나의 대상에 대해 'simple' 푸시를 처리할 수 없습니다" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "현재 브랜치가 '%s' 기반이지만, 업스트림이 없어졌습니다.\n" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (바로잡으려면 \"git branch --unset-upstream\"을 사용하십시오)\n" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "브랜치가 '%s'에 맞게 업데이트된 상태입니다.\n" -#: remote.c:2084 +#: remote.c:2085 #, 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:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (로컬에 있는 커밋을 제출하려면 \"git push\"를 사용하십시오)\n" -#: remote.c:2093 +#: remote.c:2094 #, 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:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (로컬 브랜치를 업데이트하려면 \"git pull\"을 사용하십시오)\n" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1392,21 +1425,21 @@ msgstr[0] "" "현재 브랜치와 '%s'이(가) 갈라졌습니다,\n" "다른 커밋이 각각 %d개와 %d개 있습니다.\n" -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (리모트의 브랜치를 현재 브랜치로 병합하려면 \"git pull\"을 사용하십시오)\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "현재 브랜치가 망가진 것처럼 보입니다" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "현재 '%s' 브랜치에 아직 아무 커밋도 없습니다" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 옵션은 --bisect 옵션과 호환되지 않습니다" @@ -1456,7 +1489,7 @@ msgstr "" "'git add <경로>' 또는 'git rm <경로>'로 표시하십시오.\n" "그리고 결과물을 'git commit'으로 커밋하십시오" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "%s에 쓸 수 없습니다" @@ -1615,12 +1648,12 @@ msgstr "\"git cherry-pick (--continue | --quit | --abort)\" 명령을 해 보십 msgid "Could not create sequencer directory %s" msgstr "%s 시퀀서 디렉터리를 만들 수 없습니다" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "%s 잠그는데 오류." -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "빼오기(cherry-pick) 또는 되돌리기(revert)가 진행 중이지 않습니다" @@ -1632,63 +1665,72 @@ msgstr "HEAD를 구해 올 수 없습니다" msgid "cannot abort from a branch yet to be born" msgstr "새로 만들고 있는 브랜치에서 중지할 수 없습니다" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "%s을(를) 열 수 없습니다: %s" +msgid "cannot open %s" +msgstr "%s을(를) 열 수 없습니다" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "%s을(를) 읽을 수 없습니다: %s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "예상치 못하게 파일이 끝났습니다" -#: sequencer.c:888 +#: sequencer.c:887 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "빼오기 전에 저장한 HEAD 파일이('%s') 손상되었습니다" -#: sequencer.c:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "%s에 포매팅할 수 없습니다." -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s 커밋을 빼올 수 없습니다" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s: 잘못된 리비전" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "최초의 커밋을 되돌릴 수 없습니다" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "빈 헤드로 커밋을 빼올 수 없습니다." -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "%s을(를) 읽는데 실패했습니다" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "깃 저장소 버전 <= %d 버전을 기대하지만, %d 버전이 발견되었습니다" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "알 수 없는 저장소 확장이 있습니다:" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "오프셋이 묶음 파일 앞입니다 (망가진 .idx?)" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "오프셋이 %s의 묶음 인덱스 시작보다 앞입니다 (망가진 인덱스?)" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "오프셋이 %s의 묶음 인덱스 끝보다 뒤입니다 (망가진 인덱스?)" @@ -1715,30 +1757,39 @@ msgstr "" "확인해 보시고 잘못 만들어진 것이면 지우십시오. 이 메시지를 보고 싶지\n" "않으면 \"git config advice.objectNameWarning false\" 명령을 사용하십시오." -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "병합하지 않은 .gitmodules를 바꿀 수 없습니다. 병합 충돌을 먼저 해결하십시오" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "경로가 %s일 때 .gitmodules의 섹션을 찾을 수 없습니다" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr ".gitmodules 항목 %s을(를) 업데이트할 수 없습니다" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "%s에 대한 .gitmodules 항목을 제거할 수 없습니다" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "업데이트한 .gitmodules를 커밋할 사항으로 표시하는데 실패" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "submodule.fetchJobs 값에 음수를 쓸 수 없습니다" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "%s의 값이 올바르지 않습니다" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1798,7 +1849,217 @@ msgstr "임시 파일 이름을 '%s'(으)로 바꿀 수 없습니다" msgid "Could not read ref %s" msgstr "%s 레퍼런스를 읽을 수 없습니다" -#: unpack-trees.c:203 +#: 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." +msgstr "" +"다음 파일의 로컬 변경 사항을 체크아웃 때문에 덮어 쓰게 됩니다:\n" +"%%s브랜치를 전환하기 전에 변경 사항을 커밋하거나 스태시하십시오." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"다음 파일의 로컬 변경 사항을 체크아웃 때문에 덮어 쓰게 됩니다:\n" +"%%s" + +#: unpack-trees.c:69 +#, 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." +msgstr "" +"다음 파일의 로컬 변경 사항을 병합 때문에 덮어 쓰게 됩니다:\n" +"%%s병합하기 전에 변경 사항을 커밋하거나 스태시하십시오." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "다음 파일의 로컬 변경 사항을 병합 때문에 덮어 쓰게 됩니다." + +#: unpack-trees.c:74 +#, 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." +msgstr "" +"다음 파일의 로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다:\n" +"%%s%s 전에 변경 사항을 커밋하거나 스태시하십시오." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"다음 파일의 로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다:\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"다음 디렉터리를 업데이트하면 그 안의 추적하지 않는 파일을 잃어버립니다:\n" +"%s" + +#: unpack-trees.c:85 +#, 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." +msgstr "" +"체크아웃 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n" +"%%s브랜치를 전환하기 전에 이 파일을 옮기거나 제거하십시오." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"체크아웃 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"병합 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n" +"%%s병합하기 전에 이 파일을 옮기거나 제거하십시오." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"병합 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"%s 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n" +"%%s%s 하기 전에 이 파일을 옮기거나 제거하십시오." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"%s 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"체크아웃 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n" +"%%s브랜치를 전환하기 전에 이 파일을 옮기거나 제거하십시오." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"체크아웃 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"병합 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n" +"%%s병합하기 전에 이 파일을 옮기거나 제거하십시오." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"병합 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"%s 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n" +"%%s%s 하기 전에 이 파일을 옮기거나 제거하십시오." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"%s 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "'%s' 항목이 '%s'와(과) 겹칩니다. 묶을 수 없습니다." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"드문 체크아웃을 업데이트할 수 없습니다; 다음 항목이 최신으로 업데이트되지 않았습니다:\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"드문 체크아웃 업데이트 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"드문 체크아웃 업데이트 때문에 추적하지 않는 다음 작업 폴더 파일을 제거합니다:\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "중지함\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "파일을 가져옵니다" @@ -1836,196 +2097,192 @@ msgstr "경로에서 잘못된 '..' 부분" msgid "could not open '%s' for reading and writing" msgstr "읽기와 쓰기용으로 '%s'을(를) 열 수 없습니다" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "'%s'을(를) 읽기용으로 열 수 없습니다" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "'%s'에 접근할 수 없습니다: %s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "'%s'에 접근할 수 없습니다" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "현재 작업 디렉터리를 가져올 수 없습니다" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "%s을(를) 쓰기용으로 열 수 없습니다" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "%s에 쓸 수 없습니다" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "%s을(를) 닫을 수 없습니다" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "병합하지 않은 경로:" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (스테이지 해제하려면 \"git reset %s <파일>...\"을 사용하십시오)" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (스테이지 해제하려면 \"git rm --cached <파일>...\"을 사용하십시오)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (해결했다고 표시하려면 \"git add <파일>...\"을 사용하십시오)" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (해결했다고 표시하려면 알맞게 \"git add/rm <파일>...\"을 사용하십시오)" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (해결했다고 표시하려면 \"git rm <파일>...\"을 사용하십시오)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "커밋할 변경 사항:" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "커밋하도록 정하지 않은 변경 사항:" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (무엇을 커밋할지 바꾸려면 \"git add <파일>...\"을 사용하십시오)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (무엇을 커밋할지 바꾸려면 \"git add/rm <파일>...\"을 사용하십시오)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (작업 폴더의 변경 사항을 버리려면 \"git checkout -- <파일>...\"을 사용하십" "시오)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (하위 모듈의 추적되지 않는 파일이나 수정된 내용을 커밋하거나 버리십시오)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (커밋할 사항에 포함하려면 \"git %s <파일>...\"을 사용하십시오)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "양쪽에서 삭제:" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "이 쪽에서 추가:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "저 쪽에서 삭제:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "저 쪽에서 추가:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "이 쪽에서 삭제:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "양쪽에서 추가:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "양쪽에서 수정:" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "bug: 병합하지 않은 상태 %x 처리되지 않음" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "새 파일:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "복사함:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "삭제함:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "수정함:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "이름 바꿈:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "종류 바뀜:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "알 수 없음:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "병합하지 않음:" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "새 커밋, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "수정한 내용, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "추적하지 않은 내용, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "버그: 처리되지 않은 diff 상태 %c" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "변경되었지만 업데이트하지 않은 하위 모듈:" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "커밋할 하위 모듈의 변경 사항:" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2033,39 +2290,39 @@ msgstr "" "위의 줄을 바꾸지 마십시오.\n" "아래 있는 내용은 모두 제거됩니다." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "병합하지 않은 경로가 있습니다." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (충돌을 바로잡고 \"git commit\"을 실행하십시오)" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "모든 충돌을 바로잡았지만 아직 병합하는 중입니다." -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " (병합을 마무리하려면 \"git commit\"을 사용하십시오)" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "am 세션 중간에 있습니다." -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "현재 패치가 비어 있습니다." -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (충돌을 바로잡은 다음 \"git am --continue\"를 사용하십시오)" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (이 패치를 건너 뛰려면 \"git am --skip\"을 사용하십시오)" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (원본 브랜치를 복구하려면 \"git am --abort\"를 사용하십시오)" @@ -2205,43 +2462,43 @@ msgstr "'이등분하는 중입니다." msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (원래 브랜치로 돌아가려면 \"git bisect reset\"을 사용하십시오)" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "현재 브랜치 " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "대화형 리베이스 진행 중. 갈 위치는 " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "리베이스 진행 중. 갈 위치는 " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEAD가 다음 위치에서 분리: " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEAD가 다음으로부터 분리: " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "현재 어떤 브랜치도 사용하지 않음." -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "최초 커밋" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "추적하지 않는 파일" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "무시한 파일" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2252,20 +2509,20 @@ msgstr "" "'status -uno' 옵션을 쓰면 빨라질 수도 있지만, 새 파일을\n" "직접 찾아서 추가해야 합니다. ('git help status' 참고)" -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "추적하지 않는 파일을 보지 않습니다%s" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr " (추적하지 않는 파일을 보려면 -u 옵션을 사용하십시오)" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "변경 사항 없음" -#: wt-status.c:1513 +#: wt-status.c:1535 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" @@ -2273,12 +2530,12 @@ msgstr "" "\"를\n" "사용하십시오)\n" -#: wt-status.c:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "커밋할 변경 사항을 추가하지 않았습니다\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2288,55 +2545,55 @@ msgstr "" "\"git\n" "add\"를 사용하십시오)\n" -#: wt-status.c:1522 +#: wt-status.c:1544 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "커밋할 사항을 추가하지 않았지만 추적하지 않는 파일이 있습니다\n" -#: wt-status.c:1525 +#: wt-status.c:1547 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "커밋할 사항 없음 (파일을 만들거나 복사하고 \"git add\"를 사용하면 추적합니" "다)\n" -#: wt-status.c:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "커밋할 사항 없음\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "커밋할 사항 없음 (추적하지 않는 파일을 보려면 -u 옵션을 사용하십시오)\n" -#: wt-status.c:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "커밋할 사항 없음, 작업 폴더 깨끗함\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "최초 커밋, 브랜치: " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (브랜치 없음)" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "없음" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "다음 뒤에: " -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "다음 앞에: " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "'%s' 파일 삭제에 실패했습니다" @@ -2350,7 +2607,7 @@ msgstr "git add [<옵션>] [--] <경로명세>..." msgid "unexpected diff status %c" msgstr "예상치 못한 diff 상태 %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "파일 업데이트가 실패했습니다" @@ -2363,7 +2620,7 @@ msgstr "'%s' 제거\n" msgid "Unstaged changes after refreshing the index:" msgstr "인덱스를 새로 고친 다음 커밋 표시하지 않은 변경 사항:" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "인덱스를 읽을 수 없습니다" @@ -2399,14 +2656,14 @@ 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:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: 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 msgid "dry run" msgstr "가짜로 실행" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: 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 "자세히 표시" @@ -2414,7 +2671,7 @@ msgstr "자세히 표시" msgid "interactive picking" msgstr "대화식으로 고릅니다" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "대화식으로 변경된 부분을 선택합니다" @@ -2483,16 +2740,16 @@ 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:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "인덱스 파일이 손상되었습니다" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: 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:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "'%s'에서 읽을 수 없습니다" @@ -2520,16 +2777,6 @@ msgstr "'%s'에서 '%s'(으)로 노트를 복사하는데 실패했습니다" msgid "fseek failed" msgstr "fseek 실패" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "'%s'을(를) 읽기용으로 열 수 없습니다: %s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다: %s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2539,74 +2786,74 @@ msgstr "'%s' 패치를 파싱할 수 없습니다" msgid "Only one StGIT patch series can be applied at once" msgstr "한번에 하나의 StGIT 패치 시리즈만 적용할 수 있습니다" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "시각이 잘못되었습니다" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "Date 줄이 잘못되었습니다" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "시간대 오프셋이 잘못되었습니다" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "패치 형식 검색이 실패했습니다." -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "'%s' 디렉터리 만들기가 실패했습니다" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "패치를 쪼개는데 실패했습니다." -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "인덱스 파일을 쓸 수 없습니다" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "이 문제를 해결했을 때 \"%s --continue\"를 실행하십시오." -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "이 패치를 건너뛰려면, 그 대신 \"%s --skip\"을 실행하십시오." -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "원래 브랜치를 복구하고 패치 적용을 중지하려면 \"%s --abort\"를 실행하십시오." -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "패치가 비어 있습니다. 잘못 쪼개지지 않았나요?" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "잘못된 신원 줄: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "%s 커밋을 파싱할 수 없습니다" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "저장소에 3-방향 병합으로 대신할 때 필요한 블롭이 없습니다." -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "인덱스 정보를 사용해 기본 트리를 다시 만듭니다..." -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2614,38 +2861,38 @@ msgstr "" "패치를 직접 편집하셨습니까?\n" "이 패치는 인덱스에 기록된 블롭에는 적용되지 않습니다." -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "베이스 패치 적용 및 3-방향 병합으로 대신합니다..." -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "변경 사항에서 병합하는데 실패했습니다." -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "git write-tree가 트리를 쓰는데 실패했습니다" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "빈 커밋 내역에 대해 적용합니다" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "커밋 오브젝트를 쓰는데 실패했습니다" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "다시 시작할 수 없습니다: %s이(가) 없습니다." -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "터미널에 표준 입력이 연결되지 않은 상태에서 대화형으로 실행할 수 없습니다." -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "커밋 본문은:" @@ -2653,35 +2900,35 @@ msgstr "커밋 본문은:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "적용? 예[y]/아니오[n]/편집[e]/패치 보기[v]/모두 적용[a]: " -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "변경된 인덱스: 패치를 적용할 수 없습니다 (dirty: %s)" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "적용하는 중: %.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "변경 사항 없음 -- 패치가 이미 적용되었습니다." -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "패치가 %s %.*s 위치에서 실패했습니다" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "실패한 패치의 복사본이 다음 위치에 있습니다: %s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2691,7 +2938,7 @@ msgstr "" "커밋으로 표시할 사항이 남아 있지 않으면, 이미 같은 패치에서 적용된\n" "경우일 수도 있습니다. 그런 경우에는 이 패치를 건너뛰면 됩니다." -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2699,17 +2946,17 @@ msgstr "" "인덱스에 병합하지 않은 경로가 남아 있습니다.\n" "'git add' 사용을 잊지 않으셨습니까?" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "'%s' 오브젝트를 파싱할 수 없습니다." -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "인덱스 지우기에 실패했습니다" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2717,155 +2964,157 @@ msgstr "" "마지막 'am' 실패 이후 HEAD를 옮긴 것 같습니다.\n" "ORIG_HEAD로 되돌리지 않습니다." -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "--patch-format 옵션에 대해 잘못된 값: %s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<옵션>] [(<mbox>|<Maildir>)...]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<옵션>] (--continue | --skip | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "대화형으로 실행합니다" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "아무 동작도 하지 않습니다 (과거부터 있었던 옵션)" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "필요하면 3-방향 병합으로 대신하도록 허용합니다" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "간략히 표시합니다" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "커밋 메시지에 Signed-off-by 줄을 남깁니다" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "UTF-8 인코딩으로 변환합니다 (기본값)" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "git-mailinfo에 -k 옵션을 씁니다" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "git-mailinfo에 -b 옵션을 씁니다" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "git-mailinfo에 -m 옵션을 씁니다" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "mbox 형식에 대해 git-mailsplit에 --keep-cr 옵션을 사용합니다" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "am.keepcr에 무관하게 git-mailsplit에 --keep-cr 옵션을 사용하지 않습니다." -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "절취선 앞의 모든 사항을 무시합니다" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "동작" -#: 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:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: 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 msgid "pass it through git-apply" msgstr "git-apply에 넘깁니다" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "최상위" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: 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:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185 +#: 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/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 #: parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "개수" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "형식" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "패치의 형식" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "패치 실패가 발생했을 때 오류 메시지 대신 사용합니다" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "충돌을 해결한 다음 패치 적용을 계속합니다" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "--continue 옵션과 동일" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "현재 패치 건너뛰기" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "원래 브랜치를 복구하고 패치 적용 작업을 중지합니다." # NOTE: 옵션의 의미는 이게 맞다. 원문에서는 사용자가 # --committer-date-is-author-date라는 옵션을 보고 의미를 알 수 있다고 가정하고 있다. -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "커미터 시각을 작성자 시각으로 넣습니다" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "현재 시각을 작성자 시각으로 사용합니다" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "키-ID" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "GPG 서명 커밋" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(git-rebase를 위한 내부 용도)" -#: builtin/am.c:2340 +#: builtin/am.c:2339 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." @@ -2873,16 +3122,16 @@ msgstr "" "-b/--binary 옵션은 오랜 시간 동안 아무 동작도 하지 않았으므로, 이\n" "옵션은 제거될 예정입니다. 이제 사용하지 마십시오." -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "인덱스 읽기에 실패했습니다" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "이전 리베이스 디렉터리 %s이(가) 아직 있고 mbox를 지정했습니다." -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2891,7 +3140,7 @@ msgstr "" "벗어난 %s 디렉터리가 발견되었습니다.\n" "제거하려면 \"git am --abort\"를 사용하십시오." -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "해소 작업이 진행 중입니다. 다시 시작하지 않습니다." @@ -2924,41 +3173,41 @@ msgstr "regexec()에서 다음 입력에 대해 %d번을 리턴했습니다: %s" msgid "unable to find filename in patch at line %d" msgstr "패치의 %d번 줄에 파일 이름을 찾을 수 없습니다" -#: builtin/apply.c:940 +#: 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:944 +#: 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:945 +#: 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:952 +#: 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:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: 예상치 못한 줄: %.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "%d번 줄에 헤더 없는 패치 부분: %.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2970,76 +3219,76 @@ msgstr[0] "" "경로 이름 부분에서 %d개를 제거라 때 git diff 헤더에 파일 이름 정보가 없습니" "다. (%d번 줄)" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "새 파일이 예전 내용에 의존합니다" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "삭제한 파일에 아직 내용이 들어 있습니다" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "패치가 %d번 줄에서 망가졌습니다" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "새 파일 %s이(가) 예전 내용에 의존합니다" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "삭제한 파일 %s이(가) 아직 내용이 들어 있습니다" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 경고: %s 파일의 내용이 비어 있지만 삭제되지 않았습니다" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "%d번 줄에 바이너리 패치가 손상되었습니다: %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "%d번 줄에 바이너리 패치가 이해할 수 없습니다" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "%d번 줄에 쓰레기 데이터만 있는 패치" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "%s 심볼릭 링크를 읽을 수 없습니다" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "%s을(를) 열거나 읽을 수 없습니다" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "줄 시작이 잘못됨: '%c'" -#: builtin/apply.c:2896 +#: 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줄)" -#: builtin/apply.c:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "컨텍스트가 (%ld/%ld)로 줄어듭니다. (%d번 줄에서 적용)" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3048,319 +3297,329 @@ msgstr "" "다음을 검색하던 중:\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "'%s'에 대한 바이너리 패치 데이터가 없습니다" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "바이너리 패치를 '%s'에 적용할 수 없습니다" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "'%s'에 대한 바이너리 패치가 올바르지 않은 결과를 만듭니다. (기대한 값 %s, 실" "제 %s)" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "패치 실패: %s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "%s을(를) 가져올 수 없습니다" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "%s 읽기가 실패했습니다" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "심볼릭 링크 뒤에 있는 '%s' 읽기" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "%s 경로가 이름이 바뀌었거나 삭제되었습니다" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s: 인덱스에 없습니다" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s: 인덱스와 맞지 않습니다" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "제거하는 패치 다음에 파일 내용이 남았습니다" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s: 잘못된 종류" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s의 종류가 %o이지만 %o이(가) 되어야 합니다" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "잘못된 경로 '%s'" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s: 이미 인덱스에 있습니다" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s: 이미 작업 디렉터리에 있습니다" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s의 새 모드(%1$o)가 예전 모드(%3$o)와 다릅니다" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s의 새 모드(%1$o)가 %4$s의 예전 모드(%3$o)와 다릅니다" -#: builtin/apply.c:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "영향 받는 '%s' 파일이 심볼릭 링크 뒤에 있습니다" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s: 패치를 적용하지 않습니다" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "%s 패치를 확인하는 중입니다..." -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "경로 '%s'에 대해 make_cache_entry 실패" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "인덱스에서 %s을(를) 제거할 수 없습니다" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "하위 모듈 %s에 대해 손상된 패치" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "새로 만든 파일 '%s'에 대해 stat()할 수 없습니다" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "새로 만든 파일 '%s'에 대해 예비 저장소를 만들 수 없습니다" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "%s에 대해 캐시 항목을 추가할 수 없습니다" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "'%s' 파일을 닫는 중입니다" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "'%s' 파일에 쓸 수 없습니다 ('%o' 모드)" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "%s 패치 깔끔하게 적용." -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "내부 오류" -#: builtin/apply.c:4269 +#: 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개 거부) 적용..." -#: builtin/apply.c:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncating .rej 파일 이름을 '%.*s.rej'(으)로 자름" -#: builtin/apply.c:4300 +#: 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:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "패치 부위 #%d 거부됨." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "패치 '%s' 건너뜀." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "인식할 수 없는 입력" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "인덱스 파일을 읽을 수 없습니다" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "주어진 경로에 해당하는 변경 사항을 적용하지 않습니다" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "주어진 경로에 해당하는 변경 사항을 적용합니다" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "전통적인 diff 경로 앞의 <개수>개의 앞 슬래시(/)를 제거합니다" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "패치에서 추가하는 파일을 무시합니다" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "패치를 적용하는 대신, 입력에 대한 diffstat을 출력합니다" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "십진수로 추가 및 삭제한 줄 수를 표시합니다" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "패치를 적용하는 대신, 입력에 대한 요약을 출력합니다" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "패치를 적용하는 대신, 패치를 적용 가능한지 확인합니다" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "현재 인덱스에서 패치가 적용 가능한지 확인합니다" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "작업 폴더를 바꾸지 않고 패치를 적용합니다" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "작업 영역 밖의 파일을 바꾸는 패치를 허용합니다" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "그리고 패치도 적용합니다 (--stat/--summary/--check 옵션과 같이 사용)" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "패치를 적용하지 않으면 3-방향 병합을 시도합니다" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "내장 인덱스 정보를 사용해 임시 인덱스를 만듭니다" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: 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:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "최소한 <n>줄이 컨텍스트와 일치하는지 확인합니다" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "공백 오류가 있는 추가됐거나 수정된 줄을 찾습니다" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "컨텍스트를 찾을 때 공백 변경 사항을 무시합니다" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "패치를 반대 순서로 적용합니다" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "최소한의 컨텍스트 한 줄도 없이 적용합니다" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "거부된 패치 부분을 대응되는 *.rej 파일에 남겨둡니다" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "패치 부분이 겹쳐도 허용합니다" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "파일 끝에 줄바꿈이 빠졌음을 잘못 검색한 경우에 무시합니다" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "패치 부분의 헤더의 줄 수를 신용하지 않습니다" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "모든 파일 이름에 <최상위>를 앞에 붙입니다" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "저장소 밖에서 --3way 옵션 사용" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "저장소 밖에서 --index 옵션 사용" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "저장소 밖에서 --cached 옵션 사용" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "'%s' 패치를 열 수 없습니다" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "공백 오류 %d개를 넘어갑니다" -#: builtin/apply.c:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3425,99 +3684,99 @@ msgstr "<리비전-옵션>은 git-rev-list(1)에 설명되어 있습니다" msgid "Blaming lines" msgstr "블레임 줄" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "블레임 항목을 찾자마자 점진적으로 표시합니다" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "가장자리 커밋에 대해 빈 SHA-1을 표시합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "최상위 커밋을 가장자리 커밋으로 취급하지 않습니다 (기본값: 꺼짐)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "작업 비용 통계를 표시합니다" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "강제로 진행 상황을 표시합니다" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "블레임 항목에 대해 출력 점수를 표시합니다" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "원래 파일 이름 표시 (기본값: 자동)" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "원래 줄 번호 표시 (기본값: 하지 않음)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "컴퓨터 처리용으로 설계된 형식으로 표시합니다" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "줄마다 커밋 정보가 표시되는 사용자용 형식으로 표시합니다" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "git-annotate와 동일한 형식을 사용합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "내부 형식으로 시각을 표시합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "길게 커밋 SHA1을 표시합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "작성자 이름과 시각을 표시하지 않습니다 (기본값: 꺼짐)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "작성자 이름 대신에 전자메일을 표시합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "공백 문자 차이점을 무시합니다" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "더 일치하는 항목을 찾는데 더 시간을 소모합니다" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "git-rev-list를 호출하는 대신 <파일>에서 리비전을 사용합니다" -#: builtin/blame.c:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "<파일>의 내용을 최종 이미지로 사용합니다" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "점수" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "파일 내부와 파일 사이의 복사된 줄을 찾습니다" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "파일 내부와 파일 사이의 옮겨진 줄을 찾습니다" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "n,m줄 (1번 줄부터 시작) 사이의 범위만 처리" @@ -3527,31 +3786,31 @@ msgstr "n,m줄 (1번 줄부터 시작) 사이의 범위만 처리" #. 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "4년 11달 전" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<옵션>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<옵션>] [-l] [-f] <브랜치-이름> [<시작-지점>]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<옵션>] [-r] (-d | -D) <브랜치-이름>..." -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<옵션>] (-m | -M) [<과거-브랜치>] <새-브랜치>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<옵션>] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3560,7 +3819,7 @@ msgstr "" "'%s' 브랜치를 삭제합니다. 이 브랜치는 '%s'에\n" " 병합되었지만, HEAD에는 병합되지 않았습니다." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3569,12 +3828,12 @@ msgstr "" "'%s' 브랜치를 삭제하지 않습니다. 이 브랜치는 '%s'에\n" " 병합되지 않았지만, HEAD에는 병합되었습니다." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "'%s'에 대한 커밋 오브젝트를 찾아볼 수 없습니다" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3583,299 +3842,320 @@ msgstr "" "'%s' 브랜치가 완전히 병합되지 않았습니다.\n" "정말로 삭제하려면 'git branch -D %s' 명령을 실행하십시오." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "config-file 업데이트가 실패했습니다" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "-a 옵션을 -d 옵션과 같이 쓸 수 없습니다" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "HEAD에 대한 커밋 오브젝트를 찾아볼 수 없습니다" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "'%s' 브랜치는 현재 위치한 브랜치이기 때문에 삭제할 수 없습니다." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "'%2$s' 위치에 체크아웃한 '%1$s' 브랜치를 삭제할 수 없습니다" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "리모트 추적 '%s' 브랜치가 없습니다." -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "'%s' 브랜치가 없습니다." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "리모트 추적 '%s' 브랜치를 삭제하는데 오류" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "'%s' 브랜치를 삭제하는데 오류" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "리모트 추적 '%s' 브랜치를 삭제합니다. (과거 %s)\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "%s 브랜치 삭제 (과거 %s).\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: 사라짐]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: %d개 뒤]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[%d개 뒤]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: %d개 앞]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[%d개 앞]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: %d개 앞, %d개 뒤]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[%d개 앞, %d개 뒤]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** 잘못된 레퍼런스 ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(브랜치 없음, %s 리베이스)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(브랜치 없음, 이등분 %s에서 시작)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD %s 위치에서 분리됨)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD %s(으)로부터 분리됨)" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(브랜치 없음)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "%s 브랜치를 %s 위치에 리베이스합니다" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "%s 브랜치를 %s 위치에서 bisect합니다" + +#: builtin/branch.c:560 msgid "cannot rename the current branch while not on any." msgstr "브랜치 위에 없으면서 현재 브랜치 이름을 바꿀 수 없습니다." -#: builtin/branch.c:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "잘못된 브랜치 이름: '%s'" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "브랜치 이름 바꾸기 실패" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "이름이 잘못된 '%s' 브랜치의 이름을 다르게 바꿉니다" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "브랜치 이름을 %s(으)로 바꾸지만, HEAD를 업데이트하지 않습니다!" -#: builtin/branch.c:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "브랜치의 이름을 바꾸지만, config-file 업데이트가 실패했습니다" -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" -msgstr "브랜치 설명 서식을 쓸 수 없습니다: %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "브랜치 설명 서식을 쓸 수 없습니다" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "일반 옵션" # FIXME: give twice? -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "해시와 제목을 표시하고, 업스트림 브랜치에 대한 위치를 표시합니다" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "여러가지 안내 메시지를 표시하지 않습니다" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "추적 모드를 설정합니다 (git-pull(1) 참고)" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "업스트림 정보를 바꿉니다" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "업스트림" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "업스트림 정보를 바꿉니다" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "여러 색으로 출력합니다" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "리모트 추적 브랜치에 대해 동작합니다" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "커밋이 있는 브랜치만 표시합니다" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "특정 git-branch 동작:" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "리모트와 로컬의 브랜치 목록을 모두 표시합니다" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "완전히 병합된 브랜치를 삭제합니다" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "브랜치를 삭제합니다 (병합되지 않았더라도)" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "브랜치와 그 reflog를 옮기거나 이름을 바꿉니다" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "대상이 이미 있더라도 브랜치를 옮기거나 이름을 바꿉니다" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "브랜치 이름 목록을 표시합니다" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "브랜치의 reflog를 만듭니다" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "브랜치의 설명을 편집합니다" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "강제로 만들고, 옮기거나 이름을 바꾸고, 삭제합니다" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "병합되는 브랜치만 표시합니다" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "병합되지 않는 브랜치만 표시합니다" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "목록을 여러 열로 표시합니다" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "키" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "정렬한 기준이 되는 필드 이름" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: 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/tag.c:369 msgid "object" msgstr "오브젝트" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "해당 오브젝트의 브랜치만 표시합니다" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "HEAD를 올바른 레퍼런스로 구해내는데 실패했습니다." -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "레퍼런스/헤드 아래에 HEAD가 없습니다!" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "--column 및 --verbose 옵션은 호환되지 않습니다" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "브랜치 이름이 필요합니다" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "분리된 HEAD에 대한 설명을 부여할 수 없습니다" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "여러 브랜치에 대한 설명을 편집할 수 없습니다" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "아직 '%s' 브랜치에 커밋이 없습니다." -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "이름이 '%s'인 브랜치가 없습니다." -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "이름 바꾸기 작업에 대해 브랜치가 너무 많습니다" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "새 업스트림을 설정하는데 브랜치가 너무 많습니다" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3883,41 +4163,41 @@ msgstr "" "HEAD의 업스트림을 %s(으)로 설정할 수 없습니다. 어떤 브랜치도 가리키지 않습니" "다." -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "그런 브랜치가 ('%s') 없습니다" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "'%s' 브랜치가 없습니다" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "업스트림 설정을 해제하는데 브랜치가 너무 많습니다" -#: builtin/branch.c:784 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "HEAD의 업스트림 설정을 해제할 수 없습니다. 어떤 브랜치도 가리키지 않습니다." -#: builtin/branch.c:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "'%s' 브랜치에 업스트림 정보가 없습니다" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "'HEAD'를 수동으로 만드는 건 앞뒤가 맞지 않습니다" -#: builtin/branch.c:810 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "'git branch'에 대해 -a 및 -r 옵션은 브랜치 이름과 같이 쓰면 앞뒤가 맞지 않습" "니다" -#: builtin/branch.c:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3926,7 +4206,7 @@ msgstr "" "--set-upstream 옵션은 더 이상 사용되지 않고 제거될 예정입니다. --track 또는 " "--set-upstream-to 옵션을 사용해 보십시오\n" -#: builtin/branch.c:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3936,16 +4216,6 @@ msgstr "" "\n" "'%s'을(를) 만들고 '%s'을(를) 추적하게 하려면, 다음을 하십시오:\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -4044,7 +4314,7 @@ msgstr "표준 입력에서 파일 이름을 읽습니다" msgid "terminate input and output records by a NUL character" msgstr "NUL 문자를 기준으로 자료 입력 및 출력을 멈춥니다" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "진행 상황 표시를 하지 않습니다" @@ -4134,8 +4404,9 @@ msgid "write the content to temporary files" msgstr "내용을 임시 파일에 씁니다" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: 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 msgid "string" msgstr "문자열" @@ -4185,79 +4456,79 @@ msgstr "'%s' 경로: 병합할 수 없습니다" msgid "Unable to add merge result for '%s'" msgstr "'%s'에 대한 병합 결과를 추가할 수 없습니다" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 옵션은 업데이트하는 경로에서 쓸 수 없습니다" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 옵션은 %s 옵션과 같이 쓸 수 없습니다" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "경로를 업데이트하고 '%s' 브랜치로 전환하는 일은 동시에 할 수 없습니다." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "손상된 인덱스 파일" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "'%s' 경로를 병합하지 않았습니다" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "현재 인덱스를 먼저 해결해야 합니다" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "'%s'에 대해 reflog할 수 없습니다: %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD의 현재 위치는" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "HEAD를 업데이트할 수 없습니다" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "'%s' 브랜치 리셋\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "이미 '%s'에 있습니다\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "'%s' 브랜치로 전환하고 리셋합니다\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "새로 만든 '%s' 브랜치로 전환합니다\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "'%s' 브랜치로 전환합니다\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " ... 그리고 %d개 더.\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4275,7 +4546,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4296,151 +4567,151 @@ msgstr[0] "" " git branch <새-브랜치-이름> %s\n" "\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "리비전 walk에 내부 오류" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "이전 HEAD 위치는" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "현재 위치가 만들 예정인 브랜치에 있습니다" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "하나의 레퍼런스만 지정해야 하지만 %d개를 지정했습니다." -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "잘못된 레퍼런스: %s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "레퍼런스가 트리가 아닙니다: %s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "브랜치를 전환하는데 경로를 사용할 수 없습니다" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 옵션은 브랜치를 전환할 때 쓸 수 없습니다" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 옵션은 '%s' 옵션과 같이 쓸 수 없습니다" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "브랜치를 커밋이 아닌 '%s'(으)로 전환할 수 없습니다" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: 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 msgid "branch" msgstr "브랜치" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "새 브랜치를 만들고 가져옵니다" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "브랜치를 만들거나 리셋하고 가져옵니다" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "새 브랜치에 대한 reflog를 만듭니다" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "지정한 커밋에서 HEAD를 분리합니다" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "새 브랜치에 대한 업스트림 정보를 설정합니다" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "새-브랜치" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "상위 브랜치가 없는 새 브랜치" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "병합되지 않은 파일에 대해 우리쪽 버전을 가져옵니다" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "병합되지 않은 파일에 대해 상대편 버전을 가져옵니다" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "강제로 체크아웃합니다 (로컬에서 수정한 사항을 버립니다)" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "새 브랜치에 대해 3-방향 병합을 수행합니다" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "무시하는 파일을 업데이트합니다 (기본값)" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "스타일" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "충돌 스타일 (merge 또는 diff3)" # FIXME: 의미 불명 -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "경로명세를 드문 항목에만 제한하지 않습니다" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "'git checkout <없는-브랜치>'에 대해 추측합니다" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "다른 작업폴더에 주어진 레퍼런스가 있는지 확인하지 않습니다" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: 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/send-pack.c:168 msgid "force progress reporting" msgstr "강제로 진행 상황을 표시합니다" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B 및 --orphan 옵션은 서로 호환되지 않습니다" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track 옵션은 브랜치 이름이 필요합니다" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "브랜치 이름이 없습니다. -b 옵션을 사용해 보십시오" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "경로 명세가 잘못되었습니다" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4449,12 +4720,12 @@ msgstr "" "동시에 경로를 업데이트하고 '%s' 브랜치로 전환할 수 없습니다.\n" "커밋을 확인할 수 없는 '%s'을(를) 가져오려고 하셨습니까?" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach 옵션은 경로 인자를 받지 않습니다 '%s'" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4605,8 +4876,8 @@ msgstr "대화형 지우기" msgid "remove whole directories" msgstr "전체 디렉터리 제거" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: 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 msgid "pattern" msgstr "패턴" @@ -4646,103 +4917,112 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<옵션>] [--] <저장소> [<디렉터리>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "체크아웃을 만들지 않습니다" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "간략한 저장소를 만듭니다" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "미러 저장소를 만듭니다 (간략한 저장소로 취급)" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "로컬 저장소에서 복제합니다" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "로컬 하드링크를 사용하지 않고, 항상 복사합니다" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "공유 저장소로 설정합니다" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "복제한 결과물에서 하위 모듈을 초기화합니다" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "병렬적으로 복제하는 하위모듈 개수" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "서식-디렉터리" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "서식을 사용할 디렉터리 위치" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "레퍼런스 저장소" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "복제할 경우에만 --reference를 사용합니다" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "이름" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "업스트림 추적에 'origin' 대신 <이름>을 사용합니다" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "리모트의 HEAD 대신 <브랜치>를 가져옵니다" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "리모트의 git-upload-pack 경로" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201 msgid "depth" msgstr "깊이" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "지정한 깊이의 얕은 복제를 만듭니다" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "하나의 브랜치만 복제합니다 (HEAD 또는 --branch로 지정)" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "모든 복제한 하위 모듈은 얕은 모듈입니다" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "깃 디렉터리를 작업 폴더와 별개의 위치에 놓습니다" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "키=값" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "새 저장소 안에서 설정합니다" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "IPv4 주소만 사용합니다" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "IPv6 주소만 사용합니다" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4750,58 +5030,53 @@ msgstr "" "디렉터리 이름을 알아낼 수 없습니다.\n" "명령행에서 디렉터리를 지정하십시오" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "레퍼런스 '%s' 저장소를 연결된 체크아웃으로 쓰기는 아직 지원하지 않습니다." -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "레퍼런스 '%s' 저장소가 로컬 저장소가 아닙니다." -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "레퍼런스 '%s' 저장소가 얕은 저장소입니다" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "레퍼런스 '%s' 저장소가 붙어 있는 저장소입니다" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "'%s'에 대해 stat()이 실패했습니다" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "'%s'이(가) 있지만 디렉터리가 아닙니다" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "'%s'에 대해 stat()이 실패했습니다\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "'%s' 링크를 만드는데 실패했습니다" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "파일을 '%s'(으)로 복사하는데 실패했습니다" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "완료.\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4811,127 +5086,127 @@ msgstr "" "'git status' 명령으로 무엇을 체크아웃했는지 살펴볼 수 있고\n" "'git checkout -f HEAD'로 체크아웃을 다시 할 수 있습니다\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "복제할 리모트의 %s 브랜치를 찾을 수 없습니다." -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "연결을 확인하는 중입니다..." -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "리모트에서 필요한 오브젝트를 모두 보내지 않았습니다" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "%s을(를) 업데이트할 수 없습니다" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "리모트 HEAD가 없는 레퍼런스를 참고하므로, 체크아웃할 수 없습니다.\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "작업 폴더를 체크아웃할 수 없습니다" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "파라미터를 설정 파일에 쓸 수 없습니다" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "정리용으로 repack할 수 없습니다" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "보조 임시 파일을 삭제할 수 없습니다" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "너무 인자가 많습니다." -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "복제할 저장소를 지정해야 합니다." -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 및 --origin %s 옵션은 호환되지 않습니다." -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 및 --separate-git-dir 옵션은 호환되지 않습니다." -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "'%s' 저장소가 없습니다" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "깊이가(%s) 0보다 큰 수가 아닙니다" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "대상 경로가('%s') 이미 있고 빈 디렉터리가 아닙니다." -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "작업 폴더가('%s') 이미 있습니다." -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "'%s'의 앞 디렉터리를 만들 수 없습니다" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "작업 디렉터리를('%s') 만들 수 없습니다" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "간략한 저장소로('%s') 복제합니다...\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "'%s'에 복제합니다...\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십시오." -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "원본 저장소가 얕은 저장소이므로, --local 옵션을 무시합니다" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local 옵션은 무시됩니다" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "%s의 복제 방법을 알지 못합니다" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "리모트의 %s 브랜치가 업스트림 %s에 없습니다" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "빈 저장소를 복제한 것처럼 보입니다." @@ -5071,66 +5346,66 @@ msgstr "" "그 다음에 \"git cherry-pick --continue\"를 하면 나머지 커밋에\n" "대해 커밋 빼오기를 다시 시작합니다.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "HEAD 트리 오브젝트의 묶음을 푸는데 실패했습니다" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "임시 인덱스를 만들 수 없습니다" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "대화형 추가가 실패했습니다" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "임시 인덱스를 업데이트할 수 없습니다" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "주요 캐시 트리를 업데이트하는데 실패했습니다" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "new_index 파일에 쓸 수 없습니다" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "병합하는 중 부분 커밋을 할 수 없습니다." -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "커밋 빼오기를 하는 중 부분 커밋을 할 수 없습니다." -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "인덱스를 읽을 수 없습니다" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "임시 인덱스 파일을 쓸 수 없습니다" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "'%s' 커밋에 작성자 헤더가 없습니다" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "'%s' 커밋의 작성자 헤더 형식이 잘못되었습니다" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "--author 파라미터 형식이 잘못되었습니다" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "시각 형식이 잘못되었습니다: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5138,38 +5413,38 @@ msgstr "" "현재 커밋 메시지에서 사용되지 않는 주석 문자를\n" "선택할 수 없습니다" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "%s 커밋을 찾아볼 수 없습니다" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "(표준 입력에서 로그 메시지를 읽음)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "표준 입력에서 로그 메시지를 읽을 수 없습니다" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "'%s' 로그 파일을 읽을 수 없습니다" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "MERGE_MSG를 읽을 수 없습니다" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "SQUASH_MSG를 읽을 수 없습니다" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "MERGE_MSG를 읽을 수 없습니다" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "커밋 서식을 쓸 수 없습니다" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5184,7 +5459,7 @@ msgstr "" "\t%s\n" "다시 시도하십시오.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5199,7 +5474,7 @@ msgstr "" "\t%s\n" "다시 시도하십시오.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5208,7 +5483,7 @@ msgstr "" "변경 사항에 대한 커밋 메시지를 입력하십시오. '%c' 문자로 시작하는\n" "줄은 무시되고, 메시지를 입력하지 않으면 커밋이 중지됩니다.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5219,149 +5494,149 @@ msgstr "" "줄은 보존되니, 필요하면 직접 제거하십시오. 메시지를 입력하지\n" "않으면 커밋이 중지됩니다.\n" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s작성자: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%s시각: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s커미터: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "인덱스를 읽을 수 없습니다" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "트리를 만드는데 오류" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 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:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' 옵션이 '이름 <전자메일>' 형식이 아니고 기존 작성자에도 없습니다" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "추적되지 않는 파일 모드가 ('%s') 잘못되었습니다" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "--long 및 -z 옵션은 호환되지 않습니다" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "--reset-author 및 --author 옵션을 모두 사용하면 앞뒤가 맞지 않습니다" -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "바꿀 사항이 없습니다." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "병합 중에 있습니다 -- 커밋을 바꿀 수 없습니다." -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "커밋 빼오기 중에 있습니다 -- 커밋을 바꿀 수 없습니다." -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "--squash 및 --fixup 옵션은 같이 쓸 수 없습니다" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "-c/-C/-F/--fixup 옵션 중에 하나만 사용할 수 있습니다." -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "-m 옵션은 -c/-C/-F/--fixup 옵션과 같이 쓸 수 없습니다." -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 옵션은 -C, -c 또는 --amend 옵션과 같이 써야 합니다." -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "--include/--only/--all/--interactive/--patch 옵션 중 하나만 사용할 수 있습니" "다." -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 msgid "No paths with --include/--only does not make sense." msgstr "경로가 없이 --include/--only 옵션을 쓰면 앞뒤가 맞지 않습니다." -#: builtin/commit.c:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "기발하네요... 마지막을 변경된 인덱스로 바꿉니다." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "-i 또는 -o 없이 명시적인 경로를 지정했습니다. --only 경로를 가정합니다..." -#: builtin/commit.c:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "잘못된 정리 모드 %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "-a 옵션과 경로를 같이 사용하면 앞뒤가 맞지 않습니다." -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "상태를 간략하게 표시합니다" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "브랜치 정보를 표시합니다" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "컴퓨터가 읽을 수 있는 형식" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "긴 형식으로 상태를 표시합니다 (기본값)" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "NUL 문자로 항목을 끝냅니다" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "모드" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "추적되지 않는 파일을 표시합니다. 추가 옵션: all, normal, no (기본값: all)" -#: builtin/commit.c:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "무시되는 파일을 표시합니다" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "언제" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5369,198 +5644,198 @@ msgstr "" "하위 모듈의 변경을 무시합니다. 추가 옵션: all, dirty, untracked. (기본값: " "all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "추적되지 않는 파일의 목록을 여러 열로 표시합니다" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "새로 만든 커밋을 찾아볼 수 없습니다" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "새로 만든 커밋을 파싱할 수 없습니다" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "HEAD 분리됨" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (최상위-커밋)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "성공적인 커밋 후에 요약을 표시하지 않습니다" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "커밋 메시지 서식에 diff를 표시합니다" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "커밋 메시지 옵션" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "파일에서 메시지를 읽습니다" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "작성자" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "커밋의 작성자를 지정합니다" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "시각" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "커밋의 시각을 지정합니다" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "메시지" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "커밋 메시지" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "커밋" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "지정한 커밋의 메시지를 재사용하고 편집합니다" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "지정한 커밋에서 메시지를 재사용합니다" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "지정한 커밋을 수정하는데 autosquash 형식 메시지를 사용합니다" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" msgstr "지정한 커밋을 합치는데 autosquash 형식 메시지를 사용합니다" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "커밋을 내가 작성한 것으로 만듭니다 (-C/-c/--amend와 같이 사용)" -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "Signed-off-by: 줄을 추가합니다" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "지정한 서식 파일을 사용합니다" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "커밋 편집을 강제합니다" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "기본값" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "메시지에서 공백과 #주석을 지웁니다" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "커밋 메시지 서식에 상태를 포함합니다" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG 서명 커밋" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "커밋 내용 옵션" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "변경된 파일을 모두 커밋합니다" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "지정한 파일을 커밋할 인덱스에 추가합니다" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "대화형으로 파일을 추가합니다" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "대화형으로 변경 사항을 추가합니다" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "지정한 파일만 커밋합니다" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "커밋 전 후크를 건너뜁니다" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "무엇을 커밋할지 표시합니다" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "바로 앞 커밋을 바꿉니다" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "다시쓰기 후 후크를 건너뜁니다" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "빈 변경 사항을 기록하도록 허용합니다" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "빈 메시지와 같이 변경 사항을 기록하도록 허용합니다" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "HEAD 커밋을 파싱할 수 없습니다" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "손상된 MERGE_HEAD 파일 (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "MERGE_MODE를 읽을 수 없습니다" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "커밋 메시지를 읽을 수 없습니다: %s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "커밋을 중지합니다. 메시지를 편집하지 않았습니다.\n" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "커밋을 중지합니다. 커밋 메시지가 비어 있습니다.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5706,7 +5981,7 @@ msgstr "설정의 출처를 표시합니다 (파일, 표준 입력, 블롭, 명 msgid "unable to parse default color value" msgstr "기본 색 값을 파싱할 수 없습니다" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5721,7 +5996,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "%s 설정 파일을 만들 수 없습니다" @@ -5757,7 +6032,7 @@ msgstr "주석 달린 %s 태그에 내장된 이름이 없습니다" msgid "tag '%s' is really '%s' here" msgstr "'%s' 태그가 실제 여기 '%s'입니다" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "올바른 오브젝트 이름이 아닙니다 (%s)" @@ -5850,7 +6125,7 @@ msgstr "<n>개의 가장 최근의 태그만 고려합니다 (기본값: 10)" msgid "only consider tags matching <pattern>" msgstr "<패턴>과 일치하는 태그만 고려합니다" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "대안으로 요약한 커밋 오브젝트를 표시합니다" @@ -5884,21 +6159,21 @@ msgstr "'%s': 일반 파일이나 심볼릭 링크가 아닙니다" msgid "invalid option: %s" msgstr "잘못된 옵션: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "깃 저장소가 아닙니다" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "잘못된 '%s' 오브젝트가 주어졌습니다." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "두 개보다 많은 블롭이 주어졌습니다: '%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "처리하지 않은 '%s' 오브젝트가 주어졌습니다." @@ -5971,19 +6246,19 @@ msgstr "git fetch --multiple [<옵션>] [(<저장소> | <그룹>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<옵션>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "모든 리모트에서 가져옵니다" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "덮어쓰지 말고 .git/FETCH_HEAD에 덧붙입니다" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "리모트 쪽에 묶음을 업로드할 경로" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "로컬 브랜치를 강제로 덮어씁니다" @@ -5991,7 +6266,7 @@ msgstr "로컬 브랜치를 강제로 덮어씁니다" msgid "fetch from multiple remotes" msgstr "여러 리모트에서 가져옵니다" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "모든 태그와 관련 오브젝트를 가져옵니다" @@ -6003,19 +6278,19 @@ msgstr "모든 태그를 가져오지 않습니다 (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "병렬적으로 받아오는 하위모듈 개수" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "리모트에 이제 없는 리모트 추적 브랜치를 잘라냅니다" -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "주문형" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "하위 모듈 재귀적으로 가져오기 방식을 설정합니다" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "다운로드한 묶음을 보존합니다" @@ -6023,15 +6298,15 @@ msgstr "다운로드한 묶음을 보존합니다" msgid "allow updating of HEAD ref" msgstr "HEAD 레퍼런스 업데이트를 허용합니다" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "얕은 복제의 커밋 내역을 깊게 만듭니다" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "완전한 저장소로 전환합니다" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "디렉터리" @@ -6043,15 +6318,15 @@ msgstr "하위 모듈 경로 출력의 앞에 이 디렉터리를 붙입니다" msgid "default mode for recursion" msgstr "재귀 기본 모드" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr ".git/shallow를 업데이트하는 레퍼런스를 허용합니다" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "레퍼런스맵" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "레퍼런스맵 가져오기를 지정합니다" @@ -6109,11 +6384,6 @@ msgstr "강제 업데이트" msgid "(non-fast-forward)" msgstr "(정방향 진행이 아님)" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "%s을(를) 열 수 없습니다: %s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6314,55 +6584,55 @@ msgstr "연결을 확인하는 중입니다" msgid "Checking object directories" msgstr "오브젝트 디렉터리를 확인하는 중입니다" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<옵션>] [<오브젝트>...]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "점근할 수 없는 오브젝트를 표시합니다" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "연결이 끊어진 오브젝트를 표시합니다" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "태그를 알립니다" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "최상위 노드를 알립니다" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "인덱스 오브젝트 헤드 노드를 만듭니다" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "reflog 헤드 노드를 만듭니다 (기본값)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "묶음과 보조 오브젝트도 만듭니다" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "연결만 확인합니다" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "더 엄격하게 확인합니다" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr ".git/lost-found 안에 연결이 끊어진 오브젝트를 씁니다" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "진행 상황을 표시합니다" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "오브젝트를 확인합니다" @@ -6464,215 +6734,215 @@ msgstr "트리를 읽을 수 없습니다 (%s)" msgid "unable to grep from object of type %s" msgstr "종류가 %s인 오브젝트에서 grep을 할 수 없습니다" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "`%c' 옵션에는 숫자 값이 와야 합니다" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "'%s'을(를) 열 수 없습니다" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "작업 폴더 대신에 인덱스에서 검색합니다" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "깃으로 관리하지 않은 내용에서 찾습니다" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "추적되는 파일과 추적되지 않는 파일 모두에서 검색합니다" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "'.gitignore'로 지정한 파일을 무시합니다" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "일치하지 않는 줄을 표시합니다" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "대소문자 구별하지 않고 맞춥니다" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "단어 경계 부분에 대해서만 패턴을 맞춥니다" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "바이너리 파일을 텍스트로 처리합니다" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "바이너리 파일에서 패턴을 맞추지 않습니다" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "textconv 필터를 사용해 바이너리 파일을 처리합니다" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "최대 <깊이> 단계만큼 내려갑니다" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "POSIX 확장 정규식을 사용합니다" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "기본 POSIX 정규식을 사용합니다 (기본값)" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "패턴을 고정 문자열로 해석합니다" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "펄과 호환되는 정규식을 사용합니다" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "줄 번호를 표시합니다" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "파일 이름을 표시하지 않습니다" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "파일 이름을 표시합니다" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "파일 이름을 최상위 디렉터리 상대 경로로 표시합니다" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "일치하는 줄을 표시하지 않고 파일 이름만 표시합니다" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "--files-with-matches 옵션과 동일" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "일치하지 않는 파일의 이름만 표시합니다" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "파일 이름 다음에 NUL을 출력합니다" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "일치하는 줄을 표시하지 않고 일치하는 수를 표시합니다" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "일치하는 부분을 강조합니다" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "다른 파일 사이에 일치하는 부분의 사이에 빈 줄을 출력합니다" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "같은 파일에서 여러 개가 일치하면 파일 이름을 한 번만 표시합니다" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "일치하는 부분 앞뒤에 컨텍스트를 <n>줄 표시합니다" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "일치하는 부분 앞에 컨텍스트를 <n>줄 표시합니다" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "일치하는 부분 뒤에 컨텍스트를 <n>줄 표시합니다" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "<n>개의 작업 스레드를 사용합니다" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "-C NUM 옵션의 줄임" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "일치 항목 앞에 함수 이름 줄을 표시합니다" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "들어 있는 함수를 표시합니다" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "파일에서 패턴을 읽습니다" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "<패턴>과 일치" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "-e 옵션으로 지정한 패턴을 결합합니다" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "출력하지 않고 일치하는 항목을 exit() 상태 번호로 리턴합니다" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "모든 패턴과 일치하는 파일의 일치하는 부분만 표시합니다" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "grep 표현식에 대한 파싱 트리를 표시합니다" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "페이저" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "일치하는 파일을 페이저 프로그램에서 표시합니다" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "grep(1) 실행을 허용합니다 (이 빌드에서는 무시)" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "패턴을 지정하지 않았습니다." -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "잘못된 스레드 수를 지정했습니다 (%d)" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 옵션은 작업 폴더에서만 동작합니다" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" "--cached 또는 --untracked 옵션은 --no-index 옵션과 같이 쓸 수 없습니다." -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 또는 --untracked 옵션은 리비전과 같이 쓸 수 없습니다." -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 옵션은 추적되는 내용에 대해 쓸 수 없습니다." -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "--cached 옵션과 트리를 모두 지정했습니다." @@ -6761,8 +7031,8 @@ msgstr "emacsclient '%d' 버전은 너무 과거 (< 22) 버전입니다." #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "실행 실패: '%s': %s" +msgid "failed to exec '%s'" +msgstr "실행 실패: '%s'" #: builtin/help.c:205 #, c-format @@ -7018,104 +7288,105 @@ msgstr "극심한 혼란" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "로컬 오브젝트 %d개 마침" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "로컬 오브젝트 %d개 마침" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "%s에 대해 예상치 못한 테일 체크섬 (디스크 손상?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "묶음에 알아내지 못한 델타 %d개가 있습니다" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "추가한 오브젝트를 deflate할 수 없습니다 (%d)" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "%s 로컬 오브젝트가 손상되었습니다" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "묶음 파일을 닫는데 오류" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "'%s' 보존 파일을 쓸 수 없습니다" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "쓴 '%s' 보존 파일을 닫지 못했습니다" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "묶음 파일을 저장할 수 없습니다" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "인덱스 파일을 저장할 수 없습니다" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "잘못된 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "스레드 기능이 없습니다. %s 무시" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "기존 '%s' 묶음 파일을 열 수 없습니다" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "'%s'에 대한 기존 묶음 idx 파일을 열 수 없습니다" -#: builtin/index-pack.c:1587 +#: builtin/index-pack.c:1589 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "델타 아님: 오브젝트 %d개" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1596 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "체인 길이 = %d: 오브젝트 %lu개" -#: builtin/index-pack.c:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "'%s' 묶음파일 이름이 '.pack'으로 끝나지 않습니다" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "현재 디렉터리로 돌아올 수 없습니다" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "잘못된 %s" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 옵션은 --stdin 옵션과 같이 쓸 수 없습니다" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "'%s' 묶음파일 이름이 '.pack'으로 끝나지 않습니다" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "--verify 옵션에 묶음파일 이름을 지정하지 않았습니다" @@ -7154,27 +7425,27 @@ msgstr "'%s'을(를) '%s'에 복사할 수 없습니다" msgid "ignoring template %s" msgstr "%s 서식을 무시합니다" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "%s에 서식이 없습니다" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "'%2$s'에서 잘못된 형식 버전 %1$d의 서식을 복사하지 않습니다" +msgid "not copying templates from '%s': %s" +msgstr "'%s'에서 서식을 복사하지 않습니다: %s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s 파일이 이미 있습니다" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "파일 종류 %d번을 처리할 수 없습니다" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "%s을(를) %s(으)로 옮길 수 없습니다" @@ -7182,24 +7453,24 @@ 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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s 깃 저장소, 위치 %s%s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "다시 초기화: 기존" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "초기화: 빈" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr " 공유" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7207,25 +7478,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<서식-디렉터리>] [--shared[=<권" "한>]] [<디렉터리>]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "권한" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "깃 저장소를 다른 사용자가 공유할 수 있게 지정" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "%s에 대해 mkdir를 할 수 없습니다" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "%s에 대해 chdir를 할 수 없습니다" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7234,7 +7505,7 @@ msgstr "" "%s (또는 --work-tree=<디렉터리>) 허용되지 않음. %s (또는 --git-" "dir=<directory>) 지정이 없으면" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "작업 폴더 '%s'에 접근할 수 없습니다" @@ -7280,263 +7551,315 @@ msgstr "git show [<옵션>] <오브젝트>..." msgid "invalid --decorate option: %s" msgstr "잘못된 --decorate 옵션: %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "diff를 출력하지 않습니다" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "소스를 표시합니다" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "메일 맵 파일을 사용합니다" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "꾸미기 옵션" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "파일에서 n,m 범위의 줄을 처리합니다 (1부터 시작)" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "최종 출력: %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 잘못된 파일" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "%s 오브젝트를 읽을 수 없습니다" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "알 수 없는 종류: %d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers 설정에 값이 없음" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "출력 디렉터리의 이름이 너무 깁니다" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "%s 패치 파일을 열 수 없습니다" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "정확히 하나의 범위가 필요합니다." -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "범위가 아닙니다." -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "커버레터는 전자메일 형식이어야 합니다" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "정신나간 in-reply-to 헤더: %s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<옵션>] [<시작시각> | <리비전-범위>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "출력 디렉터리가 두개?" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, 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 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "'%s'을(를) 올바른 레퍼런스로 알아내는데 실패했습니다." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "정확한 병합 기준점을 찾을 수 없습니다." + +#: builtin/log.c:1235 +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" +"'git branch --set-upstream-to' 명령으로 원격 브랜치를 추적하십시오.\n" +"아니면 직접 '--base=<기준점-커밋-ID>' 옵션으로 기준점 커밋을 지정할\n" +"수도 있습니다." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "정확한 병합 기준점을 찾는데 실패했습니다" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "기준점 커밋은 리비전 목록의 상위 커밋이어야 합니다" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "기준점 커밋은 리비전 목록에 들어 있으면 안 됩니다" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "패치 ID를 알아낼 수 없습니다" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "하나의 패치에 대해서도 [PATCh n/m]을 붙입니다" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "여러 개 패치에 대해서도 [PATCH]를 붙입니다" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "패치를 표준 출력으로 표시합니다" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "커버레터를 만듭니다" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "출력 파일 이름에 간단한 일련 번호를 사용합니다" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "확장자" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "'.patch' 대신 <확장자>를 사용합니다" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "패치 번호를 1 대신 <n>에서 시작합니다" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "시리즈를 N번째 re-roll로 표시합니다" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "[PATCH] 대신 [<접두어>]를 사용합니다" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "결과 파일을 <디렉터리>에 저장합니다" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "[PATCH]를 자르거나 추가하지 않습니다" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "바이너리 diff를 만들지 않습니다" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "From 헤더에서 모두 0인 해시를 출력합니다" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "업스트림에 있는 패치를 포함하지 않습니다" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "기본값 (패치 + 통계) 대신 패치 형식을 표시합니다" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "메시징" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "헤더" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "전자메일 헤더" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "전자메일" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "To: 헤더를 추가합니다" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "Cc: 헤더를 추가합니다" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "신원" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "<신원>에서 From 주소를 설정합니다 (없으면 커미터 주소 신원 사용)" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "메시지-ID" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "첫 메일을 <메시지-ID>에 대한 답장 메일로 만듭니다" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "경계" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "패치를 첨부합니다" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "패치를 본문에 포함합니다" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "메시지에 스레드를 사용, 스타일: shallow, deep" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "서명" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "서명을 추가합니다" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "베이스-커밋" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "전제조건 트리 정보를 패치 시리즈에 추가합니다" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "파일에서 서명을 추가합니다" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "패치 파일 이름을 표시하지 않습니다" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n 및 -k 옵션은 하나만 써야 합니다." -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix 및 -k 옵션은 하나만 써야 합니다." -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "--name-only 옵션은 앞뒤가 맞지 않습니다" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "--name-status 옵션은 앞뒤가 맞지 않습니다" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "--check 옵션은 앞뒤가 맞지 않습니다" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "표준 출력이나 디렉터리 중에 하나만 지정해야 합니다." -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "'%s' 디렉터리를 만들 수 없습니다" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "'%s' 서명 파일을 읽을 수 없습니다" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "출력 파일을 만드는데 실패했습니다" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<업스트림> [<헤드> [<한계값>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -7544,11 +7867,6 @@ msgstr "" "추적되는 리모트 브랜치를 찾을 수 없습니다. <업스트림>을 수동으로 지정하십시" "오.\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "알 수 없는 커밋 %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<옵션>] [<파일>...]" @@ -7739,171 +8057,175 @@ msgstr "git merge [<옵션>] <메시지> HEAD <커밋>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "`m' 옵션에는 값이 필요합니다" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "'%s' 병합 전략을 찾을 수 없습니다.\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "사용 가능한 전략은:" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "사용 가능한 사용자 설정 전략은:" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "병합이 끝날 때 diffstat을 표시하지 않습니다" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "병합이 끝날 때 diffstat을 표시합니다" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(--stat 옵션과 동일)" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "병합 커밋의 메시지에 shortlog 항목을 (최대 <n>개) 추가합니다" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "병합하는 대신 하나의 커밋을 만듭니다" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "병합이 성공하면 커밋을 합니다 (기본값)" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "커밋 전에 메시지를 편집합니다" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "정방향 진행을 허용합니다 (기본값)" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "정방향 진행이 불가능하면 중지합니다" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "이름 붙인 커밋에 올바른 GPG 서명이 있는지 검증합니다" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "전략" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "사용할 병합 전략" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "옵션=값" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "선택한 병합 전략에 대한 옵션" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "병합 커밋 메시지 (정방향이 아닌 병합에 대해)" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "현재 진행 중인 병합을 중지합니다" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "관계 없는 커밋 내역의 병합을 허용합니다" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "stash를 실행할 수 없습니다." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" -msgstr "stash 실패" +msgstr "스태시 실패" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "올바른 오브젝트가 아닙니다: %s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "read-tree 실패" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (합칠 내용이 없습니다)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "커밋 합치기 -- HEAD를 업데이트하지 않습니다\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: 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:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "SQUASH_MSG를 쓰는 중" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "SQUASH_MSG를 마치는 중" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "병합 메시지가 없습니다 -- HEAD를 업데이트하지 않습니다\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s'이(가) 커밋을 가리키지 않습니다" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "잘못된 branch.%s.mergeoptions 문자열: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "두 개의 헤드 병합 외에는 처리하지 않습니다." -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive에 대해 알 수 없는 옵션: -X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "%s에 쓸 수 없습니다" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "'%s'에서 읽을 수 없습니다" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "병합을 커밋하지 않습니다. 병합을 마치려면 'git commit'을 사용하십시오.\n" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7919,52 +8241,52 @@ msgstr "" "'%c' 문자로 시작하는 줄은 무시되고, 메시지가 비어 있으면 커밋을\n" "중지합니다.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "빈 커밋 메시지." -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "훌륭합니다.\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "자동 병합이 실패했습니다. 충돌을 바로잡고 결과물을 커밋하십시오.\n" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "'%s'은(는) 커밋이 아닙니다" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "현재 브랜치가 없습니다." -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "현재 브랜치에 대한 리모트가 없습니다." -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "현재 브랜치에 대해 기본 업스트림을 지정하지 않았습니다." -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "리모트 %2$s에서 %1$s에 대한 리모트 추적 브랜치가 없습니다" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "'%s'을(를) 닫을 수 없습니다" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "중지할 병합 작업이 없습니다. (MERGE_HEAD가 없음)" -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7972,7 +8294,7 @@ msgstr "" "병합을 마치지 않았습니다. (MERGE_HEAD 있음)\n" "병합하기 전에 변경 사항을 커밋하십시오." -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7980,100 +8302,104 @@ msgstr "" "커밋 빼오기를 마치지 않았습니다. (COMMIT_PICK_HEAD 있음)\n" "병합하기 전에 변경 사항을 커밋하십시오." -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "커밋 빼오기를 마치지 않았습니다. (CHERRY_PICK_HEAD 있음)" -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "--squash 옵션을 --no-ff 옵션과 같이 쓸 수 없습니다." -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "커밋을 지정하지 않았고 merge.defaultToUpstream를 설정하지 않았습니다." -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "빈 헤드로 커밋을 합치기는 지원하지 않습니다" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "정방향이 아닌 커밋은 빈 헤드에서는 앞뒤가 맞지 않습니다" -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "%s - 병합할 수 있는 항목이 아닙니다" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "빈 헤드에는 정확히 하나의 커밋만 병합할 수 있습니다" -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "%s 커밋에 신뢰하지 않는 (서명자가 %s라고 하는) GPG 서명이 있습니다." -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "%s 커밋에 잘못된 (서명자가 %s라고 하는) GPG 서명이 있습니다." -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "%s 커밋에 GPG 서명이 없습니다." -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "%s 커밋에 %s의 올바른 GPG 서명이 없습니다\n" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "관계 없는 커밋 내역의 병합을 거부합니다" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "업데이트 중 %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "아주 간단한 인덱스 내부 병합을 시도합니다...\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "아님.\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "정방향이 불가능하므로, 중지합니다." -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "트리를 본래 위치로 되돌립니다...\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "병합 전략 %s 시도...\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "병합을 처리한 전략이 없습니다.\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "전략 %s(으)로 병합이 실패했습니다.\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "수동 해결의 준비를 위해 %s 전략을 사용합니다.\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "자동 병합이 잘 진행되었습니다. 요청한대로 커밋 전에 중지합니다\n" @@ -8183,9 +8509,9 @@ msgstr "git mv [<옵션>] <원본>... <대상>" msgid "Directory %s is in index and no submodule?" msgstr "%s 디렉터리가 인덱스에 있고 하위 모듈이 없습니다?" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" -msgstr "계속하려면 .gitmodules의 변경 사항을 스테이지에 넣거나 stash 하십시오" +msgstr "계속하려면 .gitmodules의 변경 사항을 스테이지에 넣거나 스태시 하십시오" #: builtin/mv.c:90 #, c-format @@ -8261,48 +8587,48 @@ msgstr "%s, 원본=%s, 대상=%s" msgid "Renaming %s to %s\n" msgstr "이름 바꾸기, '%s'에서 '%s'(으)로\n" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "'%s'의 이름 바꾸기가 실패했습니다" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<옵션>] <커밋>..." -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<옵션>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<옵션>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "이름만 표시 (SHA-1 없이)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "커밋을 지정할 때 태그만 사용합니다" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "<패턴>과 일치하는 레퍼런스만 사용합니다" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "모든 레퍼런스에서 접근 가능한 모든 커밋 목록을 표시합니다" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "표준입력에서 읽습니다" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "`정의되지 않은' 이름 표시를 허용합니다 (기본값)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "입력의 태그 레퍼런스를 따라갑니다 (내부 사용)" @@ -8449,24 +8775,16 @@ msgstr "노트 오브젝트를 쓸 수 없습니다" msgid "The note contents have been left in %s" msgstr "노트 내용은 %s에 남습니다" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "'%s'을(를) 읽을 수 없습니다" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "'%s'을(를) 열거나 읽을 수 없습니다" -#: 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:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "'%s'을(를) 올바른 레퍼런스로 알아내는데 실패했습니다." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8479,7 +8797,7 @@ 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:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "파라미터가 너무 많습니다" @@ -8526,7 +8844,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "%s 오브젝트에 대한 기존 노트를 덮어씁니다\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "%s 오브젝트에 대한 노트를 제거합니다\n" @@ -8566,15 +8884,15 @@ msgstr "" "-m/-F/-c/-C 옵션은 'edit' 하위 명령에 대해 사용을 권하지 않습니다.\n" "대신에 'git notes add -f -m/-F/-c/-C' 명령을 사용하십시오.\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "일반 옵션" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "병합 옵션" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -8582,49 +8900,49 @@ msgstr "" "주어진 전략을 사용해 노트 충돌을 해결합니다 (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "병합하지 않은 노트 커밋" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "병합하지 않은 노트를 커밋해 노트 병합을 마칩니다" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "노트 병합 해결 중지" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "노트 병합을 중지합니다" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "%s 위치로 노트 병합이 이미 %s에서 진행중입니다" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "%s 오브젝트에 노트가 없습니다\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "없는 노트를 제거하려는 시도를 오류가 아닌 것으로 취급합니다" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "표준 입력에서 오브젝트 이름을 읽습니다" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "노트-레퍼런스" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "<노트-레퍼런스>에서 노트를 사용합니다" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "알 수 없는 하위 명령: %s" @@ -8647,166 +8965,170 @@ msgstr "" msgid "deflate error (%d)" msgstr "deflate 오류 (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "배트맵 쓰기를 하지 않습니다. 묶음은 pack.packSizeLimit 값에 따라 쪼개집니다" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "오브젝트 쓰는 중" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "묶음에 들어있지 않은 오브젝트가 있으므로, 비트맵 쓰기를 하지 않습니다" -#: builtin/pack-objects.c:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "오브젝트 압축하는 중" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "지원하지 않는 인덱스 버전 %s" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "잘못된 인덱스 버전 '%s'" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "진행률을 표시하지 않습니다" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "진행률을 표시합니다" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "오브젝트 쓰기 단계에서 진행률을 표시합니다" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "진행률이 표시될 때 --all-progress와 비슷합니다" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "버전[,오프셋]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "지정한 버전의 인덱스 형식에 따라 묶음 인덱스 파일을 씁니다" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "출력 묶음 파일의 최대 크기" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "보조 오브젝트 저장소에서 빌려온 오브젝트를 무시합니다" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "묶음 오브젝트를 무시합니다" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "묶음 윈도우를 오브젝트 단위로 제한합니다" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "묶음 윈도우를 오브젝트 단위에 추가로 메모리 단위로 제한합니다" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2619 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "결과물 묶음에서 허용되는 최대 길이의 델타 체인" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "기존 델타를 재사용합니다" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "기존 오브젝트를 재사용합니다" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA 오브젝트를 사용합니다" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 msgid "use threads when searching for best delta matches" msgstr "최상의 델타 일치를 검색하는데 스레드를 사용합니다" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "빈 묶음 출력을 만들지 않습니다" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "표준 입력에서 리비전 인자를 읽습니다" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 msgid "limit the objects to those that are not yet packed" msgstr "묶지 않는 오브젝트 수를 제한합니다" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "모든 레퍼런스에서 접근 가능한 오브젝트를 포함합니다" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "reflog 항목에서 레퍼런스할 수 있는 오브젝트를 포함합니다" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "인덱스에서< 레퍼런스하는 오브젝트를 포함합니다" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "묶음을 표준 출력으로 출력합니다" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "묶음에 들어갈 오브젝트를 레퍼런스하는 태그 오브젝트를 포함합니다" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "접근 불가능 오브젝트를 보존합니다" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "시각" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "<시각>보다 새로운 접근 불가능 오브젝트의 묶음을 풉니다" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "얇은 묶음을 만듭니다" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "얕은 가져오기에 적합한 묶음을 만듭니다" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "해당하는 .keep 파일이 있는 묶음을 무시합니다" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "묶음 압축 단계" # FIXME: graft? -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "붙어 있는 커밋을 숨기지 않습니다" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 msgid "use a bitmap index if available to speed up counting objects" msgstr "가능하면 비트맵 인덱스를 사용해 오브젝트 세기 속도를 높입니다" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "묶음 인덱스와 같이 비트맵 인덱스를 씁니다" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "오브젝트 개수 세는 중" @@ -8834,15 +9156,15 @@ msgstr "중복된 오브젝트 제거" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <시각>] [--] [<헤드>...]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "제거하지 않고, 보여주기만 합니다" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "잘라낸 오브젝트를 알립니다" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "<시각>보다 오래 된 오브젝트가 만료됩니다" @@ -8854,61 +9176,65 @@ msgstr "precious-objects 저장소에서 잘라낼 수 없습니다" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<옵션>] [<저장소> [<레퍼런스명세>...]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "병합 관련 옵션" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "변경 사항을 적용할 때 병합하는 대신 리베이스합니다" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "정방향 진행을 허용합니다" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "지정한 커밋에 올바른 GPG 서명이 있는지 검증합니다" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "리베이스 전과 후에 stash 및 stash pop을 자동으로 합니다" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "가져오기 관련 옵션" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "병렬적으로 풀을 실행할 하위모듈 개수" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff에 대해 잘못된 값: %s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" "리베이스로 풀을 할 수 없습니다: 스테이징하지 않은 변경 사항이 있습니다." -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "추가로, 인덱스에 커밋하지 않은 변경 사항이 있습니다." -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "리베이스로 풀을 할 수 없습니다: 인덱스에 커밋하지 않은 변경 사항이 있습니다." -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "가져온 레퍼런스 중에 리베이스할 대상 후보가 없습니다." -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "가져온 레퍼런스 중에 병합할 대상 후보가 없습니다." -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -8916,7 +9242,7 @@ msgstr "" "보통 이런 경우는 리모트 쪽에는 없는 와일드카드 레퍼런스명세가\n" "주어졌을 때 일어납니다." -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -8927,38 +9253,42 @@ msgstr "" "이 리모트는 현재 브랜치에 대해 기본으로 설정된 리모트가\n" "아니기 때문에, 명령행에서 브랜치를 지정해야 합니다." -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "현재 어떤 브랜치 위에도 있지 않습니다." -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "어떤 브랜치를 대상으로 리베이스할지 지정하십시오." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "어떤 브랜치를 대상으로 병합할지 지정하십시오." -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "자세한 정보는 git-pull(1) 페이지를 참고하십시오." -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<리모트>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<브랜치>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "현재 브랜치에 추적 정보가 없습니다." -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" -msgstr "" -"이 브랜치에 대한 추적 정보를 설정하려면 다음과 같이 할 수 있습니다:\n" -"\n" -" git branch --set-upstream-to=%s/<브랜치> %s\n" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "이 브랜치에 대한 추적 정보를 설정하려면 다음과 같이 할 수 있습니다:" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -8967,11 +9297,15 @@ msgstr "" "설정에서 리모트의 '%s' 레퍼런스와 병합하도록 지정했지만,\n" "그런 레퍼런스를 가져오지 않았습니다." -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "--[no-]autostash 옵션은 --rebase 옵션과 같이 써야 합니다." + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "만들어지지 않은 브랜치를 인덱스에 추가된 변경 사항으로 업데이트합니다." -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -8982,7 +9316,7 @@ msgstr "" "작업 폴더를 %s 커밋에서 정방향\n" "진행합니다." -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -8999,11 +9333,11 @@ msgstr "" "$ git reset --hard\n" "복구됩니다." -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "여러 브랜치를 빈 헤드로 병합할 수 없습니다." -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "여러 브랜치로 리베이스할 수 없습니다." @@ -9367,6 +9701,18 @@ msgstr "드문 체크아웃 필터 적용을 건너뜁니다" msgid "debug unpack-trees" msgstr "unpack-trees 디버깅" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <git-dir>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "출력 않기" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "디렉터리를 지정해야 합니다." + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9688,174 +10034,176 @@ msgstr "* 리모트 %s" msgid " Fetch URL: %s" msgstr " 가져오기 URL: %s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(URL 없음)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " 푸시 URL: %s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " HEAD 브랜치: %s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 브랜치 (리모트 HEAD는 애매하고, 다음 중 하나일 수 있습니다):\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " 리모트 브랜치:%s" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (상태를 질의하지 않음)" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " 'git pull'에 사용할 로컬 브랜치를 설정:" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " 로컬 레퍼런스를 'git push'로 미러링할 예정" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 로컬 레퍼런스를 'git push'로 미러링%s:" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "레퍼런스/리모트/<이름>/HEAD 값을 리모트에 맞게 설정합니다" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "레퍼런스/리모트/<이름>/HEAD 값을 삭제합니다" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "리모트 HEAD를 결정할 수 없습니다" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "리모트 HEAD 브랜치가 여러개입니다. 다음 중 하나를 명시적으로 지정하십시오:" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "%s을(를) 삭제할 수 없습니다" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "올바른 레퍼런스가 아닙니다: %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "%s을(를) 설정할 수 없습니다" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s의 연결이 끊어집니다!" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s의 연결이 끊어졌습니다!" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "잘라냄: %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [잘라낼 예정] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [잘라냄] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "가져온 후에 리모트를 잘라냅니다" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "그런 리모트가 없습니다 ('%s')" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "브랜치를 추가합니다" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "리모트를 지정하지 않았습니다" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "가져오기 URL이 아니라 푸시 URL을 질의합니다" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "모든 URL을 리턴합니다" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "'%s' 리모트에 대한 URL을 설정하지 않았습니다" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "푸시 URL을 지정합니다" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "URL을 추가합니다" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "URL을 삭제합니다" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete 옵션을 둘다 쓰면 안 됩니다" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "잘못된 오래전 URL 패턴: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "그런 URL이 없습니다: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "푸시용이 아닌 모든 URL을 삭제하지 않습니다" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "자세히 표시합니다 (하위 명령 앞에 와야 합니다)" @@ -10359,10 +10707,6 @@ msgstr "재귀적 제거를 허용합니다" msgid "exit with a zero status even if nothing matched" msgstr "아무 것도 일치하지 않으면 상태 0번으로 끝납니다" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "계속하려면 .gitmodules의 변경 사항을 스테이징하거나 stash하십시오" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10565,82 +10909,178 @@ msgstr "주석 문자로 시작하는 모든 줄을 건너뛰고 제거합니다 msgid "prepend comment character and space to each line" msgstr "각 줄의 앞에 주석 문자와 공백을 붙입니다" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "그런 레퍼런스가 없습니다: %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "전체 레퍼런스 이름이 필요하지만, 입력은 %s" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "'%s' URL 하나의 단계를 잘라낼 수 없습니다" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "상대 경로에 사용할 또다른 기준" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<경로>] [<경로>...]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr ".gitmodules에서 하위 모듈 경로 '%s'에 대한 URL이 없습니다" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "하위 모듈 경로 '%s'에 대한 URL을 등록하는데 실패했습니다" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "'%3$s' 경로에 대해 '%1$s' (%2$s) 하위 모듈 등록\n" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "경고: '%s' 하위 모듈에 대해 커맨드 업데이트 모드가 제안되었습니다\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "'%s' 하위 모듈에 대해 업데이트 모드 등록이 실패했습니다" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "하위 모듈 초기화에 출력을 하지 않습니다" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<경로>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <경로>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "경로 '%s'에 대해 .gitmodules에 있는 하위모듈 매핑이 없습니다" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "새 하위 모듈을 복제할 대상 위치" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "새 하위 모듈 이름" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "하위 모듈을 복제해 올 URL" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "얕은 복제에 사용할 깊이" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" -msgstr "" -"git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소" -">] [--name <이름>] [--url <URL>][--depth <깊이>] [--] [<경로>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +msgstr "git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소>] [--name <이름>] [--depth <깊이>] --url <url> --path <경로>" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "'%s' 디렉터리를 만들 수 없습니다" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "'%s'에서 하위 모듈 경로 '%s'에 복제하는데 실패했습니다" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "'%s' 파일을 열 수 없습니다" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "%s 파일을 닫을 수 없습니다" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "'%s'에 대한 하위 모듈 디렉터리를 가져올 수 없습니다" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" -msgstr "" -"치명적 이상: submodule--helper 하위 명령은 하위 명령으로 호출해야 합니다" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "'%s' 하위 모듈 경로가 초기화되지 않았습니다" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "'update --init'을 하려고 한 것 아니었습니까?" + +#: builtin/submodule--helper.c:639 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "치명적 이상: '%s'은(는) 올바른 submodule--helper 하위 명령이 아닙니다" +msgid "Skipping unmerged submodule %s" +msgstr "병합하지 하위 모듈 %s 건너뜀" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "하위 모듈 '%s' 건너뜀" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "작업 폴더로 가는 경로" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "작업 폴더로 가는 경로, 내장된 하위 모듈의 경계 통과" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "rebase, merge, checkout 또는 none" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "지정한 개수의 리비전에서 잘린 얕은 복제를 만듭니다" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "병렬 작업 개수" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "복제 과정을 표시하지 않습니다" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<경로>] [<경로>...]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "파라미터 업데이트에 값이 잘못되었습니다" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "submodule--helper 하위 명령은 하위 명령으로 호출해야 합니다" + +#: builtin/submodule--helper.c:862 +#, c-format +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "'%s'은(는) 올바른 submodule--helper 하위 명령이 아닙니다" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10694,27 +11134,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <태그이름>..." -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "태그 이름이 너무 깁니다: %.*s..." -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "'%s' 태그가 없습니다." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "'%s' 태그 삭제함 (과거 %s)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "'%s' 태그를 검증할 수 없습니다" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10727,7 +11162,7 @@ msgstr "" " %s\n" "'%c' 문자로 시작하는 줄은 무시됩니다.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10858,21 +11293,21 @@ msgstr "--merged 및 --no-merged 옵션은 -l 옵션과 같이 써야 합니다. msgid "only one -F or -m option is allowed." msgstr "하나의 -F 또는 -m 옵션만 쓸 수 있습니다." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "파라미터가 너무 많습니다" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s'은9는) 올바른 태그 이름이 아닙니다." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "태그 '%s'이(가) 이미 있습니다" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "태그 '%s' 업데이트 (과거 %s)\n" @@ -11121,7 +11556,7 @@ msgstr "git verify-commit [-v | --verbose] <커밋>..." msgid "print commit contents" msgstr "커밋 내용을 표시합니다" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "원본 GPG 상태를 출력합니다" @@ -11141,7 +11576,7 @@ msgstr "통계만 표시" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <태그>..." -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "태그 내용 표시" @@ -11157,68 +11592,72 @@ msgstr "git worktree prune [<옵션>]" msgid "git worktree list [<options>]" msgstr "git worktree list [<옵션>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "worktrees/%s 제거: 올바른 디렉터리가 아닙나다" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "worktrees/%s 제거: gitdir 파일이 없습니다" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "worktrees/%s 제거: gitdir 파일을 읽을 수 없습니다 (%s)" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "worktrees/%s 제거: gitdir 파일이 올바르지 않습니다" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "worktrees/%s 제거: gitdir 파일이 없는 위치를 가리킵니다" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "제거에 실패했습니다: %s" +msgid "failed to remove '%s'" +msgstr "'%s' 제거에 실패했습니다" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "'%s'이(가) 이미 있습니다" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "'%s'의 디렉터리를 만들 수 없습니다" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "%s 준비 중 (ID %s)" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "다른 작업 폴더에서 체크아웃했더라도 <브랜치>를 체크아웃합니다" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "새 브랜치를 만듭니다" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "브랜치를 만들거나 리셋합니다" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "HEAD를 해당 커밋에서 분리합니다" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "새 작업 폴더를 만듭니다" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, --detach 옵션 중 하나만 쓸 수 있습니다" @@ -11238,7 +11677,7 @@ msgstr "하위 디렉터리 <접두어>에 대해 트리 오브젝트를 씁니 msgid "only useful for debugging" msgstr "디버깅 용도로만 사용" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "디버깅 메시지를 표준오류로 출력합니다" @@ -11252,7 +11691,7 @@ msgstr "" "목록을 볼 수 있습니다. 특정 하위 명령어나 개념에 대해 읽어 보려면 'git help\n" "<명령>' 또는 'git help <개념>' 명령을 실행하십시오." -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "공개 키 고정은 cURL 7.44.0 앞 버전에서는 지원하지 않습니다" @@ -11298,7 +11737,7 @@ msgstr "저장소를 복제해 새 디렉터리로 가져 옵니다" #: common-cmds.h:22 msgid "Record changes to the repository" -msgstr "바뀐 사항을 저장소에 기록합니다." +msgstr "바뀐 사항을 저장소에 기록합니다" #: common-cmds.h:23 msgid "Show changes between commits, commit and working tree, etc" @@ -11380,7 +11819,7 @@ msgstr "더 간략히 표시합니다" msgid "use <n> digits to display SHA-1s" msgstr "SHA-1 표시에 <n>개의 숫자를 사용합니다" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "가능하면 인덱스를 재사용한 충돌 해결로 업데이트합니다" @@ -11592,16 +12031,16 @@ msgstr "" "원래 브랜치를 체크아웃하고 리베이스를 중지하려면, \"git rebase --abort\"를 실" "행하십시오." -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "자동스태시 적용." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "\"$stash_sha1\"을(를) 저장할 수 없습니다" -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11611,31 +12050,27 @@ msgstr "" "변경 사항은 스태시 안에 안전하게 들어 있습니다.\n" "언제든지 \"git stash pop\" 또는 \"git stash drop\"을 실행할 수 있습니다.\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "리베이스 전 후크에서 리베이스를 거부했습니다." -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "git-am이 진행 중인 것처럼 보입니다. 리베이스할 수 없습니다." -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "--exec 옵션은 --interactive 옵션과 같이 사용해야 합니다" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "리베이스가 진행 중이지 않습니다" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "--edit-todo 동작은 대화형 리베이스에서만 사용할 수 있습니다." -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "HEAD를 읽을 수 없습니다" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11643,12 +12078,12 @@ msgstr "" "모든 병합 충돌을 편집하고 git add\n" "명령으로 해결되었다고 표시해야 합니다" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "'$head_name' 위치로 돌아갈 수 없습니다" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11669,64 +12104,64 @@ msgstr "" "이 명령을 다시 실행하십시오. 중요한 사항이 남아 있을 경우를\n" "대비해 여기서 멈춥니다." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "잘못된 업스트림 $upstream_name" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 여러 개의 병합 베이스가 있습니다" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 병합 베이스가 없습니다" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "올바른 커밋을 가리키지 않습니다: $onto_name" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "치명적 이상: 그런 브랜치가 없습니다: $branch_name" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "자동 스태시를 할 수 없습니다" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "자동 스태시를 만들었습니다: $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "커밋하거나 스태시에 넣으십시오." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "현재 브랜치가 ($branch_name) 최신 상태입니다." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "현재 브랜치가 ($branch_name) 최신 상태입니다. 강제 리베이스합니다." -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "변경 사항 '$mb'에서 '$onto'(으)로:" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "작업 사항을 다시 넣기 위해 먼저 헤드를 뒤로 돌립니다..." -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name 브랜치를 $onto_name 위치로 정방향 진행합니다." @@ -11870,26 +12305,21 @@ msgstr "브랜치 이름을 지정하지 않았습니다" msgid "(To restore them type \"git stash apply\")" msgstr "(복구하려면 \"git stash apply\"를 실행하십시오)" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "'$remoteurl' URL에서 하나의 항목을 잘라낼 수 없습니다" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "상대 경로는 작업 폴더의 최상위에서만 쓸 수 있습니다" -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "저장소 URL: '$repo' 값은 절대 경로거나 ./ 또는 ../로 시작해야 합니다." -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path'은(는) 이미 인덱스에 있습니다" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11900,111 +12330,93 @@ msgstr "" "$sm_path\n" "정말로 추가하려면 -f 옵션을 사용하십시오." -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "'$sm_path'의 기존 저장소를 인덱스에 추가합니다" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path'이(가) 이미 있고 올바른 git 저장소가 아닙니다" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "'$sm_name'에 대한 깃 디렉터리가 로컬에서 리모트가 있는 채로 있습니다:" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "다시 복제하지 않고 이 로컬 깃 디렉터리를 재활용하려면" -#: git-submodule.sh:344 +#: 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:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "무슨 의미인지 잘 모르겠다면 '--name' 옵션으로 다른 이름을 쓰십시오." -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "로컬 깃 디렉터리를 '$sm_name' 하위모듈로 다시 활성화합니다." -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "'$sm_path' 하위 모듈을 체크아웃할 수 없습니다" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "'$sm_path' 하위 모듈을 추가하는데 실패했습니다" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "'$sm_path' 하위 모듈을 등록하는데 실패했습니다" -#: git-submodule.sh:417 +#: git-submodule.sh:355 #, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "'$prefix$displaypath' 입력" +msgid "Entering '$displaypath'" +msgstr "'$displaypath' 들어감" -#: git-submodule.sh:437 +#: git-submodule.sh:375 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." -msgstr "" -"'$prefix$displaypath' 위치에서 멈춤. 스크립트에서 0이 아닌 상태를 리턴했습니" -"다." +msgid "Stopping at '$displaypath'; script returned non-zero status." +msgstr "'$displaypath'에서 멈춤. 스크립트가 0이 아닌 상태를 리턴함." -#: git-submodule.sh:483 +#: git-submodule.sh:448 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr ".gitmodules에서 하위 모듈 경로 '$displaypath'에 대한 URL이 없습니다" - -#: git-submodule.sh:492 -#, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "하위 모듈 경로 '$displaypath'에 대한 URL을 등록하는데 실패했습니다" - -#: git-submodule.sh:494 -#, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "'$displaypath' 경로에 ($url) 대해 등록된 '$name' 하위 모듈" - -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" -"하위 모듈 경로 '$displaypath'에 대해 업데이트 모드를 등록하는데 실패했습니다" +msgid "pathspec and --all are incompatible" +msgstr "경로명세 및 --all 옵션은 호환되지 않습니다" -#: git-submodule.sh:549 +#: git-submodule.sh:453 #, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "정말로 모든 하위 모듈 초기화를 해제하려면 '.'을 사용하십시오" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "정말로 모든 하위 모듈 초기화를 해제하려면 '--all'을 사용하십시오" -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "하위 모듈 작업 폴더에 ('$displaypath') .git 디렉터리가 들어 있습니다" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "(정말로 그 커밋 내역까지 포함해 제거하려면 'rm -rf'를 사용하십시오)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -12013,133 +12425,127 @@ msgstr "" "하위 모듈 작업 폴더에 ('$displaypath') 로컬 수정 사항이 있습니다. 버리려면 '-" "f'를 사용하십시오" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "'$displaypath' 디렉터리를 지웁니다" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "하위 모듈 디렉터리를 ('$displaypath') 제거할 수 없습니다" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "빈 하위 모듈 디렉터리를 ('$displaypath') 만들 수 없습니다" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "'$name' 하위 모듈이 ($url) '$displaypath' 경로에 대해 등록되지 않았습니다" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"하위 모듈 경로가 ('$displaypath') 초기화되지 않았습니다\n" -"아마도 'update --init'이 필요합니다?" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "하위 모듈 경로에서 ('$displaypath') 현재 리비전을 찾을 수 없습니다" -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "하위 모듈 경로 '$sm_path'에서 가져올 수 없습니다" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "하위 모듈 경로 '$displaypath'에서 가져올 수 없습니다" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1'을(를) 체크아웃할 수 없습니다" -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "하위 모듈 경로 '$displaypath': '$sha1' 체크아웃" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1'을(를) 리베이스할 수 없습니다" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "하위 모듈 경로 '$displaypath': '$sha1'(으)로 리베이스" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1' 병합할 수 없습니다" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "하위 모듈 경로 '$displaypath': '$sha1'에서 병합" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" -msgstr "" -"하위 모듈 경로 '$prefix$sm_path'에서 '$command $sha1' 실행이 실패했습니다" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" +msgstr "'$command $sha1' 실행이 하위 모듈 경로 '$displaypath'에서 실패했습니다" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "하위 모듈 경로 '$prefix$sm_path': '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "하위 모듈 경로 '$displaypath': '$command $sha1'" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "재귀적으로 하위 모듈 경로 '$displaypath'에 들어가는데 실패했습니다" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "--cached 옵션은 --files 옵션과 같이 쓸 수 없습니다" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "예상치 못한 모드 $mod_dst" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 경고: '$display_name'에 '$sha1_src' 커밋이 들어있지 않습니다" -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 경고: '$display_name'에 '$sha1_dst' 커밋이 들어있지 않습니다" -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, 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:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "블롭" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "재귀적으로 하위 모듈 경로 '$sm_path'에 들어가는데 실패했습니다" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "하위 모듈 URL을 '$displaypath'에 대해 동기화" + +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "자세한 정보는 git-${cmd}(1) 페이지를 참고하십시오." diff --git a/po/pt_PT.po b/po/pt_PT.po index 321b553877..f2cc93fe2a 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -1,16 +1,17 @@ # Portuguese translations for Git package. # Copyright (C) 2012 Marco Sousa <marcomsousa AT gmail.com> +# Copyright (C) 2016 Vasco Almeida <vascomalmeida@sapo.pt> # This file is distributed under the same license as the Git package. -# Contributers: +# Contributors: # - Marco Sousa <marcomsousa AT gmail.com> -# Vasco Almeida <vasco13almeida@gmail.com>, 2016. +# Vasco Almeida <vascomalmeida@sapo.pt>, 2016. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-03-16 00:16+0800\n" -"PO-Revision-Date: 2016-03-22 16:00+0000\n" -"Last-Translator: Vasco Almeida <vasco13almeida@gmail.com>\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-05-31 18:17+0000\n" +"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese\n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -30,23 +31,23 @@ msgid "" "as appropriate to mark resolution and make a commit." msgstr "" "Corrija-os na árvore de trabalho e use 'git add/rm <ficheiro>'\n" -"conforme apropriado para marcá-los como resolvidos e faça commit." +"conforme apropriado para marcá-los como resolvidos e submeta." -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "Merge não concluído (MERGE_HEAD presente)." +msgstr "Não concluído a integração (MERGE_HEAD presente)." #: advice.c:103 msgid "Please, commit your changes before merging." -msgstr "Faça commit das suas alterações antes de efetuar merge." +msgstr "Submeta as suas alterações antes de integrar." #: advice.c:104 msgid "Exiting because of unfinished merge." -msgstr "A terminar por causa de merge incompleto." +msgstr "A terminar devido a integração incompleta." #: archive.c:12 msgid "git archive [<options>] <tree-ish> [<path>...]" -msgstr "git archive [<opções>] <árvore> [<caminho>...]" +msgstr "git archive [<opções>] <árvore-etc> [<caminho>...]" #: archive.c:13 msgid "git archive --list" @@ -56,7 +57,7 @@ msgstr "git archive --list" msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <repo> [--exec <cmd>] [<opções>] <tree-ish> " +"git archive --remote <repo> [--exec <cmd>] [<opções>] <árvore-etc> " "[<caminho>...]" #: archive.c:15 @@ -76,7 +77,7 @@ msgstr "fmt" msgid "archive format" msgstr "formato do arquivo" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "prefixo" @@ -84,9 +85,9 @@ msgstr "prefixo" msgid "prepend prefix to each pathname in the archive" msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 +#: 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 msgid "file" @@ -120,7 +121,8 @@ msgstr "compressão ótima" msgid "list supported archive formats" msgstr "listar formatos de arquivo suportados" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "repo" @@ -153,8 +155,8 @@ msgid "" "\"git branch --set-upstream-to=%s%s%s\"." msgstr "" "\n" -"Após resolver a causa do problema, pode tentar corrigir\n" -"o ramo remoto que deve ser seguido invocando\n" +"Após resolver a causa do erro, pode tentar corrigir\n" +"o ramo remoto que deve ser seguido, invocando\n" "\"git branch --set-upstream-to=%s%s%s\"." #: branch.c:67 @@ -271,10 +273,15 @@ msgstr "Nome de objeto ambíguo: '%s'." msgid "Not a valid branch point: '%s'." msgstr "Ponto no ramo inválido: '%s'." -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" -msgstr "'%s' já extraído em '%s'" +msgstr "'%s' foi já extraído em '%s'" + +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD da árvore de trabalho %s não está atualizada" #: bundle.c:34 #, c-format @@ -286,19 +293,19 @@ msgstr "'%s' não parece ser um ficheiro bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "cabeçalho não reconhecido: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" -msgstr "não é possível abrir '%s'" +msgstr "não foi possível abrir '%s'" #: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "O repositório não possuí estes commits pré-requisitados:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: 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 msgid "revision walk setup failed" msgstr "falha ao configurar percurso de revisões" @@ -337,21 +344,21 @@ msgstr "rev-list terminou inesperadamente" msgid "ref '%s' is excluded by the rev-list options" msgstr "a referência '%s' é excluída pelas opções de rev-list" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "argumento não reconhecido: %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "Criação de bundle vazio recusada." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "não é possível criar '%s'" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "index-pack terminou inesperadamente" @@ -360,8 +367,8 @@ msgstr "index-pack terminou inesperadamente" msgid "invalid color value: %.*s" msgstr "valor de cor inválido: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "não foi possível analisar %s" @@ -381,7 +388,7 @@ msgid "bad config line %d in %s %s" msgstr "linha %d de configuração incorreta em %s %s" #: config.c:593 -#, c-format +#, c-format, fuzzy msgid "bad numeric config value '%s' for '%s' in %s %s: %s" msgstr "valor numérico '%s' da configuração '%s' em %s %s incorreto: %s" @@ -395,21 +402,21 @@ msgstr "valor numérico '%s' da configuração '%s' incorreto: %s" msgid "failed to expand user dir in: '%s'" msgstr "falha ao expandir diretório de utilizador em: '%s'" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "nível de compressão zlib %d incorreto" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "modo inválido para criação de objeto: %s" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "não é possível analisar configuração de linha de comandos" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "" "ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração" @@ -429,24 +436,27 @@ msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d" msgid "%s has multiple values" msgstr "%s tem múltiplos valores" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "não foi possível definir '%s' como '%s'" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" -msgstr "Não foi possível definir '%s' como '%s'" +msgid "could not unset '%s'" +msgstr "não foi possível reiniciar '%s'" #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Não foi possível executar 'git rev-list'" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "falha ao escrever para rev-list: %s" +msgid "failed write to rev-list" +msgstr "falha ao escrever para rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "falha ao fechar stdin de rev-list: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "falha ao fechar entrada padrão de rev-list" #: date.c:95 msgid "in the future" @@ -521,26 +531,26 @@ msgstr[1] "há %lu anos atrás" msgid "failed to read orderfile '%s'" msgstr "falha ao ler o ficheiro de comando '%s'" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "Deteção de mudança de nome inexata em curso" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Falha ao analisar percentagem limite de dirstat '%s'\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Parâmetro de dirstat desconhecido '%s'\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Valor desconhecido na variável de configuração 'diff.submodule': '%s'" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -549,16 +559,16 @@ msgstr "" "Erros encontrados na variável de configuração 'diff.dirstat':\n" "%s" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "o diff externo terminou inesperadamente, interrompido em %s" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow requer exatamente um único especificador de caminho" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -567,20 +577,20 @@ msgstr "" "Falha ao analisar parâmetro da opção --dirstat/-X:\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "falha ao obter nome e informação do kernel" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "A cache não controlada está desativada neste sistema ou localização." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "não foi possível executar gpg." @@ -594,28 +604,28 @@ msgstr "gpg não assinou os dados" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "não foi possível criar ficheiro temporário '%s': %s" +msgid "could not create temporary file '%s'" +msgstr "não foi possível criar ficheiro temporário '%s'" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "falha ao escrever assinatura destacada em '%s': %s" +msgid "failed writing detached signature to '%s'" +msgstr "falha ao escrever assinatura destacada em '%s'" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': não foi possível ler %s" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "'%s': %s" +msgid "failed to stat '%s'" +msgstr "falha ao invocar stat de '%s'" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "'%s': leitura truncada %s" +msgid "'%s': short read" +msgstr "'%s': leitura truncada" #: help.c:205 #, c-format @@ -641,7 +651,7 @@ msgstr "" #: help.c:366 msgid "Uh oh. Your system reports no Git commands at all." -msgstr "Ai ai. Não há nenhum comando do Git disponível no sistema." +msgstr "Oh não. Não há nenhum comando do Git disponível no sistema." #: help.c:388 #, c-format @@ -681,12 +691,36 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"Não é possível criar '%s.lock': %s.\n" +"\n" +"Outro processo git parece estar a executar neste repositório, e.g.\n" +"um editor aberto por 'git commit'. Certifique-se que todos os processos\n" +"terminaram e tente de novo. Se ainda assim falhar, um processo git\n" +"pode ter falhado anteriormente no repositório:\n" +"remova o ficheiro manualmente para continuar." + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "Não é foi possível criar '%s.lock': %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "falha ao ler a cache" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "não foi possível escrever novo ficheiro de índice" @@ -721,7 +755,7 @@ msgstr ": talvez um conflito D/F?" #: merge-recursive.c:725 #, c-format msgid "refusing to lose untracked file at '%s'" -msgstr "recusando-se a perder ficheiro não controlado em '%s'" +msgstr "perda de ficheiro não controlado em '%s' recusada" #: merge-recursive.c:765 #, c-format @@ -733,7 +767,7 @@ msgstr "não é possível ler o objeto %s: '%s'" msgid "blob expected for %s '%s'" msgstr "blob para %s '%s' esperado" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "falha ao abrir '%s'" @@ -750,7 +784,7 @@ msgstr "não sei o que fazer com %06o %s '%s'" #: merge-recursive.c:939 msgid "Failed to execute internal merge" -msgstr "Falha ao executar merge interno" +msgstr "Falha ao executar integração interna" #: merge-recursive.c:943 #, c-format @@ -868,16 +902,16 @@ msgstr "%s ignorado (integrado é igual ao existente)" #: merge-recursive.c:1646 #, c-format msgid "Auto-merging %s" -msgstr "Merge automático de %s" +msgstr "A integrar automaticamente %s" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "submódulo" #: merge-recursive.c:1651 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "CONFLITO (%s): conflito de merge em %s" +msgstr "CONFLITO (%s): conflito de integração em %s" #: merge-recursive.c:1737 #, c-format @@ -898,58 +932,57 @@ msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s" -#: merge-recursive.c:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "A adicionar %s" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." -msgstr "Falha de merge fatal, não devia acontecer." +msgstr "Falha de integração fatal, não devia acontecer." -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Já está atualizado!" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" -msgstr "falha ao realizar merge das árvores %s e %s" +msgstr "falha ao integrar as árvores %s e %s" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "Caminho não processado??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" -msgstr "A realizar merge:" +msgstr "A integrar:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u antecessor comum encontrado:" msgstr[1] "%u antecessores comuns encontrados:" -#: merge-recursive.c:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" -msgstr "merge não retornou nenhum commit" +msgstr "a integração não retornou nenhum commit" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "Não foi possível analisar o objeto '%s'" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "Não é possível escrever no índice." #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -"Não é possível fazer commit de árvore de notas não inicializada ou não " -"referenciada" +"Não é possível submeter árvore de notas não inicializada ou não referenciada" #: notes-utils.c:100 #, c-format @@ -959,7 +992,7 @@ msgstr "Valor de notes.rewriteMode incorreto: '%s'" #: notes-utils.c:110 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "Recusando-se a reescrever notas em %s (fora de refs/notes/)" +msgstr "Reescrita de notas em %s (fora de refs/notes/) recusada" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value @@ -973,28 +1006,28 @@ msgstr "Valor incorreto de %s: '%s'" msgid "unable to parse object: %s" msgstr "não foi possível analisar o objeto: %s" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "..." -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "utilização: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " ou: %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-NUM" @@ -1003,7 +1036,7 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "nome do objeto malformado '%s'" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "Não foi possível dar permissão de escrita ao grupo a %s" @@ -1075,7 +1108,7 @@ msgstr "" "Não há nada para excluir de acordo com o padrão :(excluir).\n" "Talvez se tenha esquecido de acrescentar ':/' ou '.' ?" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "não foi possível analisar o formato de --pretty" @@ -1101,23 +1134,23 @@ msgstr "" "GIT_INDEX_VERSION definido, mas com valor inválido.\n" "A usar a versão %i" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "Não foi possível abrir '%s' para escrita" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "não foi possível eliminar a referência %s: %s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "não foi possível eliminar as referências: %s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "não foi possível eliminar a referência %s" @@ -1256,97 +1289,98 @@ msgstr "formato: falta átomo %%(end)" msgid "malformed object name %s" msgstr "nome de objeto malformado %s" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Não é possível obter %s e %s ao mesmo tempo para %s" -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s geralmente segue %s, não %s" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s segue %s e %s em simultâneo" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "Erro interno" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD não aponta para um ramo" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "ramo inexistente: '%s'" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "nenhum ramo a montante configurado para o ramo '%s'" -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" -msgstr "o ramo a montante '%s' não está guardado como um ramo remoto seguido" +msgstr "" +"o ramo a montante '%s' não está guardado como um ramo de monitorização remoto" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "o destino de publicação '%s' no remoto '%s' não é seguido por nenhum ramo " "local" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "o ramo '%s' não tem nenhum remoto para publicar" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" "'%2$s' não faz parte dos especificadores de referência de '%1$s' para " "publicação" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "publicação sem destino (push.default é 'nothing')" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "não é possível resolver a publicação 'simple' num único destino" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "A base do seu ramo é '%s', mas o ramo a montante desapareceu.\n" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (use \"git branch --unset-upstream\" para corrigir)\n" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "O seu ramo está atualizado com '%s'.\n" -#: remote.c:2084 +#: remote.c:2085 #, 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] "O seu ramo está à frente de '%s' por %d commit.\n" msgstr[1] "O seu ramo está à frente de '%s' por %d commits.\n" -#: remote.c:2090 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (use \"git push\" para publicar os commits locais)\n" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1358,11 +1392,11 @@ msgstr[1] "" "O seu ramo está atrás de '%s' por %d commits, podendo ser atualizado com " "avanço rápido.\n" -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (use \"git pull\" para atualizar o seu ramo local)\n" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1377,20 +1411,20 @@ msgstr[1] "" "O seu ramo e '%s' divergiram,\n" "tendo cada um %d e %d commits diferentes, respetivamente.\n" -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" -msgstr " (use \"git pull\" para incorporar o ramo remoto no seu)\n" +msgstr " (use \"git pull\" para integrar o ramo remoto no seu ramo)\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "o ramo atual parece estar danificado" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "o ramo atual '%s' ainda não contém nenhum commit" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent é incompatível com --bisect" @@ -1439,17 +1473,17 @@ msgid "" msgstr "" "depois de resolver os conflitos, marque os caminhos corrigidos\n" "com 'git add <caminhos>' ou 'git rm <caminhos>'\n" -"e faça commit do resultado com 'git commit'" +"e submeta o resultado com 'git commit'" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "Não foi possível escrever em %s" #: sequencer.c:193 -#, fuzzy, c-format +#, c-format msgid "Error wrapping up %s" -msgstr "Erro ao isolar %s" +msgstr "Erro ao rematar %s." #: sequencer.c:208 msgid "Your local changes would be overwritten by cherry-pick." @@ -1461,7 +1495,7 @@ msgstr "As suas alterações locais serão substituídas por revert." #: sequencer.c:213 msgid "Commit your changes or stash them to proceed." -msgstr "Faça commit ou stash das suas alterações para continuar." +msgstr "Submeta ou empilhe (stash) as suas alterações para continuar." #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: sequencer.c:300 @@ -1494,7 +1528,7 @@ msgstr "Ficheiro de índice não integrado." #: sequencer.c:479 #, c-format msgid "Commit %s is a merge but no -m option was given." -msgstr "O commit %s é um merge mas nenhuma opção -m fornecida." +msgstr "O commit %s é uma integração mas não foi fornecida nenhuma opção -m." #: sequencer.c:487 #, c-format @@ -1504,7 +1538,8 @@ msgstr "O commit %s não tem o pai %d" #: sequencer.c:491 #, c-format msgid "Mainline was specified but commit %s is not a merge." -msgstr "Linha principal especificada mas o commit %s não é um merge." +msgstr "" +"A linha principal foi especificada mas o commit %s não é uma integração." #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 @@ -1599,12 +1634,12 @@ msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\"" msgid "Could not create sequencer directory %s" msgstr "Não foi possível criar o diretório do sequenciador %s" -#: sequencer.c:835 sequencer.c:917 -#, fuzzy, c-format +#: sequencer.c:835 sequencer.c:916 +#, c-format msgid "Error wrapping up %s." -msgstr "Erro ao isolar %s." +msgstr "Erro ao rematar %s." -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "nenhum cherry-pick ou revert em curso" @@ -1616,63 +1651,72 @@ msgstr "não é possível resolver HEAD" msgid "cannot abort from a branch yet to be born" msgstr "não é possível abortar um ramo ainda não criado" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "não é possível abrir %s: %s" +msgid "cannot open %s" +msgstr "não é possível abrir %s" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "não é possível ler %s: %s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "fim de ficheiro inesperado" -#: sequencer.c:888 +#: sequencer.c:887 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "o ficheiro HEAD de pre-cherry-pick '%s' está corrompido" -#: sequencer.c:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "Não foi possível formatar %s." -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: não é possível efetuar cherry-pick de %s" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s: revisão incorreta" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "Não é possível reverter como commit inicial" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "Não é possível efetuar cherry-pick numa cabeça vazia" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "falha ao ler %s" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "Esperava-se versão do repositório git <= %d, obteve-se %d" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "extensões de repositório desconhecidas encontradas:" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset antes do início do índice do pacote %s (índice corrompido?)" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset depois do fim do índice do pacote %s (índice truncado?)" @@ -1702,31 +1746,40 @@ msgstr "" "Analise estas referências e elimine-as se desejar. Desative esta\n" "mensagem executando \"git config advice.objectNameWarning false\"" -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -"Não é possível alterar .gitmodules não integrado, resolva os conflitos do " -"merge primeiro" +"Não é possível alterar .gitmodules não integrado, resolva primeiro os " +"conflitos de integração" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Secção de .gitmodules cujo path=%s não encontrada" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Não foi possível atualizar o elemento %s de .gitmodules" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Não foi possível remover o elemento %s de .gitmodules" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "falha ao preparar .gitmodules atualizado" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "não é permitido valores negativos em submodule.fetchJobs" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "Valor inválido de %s" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1746,7 +1799,7 @@ msgstr "mais do que um %s" #: trailer.c:582 #, c-format msgid "empty trailer token in trailer '%.*s'" -msgstr "" +msgstr "token terminador vazio no terminador '%.*s'" #: trailer.c:702 #, c-format @@ -1786,7 +1839,241 @@ msgstr "não foi possível mudar o nome do ficheiro temporário para %s" msgid "Could not read ref %s" msgstr "Não foi possível ler a referência %s" -#: unpack-trees.c:203 +#: 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." +msgstr "" +"As suas alterações locais nos seguintes ficheiros seriam substituídas ao " +"extrair:\n" +"%%sSubmeta as suas alterações ou empilhe-as (stash) antes de trocar de ramo." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"As suas alterações locais nos seguintes ficheiros seriam substituídas ao " +"extrair:\n" +"%%s" + +#: unpack-trees.c:69 +#, 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." +msgstr "" +"As suas alterações locais nos seguintes ficheiros seriam substituídas ao " +"integrar:\n" +"%%sSubmeta as suas alterações ou empilhe-as (stash) antes de integrar." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"As suas alterações locais nos seguintes ficheiros seriam substituídas ao " +"integrar:\n" +"%%s" + +#: unpack-trees.c:74 +#, 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." +msgstr "" +"As suas alterações locais nos seguintes ficheiros seriam substituídas por %s:" +"\n" +"%%sSubmeta as suas alterações ou empilhe-as (stash) antes de efetuar %s." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"As suas alterações locais nos seguintes ficheiros seriam substituídas por %s:" +"\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"Perder-se-iam ficheiros não controlados ao atualizar os seguintes diretórios:" +"\n" +"%s" + +#: unpack-trees.c:85 +#, 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." +msgstr "" +"Os seguintes ficheiros não controlados na árvore de trabalho seriam " +"removidos ao extrair:\n" +"%%sMova ou remova-os antes de trocar de ramos." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"Os seguintes ficheiros não controlados na árvore de trabalho seriam " +"removidos ao extrair:\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Os seguintes ficheiros não controlados na árvore de trabalho seriam " +"removidos ao integrar:\n" +"%%sMova ou remova-os antes de integrar." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"Os seguintes ficheiros não controlados na árvore de trabalho seriam " +"removidos ao integrar:\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Os seguintes ficheiros não controlados na árvore de trabalho seriam " +"removidos por %s:\n" +"%%sMova ou remova-os antes de efetuar %s." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"Os seguintes ficheiros não controlados na árvore de trabalho seriam " +"removidos por %s:\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"Os seguintes ficheiros não controlados da árvore de trabalho seriam " +"substituídos ao extrair:\n" +"%%sMova ou remova-os antes de trocar de ramos." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"Os seguintes ficheiros não controlados da árvore de trabalho seriam " +"substituídos ao extrair:\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Os seguintes ficheiros não controlados da árvore de trabalho seriam " +"substituídos ao integrar:\n" +"%%sMova ou remova-os antes de integrar." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Os seguintes ficheiros não controlados da árvore de trabalho seriam " +"substituídos ao integrar:\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Os seguintes ficheiros não controlados da árvore de trabalho seriam " +"substituídos por %s:\n" +"%%sMova ou remova-os antes de efetuar %s." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Os seguintes ficheiros não controlados da árvore de trabalho seriam " +"substituídos por %s:\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "A entrada '%s' sobrepõe-se com '%s'. Não é possível vincular." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"Não é possível extrair esparsamente: as seguintes entradas não estão " +"atualizadas:\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Os seguintes ficheiros na árvore de trabalho seriam substituídos ao " +"atualizar a extração esparsa:\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Os seguintes ficheiros na árvore de trabalho seriam removidos ao atualizar a " +"extração esparsa:\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "A abortar\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "A extrair ficheiros" @@ -1824,202 +2111,195 @@ msgstr "segmento de caminho '..' inválido" msgid "could not open '%s' for reading and writing" msgstr "não foi possível abrir '%s' para leitura e escrita" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "não foi possível abrir '%s' para escrita" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "não foi possível abrir '%s' para leitura" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "não é possível aceder a '%s': %s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "não é possível aceder a '%s'" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "não é possível de obter o diretório de trabalho atual" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "não foi possível abrir %s para escrita" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "não foi possível escrever para %s" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "não foi possível fechar %s" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Caminhos não integrados:" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr " (use \"git reset %s <ficheiro>...\" para retirar do índice)" +msgstr " (use \"git reset %s <ficheiro>...\" para despreparar)" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr " (use \"git rm --cached <ficheiro>...\" para retirar do índice)" +msgstr " (use \"git rm --cached <ficheiro>...\" para despreparar)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (use \"git add <ficheiro>...\" para marcar como resolvido)" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (use \"git add/rm <ficheiro>...\" conforme apropriado para marcar como " "resolvido)" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (use \"git rm <ficheiro>...\" para marcar como resolvido)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" -msgstr "Alterações incluídas no próximo commit:" +msgstr "Alterações para serem submetidas:" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" -msgstr "Alterações não preparadas para commit:" +msgstr "Alterações não preparadas para submeter:" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr "" -" (use \"git add <ficheiro>...\" para atualizar o que será incluído no " -"commit)" +msgstr " (use \"git add <ficheiro>...\" para atualizar o que será submetido)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -" (use \"git add/rm <ficheiro>...\" para atualizar o que será incluído no " -"commit)" +" (use \"git add/rm <ficheiro>...\" para atualizar o que será submetido)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (use \"git checkout -- <ficheiro>...\" para descartar alterações no " "diretório de trabalho)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -" (faça commit ou descarte o conteúdo modificado ou não controlado nos " +" (submeta ou descarte o conteúdo modificado ou não controlado nos " "submódulos)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" -msgstr " (use \"git %s <ficheiro>...\" para incluir no próximo commit)" +msgstr " (use \"git %s <ficheiro>...\" para incluir no que será submetido)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "eliminado por ambos:" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "adicionado por nós:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "eliminado por eles:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "adicionado por eles:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "eliminado por nós:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "adicionado por ambos:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "modificado por ambos:" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "novo ficheiro:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "copiado:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "eliminado:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "modificado:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "nome mudado:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "tipo alterado:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "desconhecido:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "não integrado:" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "novos commits, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "conteúdo modificado, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "conteúdo não controlado, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Submódulos alterados mas não atualizados:" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" -msgstr "Alterações em submódulos incluídas no próximo commit:" +msgstr "Alterações em submódulos para serem submetidas:" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2027,39 +2307,39 @@ msgstr "" "Não altere a linha acima.\n" "Tudo o que estiver abaixo será removido." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Há caminhos não integrados." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (corrija os conflitos e execute \"git commit\")" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." -msgstr "Todos os conflitos foram corrigidos mas o merge continua em curso." +msgstr "Todos os conflitos foram corrigidos mas ainda está a integrar." -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" -msgstr " (use \"git commit\" para concluir o merge)" +msgstr " (use \"git commit\" para concluir a integração)" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "Sessão am em curso." -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "O patch atual está vazio." -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (corrija os conflitos e execute \"git am --continue\")" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (use \"git am --skip\" para ignorar este patch)" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (use \"git am --abort\" para restaurar o ramo original)" @@ -2097,11 +2377,11 @@ msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)" #: wt-status.c:1148 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." -msgstr "A realizar rebase do ramo '%s' sobre '%s'." +msgstr "Está a realizar rebase do ramo '%s' sobre '%s'." #: wt-status.c:1153 msgid "You are currently rebasing." -msgstr "Rebase em curso." +msgstr "Está a rebasear neste momento." #: wt-status.c:1167 msgid " (fix conflicts and then run \"git rebase --continue\")" @@ -2125,11 +2405,12 @@ msgstr "" msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -"A dividir um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre '%s'." +"Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' " +"sobre '%s'." #: wt-status.c:1186 msgid "You are currently splitting a commit during a rebase." -msgstr "A dividir um commit durante um rebase." +msgstr "Está a dividir um commit durante um rebase." #: wt-status.c:1189 msgid " (Once your working directory is clean, run \"git rebase --continue\")" @@ -2141,11 +2422,12 @@ msgstr "" #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -"A editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre '%s'." +"Está a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre " +"'%s'." #: wt-status.c:1198 msgid "You are currently editing a commit during a rebase." -msgstr "A editar um commit durante um rebase." +msgstr "Está a editar um commit durante um rebase." #: wt-status.c:1201 msgid " (use \"git commit --amend\" to amend the current commit)" @@ -2161,7 +2443,7 @@ msgstr "" #: wt-status.c:1213 #, c-format msgid "You are currently cherry-picking commit %s." -msgstr "A realizar cherry-pick do commit %s." +msgstr "Está a realizar cherry-pick do commit %s." #: wt-status.c:1218 msgid " (fix conflicts and run \"git cherry-pick --continue\")" @@ -2181,7 +2463,7 @@ msgstr "" #: wt-status.c:1232 #, c-format msgid "You are currently reverting commit %s." -msgstr "A reverter o commit %s." +msgstr "Está a reverter o commit %s neste comento." #: wt-status.c:1237 msgid " (fix conflicts and run \"git revert --continue\")" @@ -2199,53 +2481,53 @@ msgstr " (use \"git rever --abort\" para cancelar a operação de reversão)" #: wt-status.c:1253 #, c-format msgid "You are currently bisecting, started from branch '%s'." -msgstr "Bissecção em curso, iniciada a partir do ramo '%s'." +msgstr "Está a bissetar, iniciado a partir do ramo '%s'." #: wt-status.c:1257 msgid "You are currently bisecting." -msgstr "Bissecção em curso." +msgstr "Está a bissetar neste momento." #: wt-status.c:1260 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (use \"git bisect reset\" para voltar ao ramo original)" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "No ramo " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "rebase interativo em curso; sobre " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "rebase em curso; sobre " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEAD destacada em " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEAD destacada de " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "Não se encontra em nenhum ramo neste momento." -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "Commit inicial" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "Ficheiros não controlados" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "Ficheiros ignorados" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2257,91 +2539,92 @@ msgstr "" "cuidado de não se esquecer de adicionar novos ficheiros\n" "(consulte 'git help status')." -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "Ficheiros não controlados não listados%s" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr " (use a opção -u para mostrar os ficheiros não controlados)" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "Sem alterações" -#: wt-status.c:1513 +#: wt-status.c:1535 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -"nenhuma alteração adicionada para commit (use \"git add\" e/ou \"git commit -" -"a\")\n" +"nenhuma alteração adicionada para submeter (use \"git add\" e/ou \"git " +"commit -a\")\n" -#: wt-status.c:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" -msgstr "nenhuma alteração adicionada para commit\n" +msgstr "nenhuma alteração adicionada para submeter\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -"não foi adicionado nada para commit, mas existem ficheiros não controlados " +"não foi adicionado nada para submeter, mas existem ficheiros não controlados " "(use \"git add\" para controlá-los)\n" -#: wt-status.c:1522 +#: wt-status.c:1544 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -"não foi adicionado nada para commit, mas existem ficheiros não controlados\n" +"não foi adicionado nada para submeter, mas existem ficheiros não " +"controlados\n" -#: wt-status.c:1525 +#: wt-status.c:1547 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -"não há nada para fazer commit (crie/copie ficheiros e use \"git add\" para " +"não há nada para submeter (crie/copie ficheiros e use \"git add\" para " "controlá-los)\n" -#: wt-status.c:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" -msgstr "não há nada para fazer commit\n" +msgstr "não há nada para submeter\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -"não há nada para fazer commit (use -u para mostrar os ficheiros não " -"controlados)\n" +"não há nada para submeter (use -u para mostrar os ficheiros não controlados)" +"\n" -#: wt-status.c:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" -msgstr "não há nada para fazer commit, diretório de trabalho limpo\n" +msgstr "não há nada para submeter, diretório de trabalho limpo\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "Commit inicial em " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (nenhum ramo)" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "desaparecido" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "atrás " -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "à frente " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "falha ao invocar unlink de '%s'" @@ -2355,7 +2638,7 @@ msgstr "git add [<opções>] [--] <caminho>..." msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "falha ao atualizar os ficheiros" @@ -2368,7 +2651,7 @@ msgstr "remover '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Alterações não preparadas depois de atualizar o índice:" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "Não foi possível ler o índice" @@ -2404,14 +2687,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Os seguintes caminhos estão ignorados por algum ficheiro .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:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: 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 msgid "dry run" msgstr "simular ação" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: 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 "ser verboso" @@ -2419,7 +2702,7 @@ msgstr "ser verboso" msgid "interactive picking" msgstr "seleção interativa" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "selecionar blocos interativamente" @@ -2489,16 +2772,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Queria dizer 'git add .'?\n" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "ficheiro de índice corrompido" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Não foi possível escrever novo ficheiro de índice" -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "não foi possível ler '%s'" @@ -2526,16 +2809,6 @@ msgstr "Falha ao copiar notas de '%s' para '%s'" msgid "fseek failed" msgstr "falha ao invocar fseek" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "não foi possível abrir '%s' para leitura: %s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "não foi possível abrir '%s' para escrita: %s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2545,77 +2818,77 @@ msgstr "não foi possível analisar o patch '%s'" msgid "Only one StGIT patch series can be applied at once" msgstr "Só pode ser aplicada uma série de patches StGIT duma só vez" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "carimbo de data/hora inválido" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "linha de Data inválida" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "mudança de fuso horário inválida" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "Falha ao detetar o formato do patch." -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "falha ao criar o diretório '%s'" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "Falha ao dividir patches." -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "não é possível escrever o ficheiro de índice" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Após resolver este problema, execute \"%s --continue\"." -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Se preferir ignorar este patch, execute \"%s --skip\"." -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Para restaurar o ramo original e interromper a aplicação dos patches, " "execute \"%s --abort\"." -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "O patch está vazio. Foi dividido incorretamente?" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "linha de identidade inválida: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "não foi possível analisar o commit %s" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -"O repositório não tem os blobs necessários para recorrer a merge com 3 " +"O repositório não tem os blobs necessários para recorrer a integração com 3 " "pontos." -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "A usar informação do índice para reconstruir uma árvore de base..." -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2623,40 +2896,41 @@ msgstr "" "Editou o patch manualmente?\n" "Não é possível aplicá-lo aos blobs registados no índice." -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "" -"A recorrer a uma de base para aplicação de patches e merge com 3 pontos..." +"A recorrer a uma de base para aplicação de patches e integração com 3 " +"pontos..." -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." -msgstr "Falha ao efetuar merge das alterações." +msgstr "Falha ao integrar as alterações." -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "git write-tree falhou ao escrever uma árvore" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "a aplicar a um histórico vazio" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "falha ao escrever objeto de commit" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "não é possível continuar: %s não existe." -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "não é possível entrar em modo interativo sem um entrada padrão conectada a " "um terminal." -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "Corpo do commit:" @@ -2664,35 +2938,35 @@ msgstr "Corpo do commit:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Aplicar? [y]sim/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos: " -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice modificado: não é possível aplicar patches (modificado: %s)" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "A aplicar: %.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "Nenhuma alteração -- Já foi aplicado o patch." -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "Falha ao aplicar o patch em %s %.*s" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "A cópia do patch que falhou encontra-se em: %s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2702,7 +2976,7 @@ msgstr "" "Se não há nada por preparar, provavelmente essas mesmas alterações\n" "já foram introduzidas; pode querer ignorar este patch." -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2710,17 +2984,17 @@ msgstr "" "Ainda há caminhos não integrados no índice.\n" "Esqueceu-se de usar 'git add'?" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Não foi possível analisar o objeto '%s'." -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "falha ao limpar o índice" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2728,153 +3002,155 @@ msgstr "" "Parece que a HEAD foi movida desde a última vez que o 'am' falhou.\n" "Não recuando a ORIG_HEAD" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor inválido de --patch-format: %s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<opções>] [(<mbox>|<Maildir>)...]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opções>] (--continue | --skip | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "executar interativamente" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "opção histórica -- sem-ação" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" -msgstr "permitir recorrer a merge com 3 pontos se necessário" +msgstr "permitir recorrer a integração com 3 pontos se necessário" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "silencioso" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "recodificar em utf8 (predefinição)" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "passar a opção -k ao git-mailinfo" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "passar a opção -b ao git-mailinfo" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "passar a opção -m ao git-mailinfo" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passar a opção --keep-cr ao gitmailsplit para formato de mbox" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "não passar a opção --keep-cr ao git-mailsplit independentemente de am.keepcr" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "retirar todo o conteúdo antes da linha de tesoura" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "ação" -#: 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:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: 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 msgid "pass it through git-apply" msgstr "transmitir ao git-apply" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "raiz" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: 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 "caminho" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 +#: 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/show-ref.c:175 builtin/tag.c:340 #: parse-options.h:132 parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "num" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "formato" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "formato de apresentação de patches" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "substituir a mensagem de erro quando a aplicação do patch falha" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "continuar a aplicar os patches depois de resolver os conflitos" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "sinónimo de --continue" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "ignorar o patch atual" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." -msgstr "restaurar o ramo original e abortar a operação de patch" +msgstr "restaurar o ramo original e abortar a operação de patch." -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "mentir sobre a data de commit" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "usar a data e hora atual como data de autor" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "id-chave" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "assinar os commits com GPG" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(uso interno de git-rebase)" -#: builtin/am.c:2340 +#: builtin/am.c:2339 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." @@ -2882,17 +3158,17 @@ msgstr "" "A opção -b/--binary há muito que é ignorada e será\n" "futuramente removida. Por favor não a use." -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "falha ao ler o índice" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "o diretório de rebesa anterior %s ainda existe, mas foi fornecida uma mbox." -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2901,7 +3177,7 @@ msgstr "" "Diretório abandonado %s encontrado.\n" "Use \"git am --abort\" para o remover." -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "A operação de resolução não está em curso, não retomando." @@ -2934,43 +3210,43 @@ msgstr "regexec retornou %d para a entra: %s" msgid "unable to find filename in patch at line %d" msgstr "não foi possível encontrar o nome do ficheiro no patch na linha %d" -#: builtin/apply.c:940 +#: 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 incorreto - esperava-se /dev/null, obteve-se %s na linha " "%d" -#: builtin/apply.c:944 +#: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: git-diff incorreto - o nome do novo ficheiro na linha %d é " "inconsistente" -#: builtin/apply.c:945 +#: builtin/apply.c:943 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: git-diff incorreto - o nome do ficheiro antigo na linha %d é " "inconsistente" -#: builtin/apply.c:952 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff incorreto - esperava-se /dev/null na linha %d" -#: builtin/apply.c:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recontagem: linha inesperada: %.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragmento de patch sem cabeçalho na linha %d: %.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2985,77 +3261,77 @@ msgstr[1] "" "o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover " "%d componentes de caminho (linha %d)" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "o novo ficheiro depende de conteúdos antigos" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "o ficheiro eliminado ainda tem conteúdos" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompido na linha %d" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "o novo ficheiro %s depende de conteúdos antigos" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "o ficheiro eliminado %s ainda tem conteúdos" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** aviso: o ficheiro %s ficará vazio, mas não será eliminado" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binário corrompido na linha %d: %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binário não reconhecido na linha %d" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "patch incompreensível na linha %d" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "não é possível ler a ligação simbólica %s" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "não é possível abrir ou ler %s" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "início de linha inválido: '%c'" -#: builtin/apply.c:2896 +#: 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] "Excerto nº%d bem sucedido na linha %d (%d linha deslocada)" -msgstr[1] "Excerto nº%d bem sucedido na linha %d (%d linhas deslocadas)" +msgstr[0] "Excerto nº%d bem sucedido na linha %d (%d linha deslocada)." +msgstr[1] "Excerto nº%d bem sucedido na linha %d (%d linhas deslocadas)." -#: builtin/apply.c:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexto reduzido para (%ld/%ld) para aplicar o fragmento em %d" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3064,324 +3340,335 @@ msgstr "" "ao procura por:\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "falta de dados do patch binário '%s'" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "o patch binário não foi aplicado corretamente a '%s'" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "o patch binário aplicado a '%s' gera resultados incorretos (esperava-se %s, " "obteve-se %s)" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "falha ao aplicar o patch: %s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "não é possível extrair %s" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "falha ao ler %s" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "a ler '%s' indicado por uma ligação simbólica" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "o caminho %s foi eliminado ou mudou de nome" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s: não existe no índice" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s: não tem correspondência no índice" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "patch de remoção deixa conteúdos no ficheiro" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s: tipo errado" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s é do tipo %o, esperado %o" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "caminho inválido '%s'" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s: já existe no índice" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s: já existe no diretório de trabalho" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o)" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o) de %s" -#: builtin/apply.c:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "o ficheiro afetado '%s' é indicado por uma ligação simbólica" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s: patch não se aplica com sucesso" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "A verificar o patch %s..." -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "falha ao invocar make_cache_entry em '%s'" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "não é possível remover %s do índice" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompido no submódulo %s" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "não é possível obter estado do novo ficheiro criado '%s'" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "não é possível criar armazenamento de segurança do ficheiro recém-criado %s" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "não é possível adicionar %s à cache" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "a fechar o ficheiro '%s'" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "não é possível escrever o ficheiro '%s' com o modo %o" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s aplicado com sucesso." -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "erro interno" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "A aplicar patch %%s com %d rejeição..." msgstr[1] "A aplicar patch %%s com %d rejeições..." -#: builtin/apply.c:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" -msgstr "a truncar o nome do ficheiro .rej em %.*s.rej " +msgstr "a truncar o nome do ficheiro .rej em %.*s.rej" + +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "não é possível abrir %s: %s" -#: builtin/apply.c:4300 +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Excerto nº%d aplicado com sucesso." -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "Excerto nº%d rejeitado." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Patch '%s' ignorado." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "entrada não reconhecida" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "não foi possível ler o ficheiro de índice" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "não aplicar alterações que correspondam ao caminho fornecido" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "aplicar alterações que correspondam ao caminho fornecido" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "ignorar adições feitas pelo patch" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "em vez de aplicar o patch, mostrar o diffstat da entrada" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "mostrar número de linhas adicionadas e removidas em notação decimal" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "em vez de aplicar o patch, mostrar um resumo da entrada" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "garantir que o patch pode ser aplicado ao índice atual" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "aplicar um patch sem tocar na árvore de trabalho" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "aceitar patches que alteram ficheiros fora da área de trabalho" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplicar o patch também (use com --stat/--summary/--check)" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" -msgstr "tentar merge com três pontos se um patch não for aplicado corretamente" +msgstr "" +"tentar integração com três pontos se um patch não se se aplica com êxito" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "" "construir um índice temporário baseado na informação incorporada do índice" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "os caminhos estão separados por caracteres NUL" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "detetar linhas novas ou modificadas que tenham espaços em branco" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "ignorar alterações de espaço em branco ao procurar contexto" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "aplicar o patch em reverso" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "não esperar nenhuma linha de contexto" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "permitir a sobreposição de excertos" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolerar deteções incorretas de falta de nova linha no final do ficheiro" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "não confiar na contagem de linhas no cabeçalho dos excertos" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "preceder <root> a todos os nomes de ficheiro" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "--3way fora de um repositório" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "--index fora de um repositório" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "--cached fora de um repositório" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "não é possível abrir o patch '%s'" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erro de espaço em branco reprimido" -msgstr[1] "%d erros de espaço em branco repimidos" +msgstr[1] "%d erros de espaço em branco reprimidos" -#: builtin/apply.c:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3447,102 +3734,101 @@ msgstr "<rev-opções> estão documentadas em git-rev-list(1)" msgid "Blaming lines" msgstr "Linhas de culpa" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "" "Mostrar entradas de culpa à medida que forem encontradas, incrementalmente" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "" -"Mostar SHA-1 dos commits de limite em branco (Predefinição: desativado)" +msgstr "Mostar SHA-1 dos commits limite em branco (Predefinição: desativado)" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Não tratar os commits raiz como limites (Predefinição: desativado)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "Mostrar estatísticas de custo de atividade" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "Forçar informação de progresso" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "Mostrar a pontuação das entradas de culpa" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "Mostrar números de linha originais (Predefinição: desativado)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "Mostrar em formato próprio para ser consumo por uma máquina" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "Mostrar em formato de porcelana com informações de commit por linha" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Usar o mesmo modo de saída que git-annotate (Predefinição: desativado)" -#: builtin/blame.c:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "" "Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)" -#: builtin/blame.c:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "Ignorar as diferenças de espaço em branco" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "Despender ciclos extra para encontrar uma melhor correspondência" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usar revisões do <ficheiro> em vez de invocar git-rev-list" -#: builtin/blame.c:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "Usar o conteúdo do <ficheiro> como imagem final" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "pontuação" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "Localizar linhas copiadas dentro e entre ficheiros" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "Localizar linhas movidas dentro e entre ficheiros" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1" @@ -3552,356 +3838,377 @@ msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1" #. 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "há 4 anos e 11 meses atrás" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<opções>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<opções>] [-l] [-f] <nome-ramo> [<ponto-de-partida>]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<opções>] [-r] (-d | -D) <nome-do-ramo>..." -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<opções>] (-m | -M) [<ramo-antigo>] <novo-ramo>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<opções>] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -"a eliminar o ramo '%s' incorporado em\n" -" '%s', mas ainda não incorporado em HEAD." +"a eliminar o ramo '%s' integrado em\n" +" '%s', mas ainda não integrado em HEAD." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -"ramo '%s' não eliminado, visto que ainda não foi incorporado em\n" -" '%s', apesar de já ter sido incorporado em HEAD." +"ramo '%s' não eliminado, visto que ainda não foi integrado em\n" +" '%s', apesar de já ter sido integrado em HEAD." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Não foi possível pesquisar pelo objeto commit de '%s'" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -"O ramo '%s' não foi totalmente incorporado.\n" +"O ramo '%s' não foi totalmente integrado.\n" "Se tem a certeza que o quer eliminar, execute 'git branch -D %s'." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "Falha ao atualizar o ficheiro de configuração" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "não é possível usar -a com -d" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "Não foi possível pesquisar pelo objeto commit de HEAD" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "Não é possível eliminar o ramo '%s' no qual se encontra neste momento." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "Não é possível eliminar o ramo '%s' extraído em '%s'" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." -msgstr "ramo remoto seguido '%s' não encontrado." +msgstr "ramo de monitorização remoto '%s' não encontrado." -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "ramo '%s' não encontrado." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" -msgstr "Erro a eliminar o ramo remoto seguido '%s'" +msgstr "Erro a eliminar o ramo de monitorização remoto '%s'" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "Erro a eliminar ramo '%s'" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" -msgstr "Ramo remoto seguido %s eliminado (era %s).\n" +msgstr "Ramo de monitorização remoto %s eliminado (era %s).\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Ramo %s eliminado (era %s).\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: desaparecido]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: atrás %d]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[atrás %d]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: à frente %d]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[à frente %d]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: à frente %d, atrás %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[à frente %d, atrás %d]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** referências inválida ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(nenhum ramo, a efetuar rebase de %s)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(nenhum ramo, bissecção iniciada em %s)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD destacada em %s)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD destacada de %s)" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(nenhum ramo)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "O ramo %s está a ser rebaseado em %s" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "O ramo %s está a ser bissetado em %s" + +#: builtin/branch.c:560 msgid "cannot rename the current branch while not on any." msgstr "" "não é possível mudar o nome do ramo atual vista que não se encontra num ramo." -#: builtin/branch.c:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nome de ramo inválido: '%s'" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "Falha ao mudar o nome do ramo" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "O ramo incorretamente denominado '%s' mudou de nome" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "O nome do ramo mudou para %s, mas a HEAD não está atualizada!" -#: builtin/branch.c:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "" "O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou" -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" -msgstr "não foi possível escrever o modelo da descrição de ramo: %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "não foi possível escrever o modelo da descrição do ramo" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "Opções genéricas" -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "apresentar hash e assunto, duplique para ramos a montante" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "suprimir mensagens informativas" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "configurar modo de seguimento (consulte git-pull(1))" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "alterar a informação do ramo a montante" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "a montante" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "alterar a informação do ramo a montante" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "usar saída colorida" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" -msgstr "atuar sobre ramos remotos seguidos" +msgstr "atuar sobre ramos de monitorização remotos" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "imprimir apenas ramos que contenham o commit" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "Ações específicas do git-branch:" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" -msgstr "listar ramos remotos seguidos e ramos locais" +msgstr "listar ramos de monitorização remotos e ramos locais" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" -msgstr "eliminar um ramo totalmente incorporado" +msgstr "eliminar um ramo totalmente integrado" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" -msgstr "eliminar um ramo (mesmo que não tenha sido incorporado)" +msgstr "eliminar um ramo (mesmo que não tenha sido integrado)" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "mover ou mudar o nome de um ramo e o seu reflog" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "listar os nomes dos ramos" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "criar reflog do ramo" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "editar a descrição do ramo" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "forçar criação, mover/mudar o nome ou exclusão" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" -msgstr "imprimir apenas os ramos que foram incorporados" +msgstr "imprimir apenas os ramos que foram integrados" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" -msgstr "imprimir apenas os ramos que não foram incorporados" +msgstr "imprimir apenas os ramos que não foram integrados" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "listar os ramos em colunas" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "chave" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "nome do campo pelo qual ordernar" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: 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/tag.c:369 msgid "object" msgstr "objeto" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "imprimir apenas os ramos do objeto" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "Falha ao resolver HEAD numa referência válida." -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "HEAD não encontrada em refs/heads!" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "--column e --verbose são incompatíveis" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "nome do ramo é obrigatório" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "Não é possível atribuir descrição a HEAD destacada" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "não é possível editar a descrição de mais do que um ramo" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "Ainda não há commits no ramo '%s'." -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "Não há nenhum ramo denominado '%s'." -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "demasiados ramos para uma operação de mudança de nome" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "demasiados ramos para definir novo ramo a montante" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3909,41 +4216,40 @@ msgstr "" "não foi possível definir %s como ramo a montante de HEAD visto que esta não " "aponta para um ramo." -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "o ramo '%s' não existe" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "o ramo '%s' não existe" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "demasiados ramos para remover a definição de ramo a montante" -#: builtin/branch.c:784 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "não foi possível remover a definição de ramo a montante de HEAD visto que " "esta não aponta para um ramo." -#: builtin/branch.c:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "O ramo '%s' não tem informação sobre o ramo a montante" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "não faz sentido criar 'HEAD' manualmente" -#: builtin/branch.c:810 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" -msgstr "" -"as opções -a e -r de 'git branch' não fazem sentido com um nome de ramo" +msgstr "as opções -a e -r de 'git branch' não fazem sentido com um nome de ramo" -#: builtin/branch.c:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3952,7 +4258,7 @@ msgstr "" "A opção --set-upstream é obsoleta e será removida. Considere o uso de --" "track ou --set-upstream-to\n" -#: builtin/branch.c:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3963,16 +4269,6 @@ msgstr "" "Se quer que '%s' siga '%s', faça:\n" "\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -3991,8 +4287,8 @@ msgid "" "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" "<type>|--textconv) <object>" msgstr "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" -"<tipo>|--textconv) <objeto>" +"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-" +"type]|-e|-p|<tipo>|--textconv) <objeto>" #: builtin/cat-file.c:429 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" @@ -4072,7 +4368,7 @@ msgstr "ler os nomes dos ficheiros da entrada padrão" msgid "terminate input and output records by a NUL character" msgstr "terminar registos da entrada e da saída com um carácter NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "suprimir informação de progresso" @@ -4164,8 +4460,9 @@ msgid "write the content to temporary files" msgstr "escrever o conteúdo em ficheiros temporários" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: 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 msgid "string" msgstr "cadeia" @@ -4213,82 +4510,82 @@ msgstr "caminho '%s': não é possível integrar" #: builtin/checkout.c:230 #, c-format msgid "Unable to add merge result for '%s'" -msgstr "Não é possível integrar os resultados do merge de '%s'" +msgstr "Não é possível adicionar os resultados da integração de '%s'" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' não pode ser usado com caminhos em atualização" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' não pode ser usado com %s" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Não é possível atualizar os caminhos e mudar para o ramo '%s' ao mesmo tempo." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "ficheiro de índice corrompido" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "o caminho '%s' não foi integrado" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "primeiro deve resolver o índice atual" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Não é possível efetuar reflog de '%s': %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD está agora em" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "não foi possível atualizar HEAD" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "Repor ramo '%s'\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "Já em '%s'\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Mudou para e repôs o ramo '%s'\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Mudou para o novo ramo '%s'\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "Mudou para o ramo '%s'\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " ... e mais %d.\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4309,7 +4606,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4336,166 +4633,166 @@ msgstr[1] "" " git branch <nome-do-novo-ramo> %s\n" "\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "erro interno durante o curso de revisões" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "A posição anterior de HEAD era" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "Está num ramo ainda não criado" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "esperava-se apenas uma referência, %d fornecidas." -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "referência inválida: %s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "a referência não é uma árvore: %s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "não podem ser usados caminhos ao mudar de ramo" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' não pode ser usado ao mudar de ramo" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' não pode ser usado com '%s'" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Não é possível mudar de ramo para '%s', visto que não é um commit" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: 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 msgid "branch" msgstr "ramo" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "criar e extrair um novo ramo" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "criar/repor e extrair um ramo" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "criar reflog do novo ramo" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "destacar HEAD no commit indicado" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "definir a informação do ramo a montante do novo ramo" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "novo-ramo" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "novo ramo sem pai" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "extrair a nossa versão dos ficheiros não integrados" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "extrair a versão deles dos ficheiros não integrados" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "forçar extração (descartar modificações locais)" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" -msgstr "realizar um merge com 3 pontos com o novo ramo" +msgstr "realizar uma integração com 3 pontos com o novo ramo" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "atualizar ficheiros ignorados (predefinição)" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "estilo de conflito (merge ou diff3)" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "não restringir especificadores de caminho a entradas esparsas" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "" "não verificar se outra árvore de trabalho contém a referência fornecida" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: 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/send-pack.c:168 msgid "force progress reporting" msgstr "forçar informação de progresso" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B e --orphan são mutuamente exclusivos" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track requer um nome dum ramo" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "Falta um nome dum ramo; tente -b" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "especificação de caminho inválida" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, 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 "" -"Não é possível atualizar os caminho e mudar para o ramo '%s' ao mesmo " -"tempo.\n" -"Pretendia extrair '%s' podendo ser resolvido num commit?" +"Não é possível atualizar os caminho e mudar para o ramo '%s' ao mesmo tempo." +"\n" +"Pretendia extrair '%s' o qual não pode ser resolvido como commit?" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach não aceita um caminho como argumento '%s'" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4579,7 +4876,7 @@ msgstr "Introduza padrões a ignorar>> " #: builtin/clean.c:690 #, c-format msgid "WARNING: Cannot find items matched by: %s" -msgstr "AVISO: não foram encontrados itens correspondentes a %s" +msgstr "AVISO: não foram encontrados itens correspondentes a: %s" #: builtin/clean.c:711 msgid "Select items to delete" @@ -4647,8 +4944,8 @@ msgstr "limpeza interativa" msgid "remove whole directories" msgstr "remover diretórios inteiros" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: 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 msgid "pattern" msgstr "padrão" @@ -4674,7 +4971,7 @@ msgid "" "clean" msgstr "" "clean.requireForce definido como true e nenhum -i, -n, ou -f fornecido; " -"recusando-se a limpar" +"limpeza recusada" #: builtin/clean.c:904 msgid "" @@ -4682,110 +4979,119 @@ msgid "" "refusing to clean" msgstr "" "clean.requireForce predefinido como true e nenhum -i, -n, ou -f fornecido; " -"recusando-se a limpar" +"limpeza recusada" #: builtin/clone.c:37 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opções>] [--] <repo> [<dir>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" -msgstr "não realizar extração" +msgstr "não criar uma extração" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "criar um repositório nu" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "criar um repositório espelhado (implica repositório nu)" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "para clonar de um repositório local" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "não usar ligações fixas, copiar sempre" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "configurar como repositório partilhado" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "inicializar submódulos no clone" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "número de submódulos clonados em paralelo" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "diretório-modelo" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "diretório que contém os modelos usados" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "repositório de referência" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "usar --reference apenas para clonar" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "nome" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "usar <nome> em vez de 'origin' para seguir o ramo a montante" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extrair <ramo> em vez da HEAD do remoto" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "caminho para git-upload-pack no remoto" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 -#: builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 +#: builtin/pull.c:201 msgid "depth" msgstr "profundidade" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "criar um clone raso com essa profundidade" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "clonar apenas um ramo, HEAD ou --branch" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "qualquer submódulo clonado será raso" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "separar o repositório git da árvore de trabalho" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "chave=valor" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "definir configuração dentro do novo repositório" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "usar apenas endereços IPv4" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "usar apenas endereços IPv6" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4793,59 +5099,54 @@ msgstr "" "Não foi possível adivinhar o nome do diretório.\n" "Especifique um diretório na linha de comandos" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "ainda não é suportada a funcionalidade que permite ter o repositório de " -"referência '%s' como uma extração ligada" +"referência '%s' como uma extração ligada." -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "o repositório de referência '%s' não é um repositório local." -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "o repositório de referência '%s' é raso" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "o repositório de referência '%s' está enxertado" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "falha ao invocar stat de '%s'" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe e não é um diretório" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "falha ao invocar stat de %s\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "falha ao criar a ligação '%s'" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "falha ao copiar o ficheiro para '%s'" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "concluído.\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4855,128 +5156,128 @@ msgstr "" "Pode inspecionar o que foi extraído com 'git status'\n" "e repetir a extração com 'git checkout -f HEAD'\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Ramo remoto %s não encontrado para clonar." -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "A verificar a conectividade... " -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "o remoto não enviou todos os objetos necessários" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "não foi possível atualizar %s" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -"a HEAD remota referencia uma referência inexistente, não é possível " -"extrair.\n" +"a HEAD remota referencia uma referência inexistente, não é possível extrair." +"\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "não foi possível extrair a árvore de trabalho" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "não foi possível escrever os parâmetros no ficheiro de configuração" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "não é possível reempacotar para limpar" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" -msgstr "não é possível invocar unlink sobre o ficheiro alternates temporário" +msgstr "não é possível invocar unlink sobre o ficheiro sobressalente temporário" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "Demasiados argumentos." -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "Deve especificar um repositório para clonar." -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "as opções --bare e --origin %s são incompatíveis." -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare e --separate-git-dir são incompatíveis." -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "o repositório '%s' não existe" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "profundidade %s não é um número positivo" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "o caminho de destino '%s' já existe e não é um diretório vazio." -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "a árvore de trabalho '%s' já existe." -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "não foi possível criar os diretórios superiores de '%s'" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "não foi possível criar o diretório de árvore de trabalho '%s'" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "A clonar no repositório nu '%s'...\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "A clonar em '%s'...\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth é ignorado em clones locais; use file:// ." -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "o repositório de origem é raso, --local ignorado" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local ignorado" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "Não sei como clonar %s" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "O ramo remoto %s não foi encontrado no repositório a montante %s" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "Parece foi clonado um repositório vazio." @@ -5076,7 +5377,7 @@ 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 "" -"Pediu para emendar o commit mais recente, mas fazê-lo torná-lo-ia\n" +"Pediu para emendar o commit mais recente, mas ao fazê-lo torná-lo-ia\n" "vazio. Pode repetir o comando com --allow-empty, ou pode remover o\n" "commit completamente com \"git reset HEAD^\".\n" @@ -5090,7 +5391,7 @@ msgid "" msgstr "" "O cherry-pick anterior está vazio, possivelmente devido a resolução de " "conflitos.\n" -"Se deseja fazer commit de qualquer forma, use:\n" +"Se deseja submeter de qualquer forma, use:\n" "\n" " git commit --allow-empty\n" "\n" @@ -5115,66 +5416,66 @@ msgstr "" "Depois \"git cherry-pick --continue\" irá retomar o cherry-pick\n" "dos restantes commits.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "falha ao descompactar o objeto árvore HEAD" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "não foi possível criar índice temporário" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "falha ao adicionar interativamente" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "não é possível atualizar o índice temporário" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "Falha ao atualizar a árvore de cache principal" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "não é possível escrever o ficheiro new_index" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." -msgstr "não é possível fazer um commit parcial durante um merge." +msgstr "não é possível fazer um commit parcial durante uma integração." -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "não é possível fazer um commit parcial durante um cherry-pick." -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "não é possível ler o índice" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "não é possível escrever ficheiro de índice temporário" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "o commit '%s' não tem cabeçalho de autor" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "o commit '%s' tem a linha de autor malformada" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "parâmetro --author malformado" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "formato de data inválido: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5182,38 +5483,38 @@ msgstr "" "não foi possível selecionar um carácter de comentário que\n" "não estivesse já a ser usado na mensagem de commit atual" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "não foi possível consultar o commit %s" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "(a ler mensagem de log da entrada padrão)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "não foi possível ler o log da entrada padrão" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "não é possível ler o ficheiro de log '%s'" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "não foi possível ler MERGE_MSG" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "não foi possível ler SQUASH_MSG" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "não foi possível ler MERGE_MSG" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "não foi possível escrever o modelo de commit" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5223,12 +5524,12 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Parece que está a fazer commit de um merge.\n" +"Parece que está a submeter uma integração.\n" "Se não for o caso, remova o ficheiro\n" "\t%s\n" "e tente de novo.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5238,12 +5539,12 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Parece que está a fazer commit de um cherry-pick.\n" +"Parece que está a submeter um cherry-pick.\n" "Se não é o caso, remova o ficheiro\n" -" %s\n" +"\t%s\n" "e tente outra vez.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5253,7 +5554,7 @@ msgstr "" "Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n" "aborta o commit.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5264,149 +5565,149 @@ msgstr "" "Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n" "Uma mensagem vazia aborta o commit.\n" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "Não é possível ler o índice" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "Erro ao construir árvores" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Indique a mensagem usando as opções -m ou -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' não é do tipo 'Nome <email>' e não corresponde a um autor " "existente" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo inválido de ficheiros não controlados '%s'" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "--long e -z são incompatíveis" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "Não faz sentido usar --reset-author e --author ao mesmo tempo" -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "Não há nada para emendar." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." -msgstr "Merge em curso -- não é possível emendar." +msgstr "Integração em curso -- não é possível emendar." -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Cherry-pick em curso -- não é possível emendar." -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "As opções --squash e --fixup não podem ser usadas juntas" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Apenas um entre -c/-C/-F/--fixup pode ser usado." -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "A opção -m não pode ser combinada com -c/C/-F/--fixup." -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author só pode ser usado com -C, -c ou --amend." -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Apenas um entre --include/--only/--all/--interactive/--patch pode ser usado." -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 msgid "No paths with --include/--only does not make sense." msgstr "As opções --include/--only não fazem sentido sem indicar caminhos." -#: builtin/commit.c:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "Inteligente... a emendar o último commit com o índice sujo." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Caminhos explícitos especificados sem -i ou -o; assumindo --only..." -#: builtin/commit.c:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo de limpeza inválido %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." -msgstr "A especificação de caminhos com -a não faz sentido." +msgstr "Indicar caminhos com -a não faz sentido." -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "mostrar status de forma concisa" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "mostrar informação do ramo" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "saída inteligível por máquina" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "apresentar status em formato longo (predefinição)" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "terminar entradas com NUL" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "modo" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostrar ficheiros não controlados, modo é opcional: all, normal, no. " "(Predefinição: all)" -#: builtin/commit.c:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "mostrar ficheiros ignorados" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "quando" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5414,200 +5715,199 @@ msgstr "" "ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. " "(Predefinição: all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "listar ficheiros não controlados em colunas" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "não foi possível consultar o commit recém-criado" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "não foi possível analisar o commit recém-criado" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "HEAD destacada" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (commit-raiz)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" -msgstr "suprimir o resumo depois de fazer commit com sucesso" +msgstr "suprimir o resumo depois de submeter com sucesso" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "mostrar diff no modelo da mensagem de commit" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "Opções de mensagem de commit" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "ler mensagem de um ficheiro" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "autor" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "substituir autor do commit" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "data" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "substituir data do commit" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "mensagem" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "mensagem de commit" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "commit" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "reutilizar e editar a mensagem de um commit especificado" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "reutilizar a mensagem de um commit especificado" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensagem com formato autosquash para corrigir o commit especificado" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" -msgstr "" -"usar mensagem com formato autosquash para esmagar o commit especificado" +msgstr "usar mensagem com formato autosquash para esmagar o commit especificado" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "agora sou eu o autor do commit (usado com C/-c/--amend)" -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "adicionar Signed-off-by:" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "usar ficheiro de modelo especificado" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "forçar edição do commit" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "predefinição" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "como retirar espaços e #comentários da mensagem" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "incluir status no modelo da mensagem de commit" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "assinar o commit com GPG" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "Opções de conteúdo do commit" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" -msgstr "fazer commit de todos os ficheiros alterados" +msgstr "submeter todos os ficheiros alterados" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" -msgstr "adicionar ficheiros especificados ao índice para incluir no commit" +msgstr "adicionar ficheiros especificados ao índice para submeter" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "adicionar ficheiros interativamente" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "adicionar alterações interativamente" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" -msgstr "fazer commit somente dos ficheiros especificados" +msgstr "submeter somente os ficheiros especificados" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "ignorar pre-commit hook" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" -msgstr "mostrar o que será incluído no commit" +msgstr "mostrar o que seria submetido" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "emendar o commit anterior" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "ignorar post-rewrite hook" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "aceitar o registo duma alteração vazia" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "aceitar o registo duma alteração com uma mensagem vazia" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "não foi possível analisar o commit HEAD" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Ficheiro MERGE_HEAD corrompido (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "não foi possível ler MERGE_MODE" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "não foi possível ler a mensagem de commit: %s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "A abortar o commit; não editou a mensagem.\n" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5716,7 +6016,7 @@ msgstr "Tipo" #: builtin/config.c:78 msgid "value is \"true\" or \"false\"" -msgstr "o valor é \"true\" (verdadeiro) ou \"falso\" (falso)" +msgstr "o valor é \"true\" (verdadeiro) ou \"false\" (falso)" #: builtin/config.c:79 msgid "value is decimal number" @@ -5756,7 +6056,7 @@ msgstr "" msgid "unable to parse default color value" msgstr "não é possível analisar o valor de cor por omissão" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5771,7 +6071,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "não é possível criar o ficheiro de configuração %s" @@ -5786,7 +6086,7 @@ msgstr "imprimir dimensões em formato inteligível por humanos" #: builtin/describe.c:17 msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [<opções>] [<commit-ish>...]" +msgstr "git describe [<opções>] [<commit-etc>...]" #: builtin/describe.c:18 msgid "git describe [<options>] --dirty" @@ -5807,7 +6107,7 @@ msgstr "a tag anotada %s não tem nenhum nome incorporado" msgid "tag '%s' is really '%s' here" msgstr "a tag '%s' está de facto em '%s'" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "%s não é um nome de objeto válido" @@ -5900,7 +6200,7 @@ msgstr "considerar as <n> tags mais recentes (predefinição: 10)" msgid "only consider tags matching <pattern>" msgstr "apenas considerar tags que correspondam ao <padrão>" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "mostrar objetos de commit abreviados em recurso" @@ -5936,21 +6236,21 @@ msgstr "'%s': não é um ficheiro regular nem uma ligação simbólica" msgid "invalid option: %s" msgstr "opção inválida: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "Não é um repositório git" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "objeto inválido '%s' fornecido." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "mais do que dois blobs fornecidos: '%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "objeto sem tratamento '%s' fornecido." @@ -6009,8 +6309,7 @@ msgstr "anonimizar saída" #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" -msgstr "" -"git fetch [<opções>] [<repositório> [<especificador-de-referência>...]]" +msgstr "git fetch [<opções>] [<repositório> [<especificador-de-referência>...]]" #: builtin/fetch.c:21 msgid "git fetch [<options>] <group>" @@ -6024,19 +6323,19 @@ msgstr "git fetch --multiple [<opções>] [(<repositório> | <grupo>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opções>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "obter de todos os remotos" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "acrescentar a .git/FETCH_HEAD em vez de substituir" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "caminho para o comando upload pack no remoto" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "forçar a substituição do ramo local" @@ -6044,7 +6343,7 @@ msgstr "forçar a substituição do ramo local" msgid "fetch from multiple remotes" msgstr "obter de múltiplos remotos" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "obter todas as tags e objetos associados" @@ -6056,19 +6355,19 @@ msgstr "não obter todas as tags (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "número de submódulos obtidos em paralelo" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" -msgstr "eliminar os ramos cujo respetivo ramo remoto já não existe" +msgstr "eliminar os ramos de monitorização remotos que já não existem no remoto" -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "controlar a obtenção recursiva de submódulos" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "manter o pacote transferido" @@ -6076,15 +6375,15 @@ msgstr "manter o pacote transferido" msgid "allow updating of HEAD ref" msgstr "permitir a atualização da referência HEAD" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "aprofundar o histórico de um clone raso" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "converter num repositório completo" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "dir" @@ -6096,15 +6395,15 @@ msgstr "preceder isto ao caminho do submódulo" msgid "default mode for recursion" msgstr "modo recursivo por omissão" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "aceitar referência que atualizem .git/shallow" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "mapa de referências" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "especificar mapa de referências" @@ -6162,11 +6461,6 @@ msgstr "atualização forçada" msgid "(non-fast-forward)" msgstr "(sem avanço rápido)" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "não é possível abrir %s: %s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6212,7 +6506,7 @@ msgstr "(nenhum)" #: builtin/fetch.c:841 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "Não é possível obter objetos no ramo atual %s de um repositório não nu" +msgstr "Obtenção de objetos no ramo atual %s de um repositório não nu recusada" #: builtin/fetch.c:860 #, c-format @@ -6352,11 +6646,11 @@ msgstr "imprimir apenas referências que apontem para o objeto fornecido" #: builtin/for-each-ref.c:43 msgid "print only refs that are merged" -msgstr "imprimir apenas referenciadas incorporadas" +msgstr "imprimir apenas referenciadas integradas" #: builtin/for-each-ref.c:44 msgid "print only refs that are not merged" -msgstr "imprimir apenas referências não incorporadas" +msgstr "imprimir apenas referências não integrada" #: builtin/for-each-ref.c:45 msgid "print only refs which contain the commit" @@ -6370,55 +6664,55 @@ msgstr "A verificar conectividade" msgid "Checking object directories" msgstr "A verificar diretórios de objetos" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opções>] [<objeto>...]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "mostrar objetos inalcançáveis" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "mostrar objetos suspensos" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "mostrar tags" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "mostrar nós raiz" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "considerar objetos do índice como nós cabeça" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "considerar os reflogs como nós cabeça (predefinição)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" -msgstr "considerar também pacotes e objetos alternate" +msgstr "considerar também pacotes e objetos sobressalente" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "verificar só a conetividade" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "ativar verificação mais rigorosa" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "escrever objetos suspensos em .git/lost-found" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "mostrar progresso" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "A verificar objetos" @@ -6446,7 +6740,7 @@ msgid "" "%s" msgstr "" "A última execução do gc reportou o seguinte.\n" -"Corrija a raiz do problema e remova %s.\n" +"Corrija a origem do problema e remova %s.\n" "A limpeza automática não será realizada enquanto o ficheiro existir.\n" "\n" "%s" @@ -6523,229 +6817,229 @@ msgstr "não foi possível ler a árvore (%s)" msgid "unable to grep from object of type %s" msgstr "não foi possível efetuar grep de objetos do tipo %s" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "a opção '%c' espera um valor numérico" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "não é possível abrir '%s'" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "procurar no índice em vez de procurar na árvore de trabalho" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "procurar em conteúdos não geridos pelo git" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "procurar em ficheiros controlados e não controlados" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "ignorar ficheiros especificados via '.gitignore'" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "mostrar linhas não correspondidas" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "não diferenciar maiúsculas de minúsculas" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "corresponder padrões apenas a palavras" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "processar ficheiros binários como texto" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "ignorar ficheiros binários" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "processar ficheiros binários com filtros textconv" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "descer no máximo até <profundidade>" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "usar expressões regulares estendidas do POSIX" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "usar expressões regulares básicas do POSIX (predefinição)" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "interpretar padrões como cadeias de caracteres fixas" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "usar expressões regulares compatíveis com Perl" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "mostrar números de linha" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "não mostrar nomes de ficheiro" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "mostrar nomes de ficheiro" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "mostrar nomes de ficheiro relativamente ao diretório superior" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "sinónimo de --files-with-matches" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "mostrar apenas nomes de ficheiro sem correspondência" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "imprimir NUL depois dos nomes de ficheiro" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "mostrar o número de correspondências em vez das linha correspondidas" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "realçar correspondências" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "" "imprimir uma linha em branco entre correspondências de diferentes ficheiros" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "" "mostrar só uma vez o nome do ficheiro acima das correspondências dentro do " "mesmo ficheiro" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "mostrar <n> linhas de contexto antes e depois das correspondências" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "mostrar <n> linhas de contexto antes das correspondências" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "mostrar <n> linhas de contexto depois das correspondências" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "usar <n> threads de trabalho" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "atalho para -C NUM" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "mostrar uma linha com o nome da função antes das correspondências" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "mostrar a função circundante" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "ler padrões do ficheiro" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "procurar <padrão>" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "combinar padrões especificados com -e" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "indicar padrão encontrado no valor de saída, mas não imprimir" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "" "mostrar apenas correspondências de ficheiro que tenham todos os padrões" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "mostrar árvore de analise da expressões grep" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "paginador" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "mostrar ficheiros com correspondências no paginador" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir invocar grep(1) (ignorado nesta compilação)" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "nenhum padrão fornecido." -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "número de threads especificado inválido (%d)" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager só funciona na árvore de trabalho" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached ou --untracked não podem ser usados com --no-index." -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index ou --untracked não podem ser usados em revisões." -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "--[no-]exclude-standard não podem ser usados em conteúdos não controlados." -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." -msgstr "--cached e árvores fornecidos simultaneamente." +msgstr "--cached e árvores foram fornecidos simultaneamente." #: builtin/hash-object.c:81 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." msgstr "" -"git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--" -"stdin] [--] <ficheiro>..." +"git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--stdin]" +" [--] <ficheiro>..." #: builtin/hash-object.c:82 msgid "git hash-object --stdin-paths" @@ -6826,8 +7120,8 @@ msgstr "a versão do emacsclient '%d' é demasiado antiga (< 22)." #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "falha ao executar '%s': %s" +msgid "failed to exec '%s'" +msgstr "falha ao executar '%s'" #: builtin/help.c:205 #, c-format @@ -6836,7 +7130,7 @@ msgid "" "Please consider using 'man.<tool>.cmd' instead." msgstr "" "'%s': caminho para visualizador de manual não suportado.\n" -"Considere usar 'man.<tool>.cmd'." +"Considere usar 'man.<ferramenta>.cmd'." #: builtin/help.c:217 #, c-format @@ -6845,12 +7139,12 @@ msgid "" "Please consider using 'man.<tool>.path' instead." msgstr "" "'%s': comando de visualizador de manual suportado.\n" -"Considere usar 'man.<tool>.path'." +"Considere usar 'man.<ferramenta>.path'." #: builtin/help.c:334 #, c-format msgid "'%s': unknown man viewer." -msgstr "'%s' visualizador de manual desconhecido." +msgstr "'%s': visualizador de manual desconhecido." #: builtin/help.c:351 msgid "no man viewer handled the request" @@ -6910,7 +7204,7 @@ msgstr "'git %s' é um alias de '%s'" #: builtin/index-pack.c:152 #, c-format msgid "unable to open %s" -msgstr "não foi possível ler %s" +msgstr "não foi possível abrir %s" #: builtin/index-pack.c:202 #, c-format @@ -6984,9 +7278,8 @@ msgid "offset value overflow for delta base object" msgstr "delta de objeto base com capacidade excedida no valor de offset" #: builtin/index-pack.c:530 -#, fuzzy msgid "delta base offset is out of bound" -msgstr "um offset de base delta ultrapassou o limite" +msgstr "offset da base delta está fora do limite" #: builtin/index-pack.c:538 #, c-format @@ -7087,107 +7380,109 @@ msgstr "extrema confusão" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "concluído com %d objetos locais" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "concluído com %d objeto local" +msgstr[1] "concluído com %d objetos locais" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Soma de verificação inesperada no final de %s (corrupção no disco?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "pacote com %d delta não resolvido" msgstr[1] "pacote com %d deltas não resolvidos" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "não é possível compactar objeto acrescentado (%d)" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "objeto local %s corrompido" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "erro ao fechar ficheiro de pacote" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "não é possível escrever o ficheiro de conservação '%s'" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "não é possível fechar o ficheiro de conservação '%s' escrito" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "não é possível guardar ficheiro de pacote" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "não é possível guardar o ficheiro índice" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> incorreto" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "sem suporte de threads, %s ignorado" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Não é possível abrir o ficheiro de pacote '%s' existente" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Não é possível abrir o ficheiro de índice do pacote existente de '%s'" -#: builtin/index-pack.c:1587 +#: builtin/index-pack.c:1589 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "%d objeto não delta" msgstr[1] "%d objetos não delta" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1596 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "comprimento de cadeia = %d: %lu objeto" msgstr[1] "comprimento de cadeia = %d: %lu objetos" -#: builtin/index-pack.c:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "o nome do ficheiro de pacote '%s' não termina em '.pack'" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "Não é possível voltar ao diretório de trabalho atual" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "%s incorreto" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin não pode ser usado sem --stdin" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "o nome do ficheiro de pacote '%s' não termina em '.pack'" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "--verify sem nome do ficheiro de pacote indicado" @@ -7226,28 +7521,27 @@ msgstr "não é possível copiar '%s' para '%s'" msgid "ignoring template %s" msgstr "modelo %s ignorado" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "modelos não encontrados em %s" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "" -"os modelos com versão de formato %d incorreta não foram copiados de '%s'" +msgid "not copying templates from '%s': %s" +msgstr "modelos não copiados de '%s': %s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s já existe" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "não foi possível processar o tipo de ficheiro %d" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "não foi possível mover %s para %s" @@ -7255,51 +7549,51 @@ msgstr "não foi possível mover %s para %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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "Repositório Git %s%s em %s%s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "existente reinicializado" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "vazio inicializado" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr " partilhado" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] [--" -"shared[=<permissões>]] [<diretório>]" +"git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] " +"[--shared[=<permissões>]] [<diretório>]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "permissões" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "especificar que o repositório git será partilhado por vários utilizadores" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "não é possível criar o diretório %s" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "não é possível mudar para o diretório %s" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7308,7 +7602,7 @@ msgstr "" "%s (ou --work-tree=<diretório>) não é permitido sem especificar %s (ou --git-" "dir=<diretório>)" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "Não é possível aceder à árvore de trabalho '%s'" @@ -7354,267 +7648,319 @@ msgstr "git show [<opções>] <objeto>..." msgid "invalid --decorate option: %s" msgstr "opção --decorate inválida: %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "suprimir saída do diff" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "mostrar origem" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "usar ficheiro de mapeamento de correio" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "opções de decoração" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "processar intervalo de linhas n,m, a cantar a partir de 1" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "Resultado final: %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ficheiro incorreto" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "Não foi possível ler o objeto %s" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "Tipo desconhecido: %d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers sem valor" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "o nome do diretório de saída é demasiado longo" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "Não é possível abrir o ficheiro de patch %s" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "É necessário exatamente um intervalo." -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "Não é um intervalo." -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "A carta de apresentação precisa de um formato de e-mail" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to incorreto: %s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opções>] [<desde> | <intervalo-de-revisões>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "Dois diretórios de saída?" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "Commit desconhecido %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 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Falha ao resolver '%s' numa referência válida." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "Não foi possível encontrar a base exata de integração." + +#: builtin/log.c:1235 +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 "" +"Falha ao obter ramo a montante, se quer gravar o commit base automaticamente," +"\n" +"use branch --set-upstream-to para seguir um ramo remoto.\n" +"Ou pode especificar o commit base com --base=<base-commit-id> manualmente." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "Falha ao procurar base exata de integração" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "o commit base deve ser o antecessor da lista de revisões" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "o commit base não deve fazer parte da lista de revisões" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "não é possível obter o id do patch" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "usar [PATCH n/m] mesmo com um único patch" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "usar [PATCH] mesmo com múltiplos patches" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "imprimir patches para a saída padrão" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "gerar uma carta de apresentação" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "" "usar uma sequência de números simples para denominar os ficheiros gerados" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "usar <sfx> em vez de '.patch'" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "começar a numerar os patches em <n> em vez de 1" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "marcar a série como a n-ésima reiteração" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "usar [<prefixo>] em vez de [PATCH]" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "guardar os ficheiros resultantes em <dir>" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "não tirar/inserir [PATCH]" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "não gerar diffs binários" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "preencher o cabeçalho From com hash de zeros" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "não incluir um patch que coincida com um commit a montante" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "" "mostrar no formato de patch em vez de no formato por omissão (patch + stat)" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "Mensagem" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "cabeçalho" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "adicionar cabeçalho de e-mail" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "e-mail" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "adicionar cabeçalho To:" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "adicionar cabeçalho Cc:" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "identidade" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "definir o endereço From como <identidade> (ou como identidade do committer " "se não indicado)" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "id-mensagem" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "usar o primeiro email para responder a <id-mensagem>" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "limite" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "anexar o patch" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "incorporar o patch" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "assinatura" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "adicionar uma assinatura" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "commit-base" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "adicionar informação pré-requisito da árvore à série de patches" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "adicionar uma assinatura de um ficheiro" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "não imprimir os nomes dos ficheiros de patch" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n e -k são mutuamente exclusivos." -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix e -k são mutuamente exclusivos." -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "--name-only não faz sentido" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "--name-status não faz sentido" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "--check não faz sentido" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "saída padrão, ou diretório, qual deles?" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "Não foi possível criar o diretório '%s'" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "não é possível ler o ficheiro de assinatura '%s'" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "Falha ao criar os ficheiros de saída" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -7622,11 +7968,6 @@ msgstr "" "O ramo remoto seguido não foi encontrado, especifique <ramo-a-montante> " "manualmente.\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "Commit desconhecido %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opções>] [<ficheiro>...]" @@ -7643,7 +7984,7 @@ msgstr "" #: builtin/ls-files.c:431 msgid "show cached files in the output (default)" -msgstr "mostrar ficheiros em cache na saída" +msgstr "mostrar ficheiros em cache na saída (predefinição)" #: builtin/ls-files.c:433 msgid "show deleted files in the output" @@ -7684,11 +8025,11 @@ msgstr "não mostrar diretórios vazios" #: builtin/ls-files.c:453 msgid "show unmerged files in the output" -msgstr "mostrar ficheiros com versões não conciliadas, na saída" +msgstr "mostrar ficheiros não integrados na saída" #: builtin/ls-files.c:455 msgid "show resolve-undo information" -msgstr "mostrar informação de resolver-anular" +msgstr "mostrar informação de resolver-desfazer" #: builtin/ls-files.c:457 msgid "skip files matching pattern" @@ -7716,11 +8057,12 @@ msgstr "se um <ficheiro> não estiver no índice, tratar como erro" #: builtin/ls-files.c:472 msgid "tree-ish" -msgstr "árvore" +msgstr "árvore-etc" #: builtin/ls-files.c:473 msgid "pretend that paths removed since <tree-ish> are still present" -msgstr "fingir que os caminhos removidos desde <árvore> ainda estão presentes" +msgstr "" +"fingir que os caminhos removidos desde <árvore-etc> ainda estão presentes" #: builtin/ls-files.c:475 msgid "show debugging data" @@ -7774,7 +8116,7 @@ msgstr "mostrar a referência subjacente em adição ao objeto por ela apontado" #: builtin/ls-tree.c:28 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" -msgstr "git ls-tree [<opções>] <árvore> [<caminho>...]" +msgstr "git ls-tree [<opções>] <árvore-etc> [<caminho>...]" #: builtin/ls-tree.c:128 msgid "only show trees" @@ -7821,172 +8163,178 @@ msgstr "git merge [<opções>] <msg> HEAD <commit>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "a opção 'm' requer um valor" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" -msgstr "Estratégia de merge '%s' não encontrada.\n" +msgstr "Estratégia de integração '%s' não encontrada.\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "Estratégias disponíveis:" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "Estratégias personalizadas disponíveis:" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" -msgstr "não apresentar um diffstat no final do merge" +msgstr "não apresentar um diffstat ao fim da integração" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" -msgstr "mostrar um diffstat no final do merge" +msgstr "mostrar um diffstat ao fim da integração" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(sinónimo de --stat)" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -"adicionar (no máximo <n>) entradas do shortlog à mensagem de commit do merge" +"adicionar (no máximo <n>) entradas do shortlog à mensagem de commit da " +"integração" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" -msgstr "criar um único commit em vez de realizar um merge" +msgstr "criar um único commit em vez de realizar uma integração" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" -msgstr "realizar um commit se o merge for bem sucedido (predefinição)" +msgstr "realizar um commit se a integração for bem sucedida (predefinição)" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" -msgstr "editar a mensagem antes de realizar commit" +msgstr "editar a mensagem antes de submeter" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "permitir avanço rápido (predefinição)" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "abortar se não é possível efetuar avanço rápido" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "verificar se o commit tem uma assinatura GPG válida" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "estratégia" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" -msgstr "estratégia de merge a usar" +msgstr "estratégia de integração a usar" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "opção=valor" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" -msgstr "opções para a estratégia de merge selecionada" +msgstr "opções da estratégia de integração selecionada" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" -msgstr "mensagem de commit (de merge não suscetível a avanço rápido)" +msgstr "mensagem de commit (de integração não suscetível a avanço rápido)" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" -msgstr "abortar merge em curso" +msgstr "abortar integração em curso" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "permitir integração de históricos não relacionados" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "não foi possível executar o comando stash." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "falha ao executar o comando stash" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "nome de objeto inválido: %s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "falha ao executar o comando read-tree" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (não há nada para esmagar)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit esmagado -- HEAD não atualizada\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: 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 "Não foi possível escrever em '%s'" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "A escrever SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "A concluir SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" -msgstr "Sem mensagem de merge -- HEAD não atualizada\n" +msgstr "Nenhuma mensagem de integração -- HEAD não atualizada\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' não aponta para um commit" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Valor de branch.%s.mergeoptions incorreto: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." -msgstr "A processar exclusivamente merge de duas cabeças." +msgstr "Não se processa outra coisa senão incorporação de duas cabeças." -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opção desconhecida de merge-recursive: -X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "não foi possível escrever %s" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "Não foi possível ler '%s'" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -"Commit do merge não realizado; use 'git commit' para concluir o merge.\n" +"Commit de integração não realizado; use 'git commit' para concluir a " +"integração.\n" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7995,180 +8343,184 @@ msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -"Introduza uma mensagem de commit, explicando por que este merge é " +"Introduza uma mensagem de commit, explicando por que esta integração é " "necessário,\n" -"sobretudo se incorpora um ramo a montante atualizado, com um ramo tópico.\n" +"sobretudo se incorpora um ramo a montante atualizado, num ramo tópico.\n" "\n" -"Linhas começadas com '%c' são ignoradas, e uma mensagem vazia\n" +"Linhas começadas com '%c' são ignoradas e uma mensagem vazia\n" "aborta o commit.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "Mensagem de commit vazia." -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "Maravilhoso.\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -"Falha ao realizar merge automático; corrija os conflitos e faça commit do " +"Falha ao realizar integração automática; corrija os conflitos e submeta o " "resultado.\n" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "'%s' não é um commit" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "Nenhum ramo atual." -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "Não há um remoto para o ramo atual." -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "Não está definido nenhum ramo a montante para o ramo atual." -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" -msgstr "Nenhum ramo remoto seguido por %s de %s" +msgstr "Nenhum ramo de monitorização remoto seguido por %s de %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "não foi possível fechar '%s'" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "Não há nenhum merge para abortar (MERGE_HEAD não presente)." +msgstr "Não há nenhuma integração para se abortar (MERGE_HEAD não presente)." -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -"Merge não concluído (MERGE_HEAD presente).\n" -"Faça commit das suas alterações antes de realizar merge." +"Não concluiu a integração (MERGE_HEAD presente).\n" +"Submeta as suas alterações antes de integrar." -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" "Cherry-pick não concluído (CHERRY_PICK_HEAD presente).\n" -"Faça commit das suas alterações antes de realizar merge." +"Submeta as suas alterações antes de integrar." -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Cherry-pick não concluído (CHERRY_PICK_HEAD presente)." -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "Não é possível combinar --squash e --no-ff." -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Nenhum commit especificado e merge.defaultToUpstream não definido." -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "Esmagar um commit numa cabeça vazia ainda não é suportado" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -"Não faz sentido efetuar commit não suscetível a avanço rápido, numa cabeça " +"Não faz sentido submeter de modo não suscetível a avanço rápido, numa cabeça " "vazia" -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" -msgstr "%s - não é algo suscetível a merge" +msgstr "%s - não é algo se possa integrar" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" -msgstr "Só é possível realizar merge de exatamente um commit numa cabeça vazia" +msgstr "Só se pode integrar exatamente um commit numa cabeça vazia" -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "A assinatura GPG do commit %s, alegadamente assinada por %s, não é de " "confiança." -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "A assinatura GPG do commit %s, alegadamente assinada por %s, está incorreta." -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "O commit %s não tem uma assinatura GPG." -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "A assinatura GPG do commit %s por %s está correta\n" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "integração de históricos não relacionados recusada" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "A atualizar %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" -msgstr "A tentar merge mesmo trivial no interior do índice...\n" +msgstr "A tentar integração mesmo trivial no interior do índice...\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "Não.\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "Não é possível avançar rapidamente, a abortar." -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "A recuar a árvore ao seu estado original...\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" -msgstr "A tentar a estratégia de merge %s...\n" +msgstr "A tentar a estratégia de integração %s...\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" -msgstr "Nenhuma estratégia de merge conseguiu processar o merge.\n" +msgstr "Nenhuma estratégia de integração conseguiu processar a integração.\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" -msgstr "Falha ao realizar merge com a estratégia %s.\n" +msgstr "Falha ao integrar com a estratégia %s.\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "A usar %s para preparar resolução manual.\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -"O merge automático foi bem sucedido; interrompido antes de realizar commit " -"como pretendido\n" +"A integração automática foi bem sucedida; interrompida antes de submeter " +"como solicitado\n" #: builtin/merge-base.c:29 msgid "git merge-base [-a | --all] <commit> <commit>..." @@ -8196,7 +8548,7 @@ msgstr "mostrar todos os antecessores" #: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" -msgstr "encontrar antecessores de um único merge com n pontos" +msgstr "encontrar antecessores de uma única integração com n pontos" #: builtin/merge-base.c:218 msgid "list revs not reachable from others" @@ -8209,7 +8561,7 @@ msgstr "o primeiro é antecessor do segundo?" #: builtin/merge-base.c:222 msgid "find where <commit> forked from reflog of <ref>" msgstr "" -"descobrir aonde foi que o <commit> divergiu usando o reflog da <referência>" +"descobrir onde foi que o <commit> divergiu usando o reflog da <referência>" #: builtin/merge-file.c:8 msgid "" @@ -8225,7 +8577,7 @@ msgstr "enviar resultados para a saída padrão" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" -msgstr "usar merge baseado em diff3" +msgstr "usar integração baseada em diff3" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" @@ -8274,12 +8626,12 @@ msgstr "git mv [<opções>] <origem>... <destino>" #: builtin/mv.c:70 #, fuzzy, c-format msgid "Directory %s is in index and no submodule?" -msgstr "O diretório %s está no índice mas não no submódulo?" +msgstr "O diretório %s está no índice mas não em nenhum submódulo?" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" -"Prepare as suas alterações em .gitmodules ou esconda-as (stash) para " +"Prepare as suas alterações em .gitmodules ou empilhe-as (stash) para " "prosseguir" #: builtin/mv.c:90 @@ -8356,48 +8708,48 @@ msgstr "%s, origem=%s, destino=%s" msgid "Renaming %s to %s\n" msgstr "A mudar de nome de %s para %s\n" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "falha ao mudar o nome de '%s'" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opções>] <commit>..." -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opções>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opções>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "imprimir apenas nomes (sem SHA-1)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "usar apenas tags para designar commits" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "usar apenas referência que correspondam ao <padrão>" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "listar todos os commits alcançáveis a partir de todas as referências" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "ler da entrada padrão" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "permitir imprimir nomes 'indefinidos' (predefinição)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "desreferenciar tags na entrada (uso interno)" @@ -8505,7 +8857,7 @@ msgstr "git notes remove [<objeto>]" #: builtin/notes.c:84 msgid "git notes prune [<options>]" -msgstr "git notes prune [<optções>]" +msgstr "git notes prune [<opções>]" #: builtin/notes.c:89 msgid "git notes get-ref" @@ -8543,24 +8895,16 @@ msgstr "não é possível escrever o objeto de nota" msgid "The note contents have been left in %s" msgstr "O conteúdo da nota foi guardado em %s" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "não é possível ler '%s'" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "não foi possível abrir ou ler '%s'" -#: 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:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Falha ao resolver '%s' numa referência válida." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8573,7 +8917,7 @@ msgstr "Não é possível ler os dados da nota de um objeto não-blob '%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:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "demasiados parâmetros" @@ -8620,7 +8964,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "A substituir as notas existentes do objeto %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "A remover a nota do objeto %s\n" @@ -8660,65 +9004,65 @@ msgstr "" "As opções -m/-F/-c/-C são obsoletas no subcomando 'edit'.\n" "Use 'git notes add -f -m/-F/-c/-C' em seu lugar.\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "Opções gerais" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" -msgstr "Opções de merge" +msgstr "Opções de integração" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -"resolver conflitos nas notas usando a estratégia indicada (manual/ours/" -"theirs/union/cat_sort_uniq)" +"resolver conflitos nas notas usando a estratégia indicada " +"(manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" -msgstr "Efetuar commit de notas não integradas" +msgstr "A submeter notas não integradas" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" -msgstr "concluir merge de notas, fazendo commit de notas não integradas" +msgstr "concluir integração de notas, submetendo notas não integradas" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" -msgstr "Abortar resoluções de merge das notas" +msgstr "A abortar resolução de integração das notas" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" -msgstr "abortar merge das notas" +msgstr "abortar integração das notas" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" -msgstr "Merge das notas em %s já está em curso em %s" +msgstr "Uma integração das notas em %s já está em curso em %s" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "O objeto %s não tem nenhuma nota\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "não considerar como erro a remoção de uma nota não existente" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "ler nome dos objetos da entrada padrão" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "notes-ref" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "usar notas de <notes-ref>" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "Subcomando desconhecido: %s" @@ -8742,171 +9086,177 @@ msgstr "" msgid "deflate error (%d)" msgstr "erro ao compactar (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "" +"a desativar escrita de mapa de bits, os pacotes são divididos devido a " +"pack.packSizeLimit" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "A escrever objetos" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "a desativar escrita de mapa de bits, visto que alguns objetos não estão a " "ser compactados" -#: builtin/pack-objects.c:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "A comprimir objetos" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "versão de índice %s não suportada" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "versão de índice '%s' incorreta" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "não mostrar medidor de progresso" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "mostrar medidor de progresso" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "mostrar medidor de progresso durante a fase de escrita de objetos" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "semelhante a --all-progress quando o medidor de progresso é mostrado" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "versão[,offset]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "" "escrever o ficheiro de índice do pacote na versão de formato especificada" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "tamanho máximo de cada ficheiro de pacote gerado" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" -msgstr "ignorar objetos emprestados do arquivo de objetos alternate" +msgstr "ignorar objetos emprestados do arquivo de objetos sobressalentes" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "ignorar objetos compactados" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "limitar a janela de compactação por objetos" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "" "limitar a janela de compactação por memória em adição ao limite por objetos" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2619 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "tamanho máximo de cadeias delta permitidas no pacote resultante" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "reutilizar deltas existentes" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 msgid "use threads when searching for best delta matches" msgstr "usar threads ao procurar pela melhor correspondência delta" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "não criar um pacote vazio" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "ler argumentos de revisão da entrada padrão" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 msgid "limit the objects to those that are not yet packed" msgstr "restringir-se aos objetos que ainda não foram compactados" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "incluir objetos alcançáveis a partir de qualquer referência" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "incluir objetos referenciados por entradas do reflog" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "incluir objetos referenciados pelo índice" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "gerar pacote para a saída padrão" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "incluir objetos tag que refiram objetos a compactar" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "manter objetos inalcançáveis" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "hora" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "descompactar objetos inalcançáveis mais recentes que <hora>" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "criar pacotes finos" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "criar pacotes adequados para obter em repositórios pouco profundos" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "ignorar pacotes que tenham um ficheiro .keep" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "nível de compactação do pacote" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "não esconder commits introduzidos por enxertos" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usar um índice de mapa de bits se disponível, para acelerar a contagem de " "objetos" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "escrever um índice de mapa de bits juntamente com o índice do pacote" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "A contar objetos" @@ -8934,15 +9284,15 @@ msgstr "A remover objetos duplicados" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <hora>] [--] [<head>...]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "não remover, mostrar apenas" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "apresentar objetos eliminados" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "expirar objetos mais antigos que <hora>" @@ -8954,50 +9304,53 @@ msgstr "não é possível limpar num repositório de objetos-preciosos" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<opções>] [<repositório> [<especificador-de-referência>...]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" -msgstr "Opções relacionadas com merge" +msgstr "Opções relativas a integração" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" -msgstr "incorporar alterações por rebase em vez de merge" +msgstr "incorporar alterações por rebase em vez de integrar" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "permitir avanço rápido" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "verificar se o commit tem uma assinatura GPG válida" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "empilhar/desempilhar automaticamente antes de depois de rebase" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "Opções relacionadas com obtenção de objetos" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" -msgstr "número de submódulos obtidos em paralelo" +msgstr "número de submódulos puxados em paralelo" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valor inválido de pull.ff: %s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "Não é possível efetuar pull com rebase: tem alterações não preparadas." +msgstr "Não é possível puxar com rebase: tem alterações não preparadas." -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." -msgstr "Além disso, o índice contém alterações pendentes para commit." +msgstr "Além disso, o índice contém alterações não submetidas." -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" -"Não é possível efetuar pull com rebase: o índice contém alterações pendentes " -"para commit." +"Não é possível puxar com rebase: o índice contém alterações não submetidas." -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9005,14 +9358,14 @@ msgstr "" "Não há nenhum candidato com o qual realizar rebase de entre as referências " "que se acabaram de obter." -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -"Não há nenhum candidato com o qual realizar merge de entre as referências " -"que se acabaram obter." +"Não há nenhum candidato com o qual integrar de entre as referências que se " +"acabaram obter." -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -9020,64 +9373,74 @@ msgstr "" "Geralmente, significa que forneceu um especificador de referência\n" "com um carácter universal (wildcard) que não corresponde a nenhum remoto." -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" "a branch. Because this is not the default configured remote\n" "for your current branch, you must specify a branch on the command line." msgstr "" -"Solicitou pull do remoto '%s', mas não especificou um ramo.\n" -"Uma vez que este não é o remoto configurado por omissão,\n" -"deve especificar um ramo na linha de comandos." +"Solicitou puxar o remoto '%s', mas não especificou um ramo.\n" +"Uma vez que este não é o remoto configurado por predefinição\n" +"do ramo atual, deve especificar um ramo na linha de comandos." -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Não se encontra em nenhum ramo de momento." -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Especifique o ramo sobre o qual pretende realizar rebase." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." -msgstr "Especifique o ramo com o qual pretende realizar merge." +msgstr "Especifique o ramo com o qual pretende integrar." -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "Consulte git-pull(1) para obter mais detalhes." -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<remoto>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<ramo>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "O ramo atual não segue nenhum ramo." -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" msgstr "" -"Se deseja definir um ramo para este ramo seguir, pode fazê-lo com:\n" -"\n" -" git branch --set-upstream-to=%s/<ramo> %s\n" +"Se deseja definir o ramo que deve ser seguido por este ramo, pode fazê-lo " +"com:" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" -"A configuração indica para efetuar merge com a referência '%s'\n" -"do remoto, mas esta ainda não foi obtida." +"A configuração indica para integrar com a referência '%s'\n" +"do remoto, mas aquela referência não foi obtida." + +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "a opção --[no-]autostash só é válida com --rebase." -#: builtin/pull.c:841 +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "" "A atualizar um ramo que ainda não foi criado e com alterações adicionadas ao " "índice." -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9088,7 +9451,7 @@ msgstr "" "a avançar a árvore de trabalho a partir do\n" "commit %s." -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9105,11 +9468,11 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." -msgstr "Não é possível efetuar merge de múltiplos ramos numa cabeça vazia." +msgstr "Não é possível integrar múltiplos ramos numa cabeça vazia." -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "Não é possível efetuar rebase sobre múltiplos ramos." @@ -9189,8 +9552,7 @@ msgstr "" #: builtin/push.c:183 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." -msgstr "" -"O ramo atual %s tem múltiplos ramos a montante, recusando-se a publicar." +msgstr "O ramo atual %s tem múltiplos ramos a montante, publicação recusada." #: builtin/push.c:186 #, c-format @@ -9403,10 +9765,10 @@ msgid "" "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" -"prefix=<prefixo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-" -"sparse-checkout] [--index-output=<ficheiro>] (--empty | <árvore1> [<árvore2> " -"[<árvore3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefixo>)" +" [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] " +"[--index-output=<ficheiro>] (--empty | <árvore-etc1> [<árvore-etc2> [<árvore-" +"etc3>]])" #: builtin/read-tree.c:110 msgid "write resulting index to <file>" @@ -9418,21 +9780,21 @@ msgstr "apenas esvaziar o índice" #: builtin/read-tree.c:115 msgid "Merging" -msgstr "A realizar merge" +msgstr "A integrar" #: builtin/read-tree.c:117 msgid "perform a merge in addition to a read" -msgstr "realizar um merge em adição a uma leitura" +msgstr "realizar uma integração em adição a uma leitura" #: builtin/read-tree.c:119 msgid "3-way merge if no file level merging required" msgstr "" -"realizar merge com 3 pontos se o merge ao nível dos ficheiros não for " -"necessário" +"integrar com 3 pontos se a integração ao nível de ficheiros não for " +"necessária" #: builtin/read-tree.c:121 msgid "3-way merge in presence of adds and removes" -msgstr "realizar merge com 3 ponto na presença de adições e remoções" +msgstr "integrar com 3 ponto na presença de adições e remoções" #: builtin/read-tree.c:123 msgid "same as -m, but discard unmerged entries" @@ -9448,7 +9810,7 @@ msgstr "ler a árvore em <subdiretório>/ para o índice" #: builtin/read-tree.c:128 msgid "update working tree with merge result" -msgstr "atualizar a árvore de trabalho com os resultados do merge" +msgstr "atualizar a árvore de trabalho com os resultados da integração" #: builtin/read-tree.c:130 msgid "gitignore" @@ -9460,7 +9822,7 @@ msgstr "permitir que os ficheiros explicitamente ignorados sejam substituídos" #: builtin/read-tree.c:134 msgid "don't check the working tree after merging" -msgstr "não verificar a árvore de trabalho depois de efetuar merge" +msgstr "não verificar a árvore de trabalho depois de integrar" #: builtin/read-tree.c:135 msgid "don't update the index or the work tree" @@ -9474,6 +9836,18 @@ msgstr "ignorar a aplicação do filtro de extração esparsa" msgid "debug unpack-trees" msgstr "depurar unpack-trees" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <git-dir>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "silencioso" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "Deve especificar um diretório." + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9493,8 +9867,8 @@ msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <ramo>] [-m <master>] [-f] [--tags | --no-tags] [--" -"mirror=<fetch|push>] <nome> <url>" +"git remote add [-t <ramo>] [-m <mestre>] [-f] [--tags | --no-tags] " +"[--mirror=<fetch|push>] <nome> <url>" #: builtin/remote.c:14 builtin/remote.c:34 msgid "git remote rename <old> <new>" @@ -9733,7 +10107,7 @@ msgstr "realiza rebase interativo sobre %s do remoto" #: builtin/remote.c:971 #, c-format msgid " merges with remote %s" -msgstr " realiza merge com %s do remoto" +msgstr " integra com %s do remoto" #: builtin/remote.c:972 msgid " and with remote" @@ -9742,7 +10116,7 @@ msgstr " e com o remoto" #: builtin/remote.c:974 #, c-format msgid "merges with remote %s" -msgstr "realiza merge com %s do remoto" +msgstr "integra com %s do remoto" #: builtin/remote.c:975 msgid " and with remote" @@ -9802,176 +10176,178 @@ msgstr "* remoto %s" msgid " Fetch URL: %s" msgstr " Obter do URL: %s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(nenhum URL)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " Publicar no URL: %s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " Ramo HEAD: %s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " Ramo HEAD (o remoto HEAD é ambíguo, pode ser um dos seguintes):\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Ramo remoto:%s" msgstr[1] " Ramos remotos:%s" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (estado não consultado)" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Ramo local configurado para 'git pull':" msgstr[1] " Ramos locais configurados para 'git pull':" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " Referências locais serão refletidas (mirror) por 'git push'" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Referência local configurada para 'git push'%s:" msgstr[1] " Referências locais configuradas para 'git push'%s:" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "definir refs/remotes/<nome>/HEAD de acordo com o remoto" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "eliminar refs/remotes/<nome>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "Não é possível determinar o remoto HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Múltiplos ramos HEAD remotos. Escolha um explicitamente com:" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "Não foi possível eliminar %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "Referência inválida: %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "Não foi possível configurar %s" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s ficará suspenso!" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s ficou suspenso!" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "A eliminar %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [eliminaria] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [eliminado] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "eliminar remotos depois de obter" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Remoto inexistente '%s'" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "adicionar ramo" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "nenhum remoto especificado" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "consultar URLs de publicação em vez de URLs utilizados para obter" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "retornar todos os URLs" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "o remoto '%s' não tem nenhum URL configurado" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "manipular URLs de publicação" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "adicionar URL" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "eliminar URLs" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete não faz sentido" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Padrão de URL antigo inválido: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "URL não encontrado: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "Não é possível remover todos os URLs de não publicação" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "ser verboso; deve ser colocado antes de um subcomando" @@ -10087,7 +10463,7 @@ msgstr "mergetag incorreta no commit '%s'" #: builtin/replace.c:357 #, c-format msgid "malformed mergetag in commit '%s'" -msgstr "mergetag malformada no commit '%s' " +msgstr "mergetag malformada no commit '%s'" #: builtin/replace.c:368 #, c-format @@ -10105,12 +10481,12 @@ msgstr "o commit original '%s' tem uma assinatura gpg." #: builtin/replace.c:402 msgid "the signature will be removed in the replacement commit!" -msgstr "a assinatura será removida do commit substituto!" +msgstr "a assinatura será removida do commit suplente!" #: builtin/replace.c:408 #, c-format msgid "could not write replacement commit for: '%s'" -msgstr "não foi possível escrever o commit substituto de: '%s'" +msgstr "não foi possível escrever o commit suplente de: '%s'" #: builtin/replace.c:432 msgid "list replace refs" @@ -10157,11 +10533,11 @@ msgstr "" #: builtin/reset.c:27 msgid "git reset [-q] <tree-ish> [--] <paths>..." -msgstr "git reset [-q] <árvore> [--] <caminhos>..." +msgstr "git reset [-q] <árvore-etc> [--] <caminhos>..." #: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<árvore>] [--] [<caminhos>...]" +msgstr "git reset --patch [<árvore-etc>] [--] [<caminhos>...]" #: builtin/reset.c:34 msgid "mixed" @@ -10204,7 +10580,7 @@ msgstr "HEAD está agora em %s" #: builtin/reset.c:183 #, c-format msgid "Cannot do a %s reset in the middle of a merge." -msgstr "Não é possível repor de modo %s durante um merge." +msgstr "Não é possível repor de modo %s durante uma integração." #: builtin/reset.c:276 msgid "be quiet, only report errors" @@ -10286,7 +10662,7 @@ msgstr "git rev-parse --parseopt [<opções>] -- [<argumentos>...]" #: builtin/rev-parse.c:363 msgid "keep the `--` passed as an arg" -msgstr "Conservar '--' passado como argumento" +msgstr "conservar '--' passado como argumento" #: builtin/rev-parse.c:365 msgid "stop parsing after the first non-option argument" @@ -10313,7 +10689,7 @@ msgstr "" #: builtin/revert.c:22 msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [<opções>] <commit-ish>..." +msgstr "git revert [<opções>] <commit-etc>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" @@ -10321,7 +10697,7 @@ msgstr "git revert <subcommando>" #: builtin/revert.c:28 msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [<opções>] <commit-ish>..." +msgstr "git cherry-pick [<opções>] <commit-etc>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -10346,7 +10722,7 @@ msgstr "cancelar reversão ou cherry-pick" #: builtin/revert.c:83 msgid "don't automatically commit" -msgstr "não efetuar commit automaticamente" +msgstr "não submeter automaticamente" #: builtin/revert.c:84 msgid "edit the commit message" @@ -10358,7 +10734,7 @@ msgstr "número de pai" #: builtin/revert.c:89 msgid "merge strategy" -msgstr "estratégia de merge" +msgstr "estratégia de integração" #: builtin/revert.c:90 msgid "option" @@ -10366,7 +10742,7 @@ msgstr "opção" #: builtin/revert.c:91 msgid "option for merge strategy" -msgstr "opção de estratégia de merge" +msgstr "opção de estratégia de integração" #: builtin/revert.c:104 msgid "append commit name" @@ -10420,7 +10796,7 @@ msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" "\n" -"(use 'rm -rf' se quer mesmo removê-lo, incluindo todo o seu histórico)" +"(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)" #: builtin/rm.c:230 msgid "" @@ -10484,12 +10860,6 @@ msgstr "permitir remoção recursiva" msgid "exit with a zero status even if nothing matched" msgstr "sair com valor zero mesmo quando não há correspondência" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"Prepare as suas alterações em .gitmodules ou esconda-as (stash) para " -"prosseguir" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10531,8 +10901,7 @@ msgstr "imprimir estado do programa auxiliar remoto" #: builtin/shortlog.c:13 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" -msgstr "" -"git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]" +msgstr "git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]" #: builtin/shortlog.c:242 msgid "sort output according to the number of commits per author" @@ -10572,11 +10941,11 @@ msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referência>]" #: builtin/show-branch.c:640 msgid "show remote-tracking and local branches" -msgstr "mostrar os ramos remotos seguidos e os ramos locais" +msgstr "mostrar os ramos de monitorização remotos e os ramos locais" #: builtin/show-branch.c:642 msgid "show remote-tracking branches" -msgstr "mostrar os ramos remotos seguidos" +msgstr "mostrar os ramos de monitorização remotos" #: builtin/show-branch.c:644 msgid "color '*!+-' corresponding to the branch" @@ -10604,7 +10973,7 @@ msgstr "designar commits pelos seus nomes de objeto" #: builtin/show-branch.c:655 msgid "show possible merge bases" -msgstr "mostrar possíveis bases de merge" +msgstr "mostrar possíveis bases de integração" #: builtin/show-branch.c:657 msgid "show refs unreachable from any other ref" @@ -10620,7 +10989,7 @@ msgstr "mostrar apenas commits não presentes no primeiro ramo" #: builtin/show-branch.c:664 msgid "show merges reachable from only one tip" -msgstr "mostrar merges alcançáveis a partir duma única ponta" +msgstr "mostrar integrações alcançáveis a partir duma única ponta" #: builtin/show-branch.c:666 msgid "topologically sort, maintaining date order where possible" @@ -10640,8 +11009,8 @@ msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<padrão>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | " +"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<padrão>...]" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=<pattern>]" @@ -10698,84 +11067,183 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "preceder cada linha com um carácter de comentário e um espaço" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "Referência inexistente: %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "Esperava-se um nome completo de uma referência, obteve-se %s" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "não é possível tirar um componente do URL '%s'" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "âncora alternativa para caminhos relativos" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "Falha ao registar o URL do caminho de submódulo '%s'" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "Submódulo '%s' (%s) registado com caminho '%s'\n" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "aviso: modo de atualização do comando sugerido para o submódulo '%s'\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "Suprimir a saída ao inicializar um submódulo" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<caminho>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <caminho>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "nenhum mapeamento de submódulo do caminho '%s' encontrado em .gitmodules" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "sítio para aonde o novo submódulo será clonado" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "nome do novo submódulo" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "url donde clonar o submódulos" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "profundidade de clones rasos" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference " -"<repositório>] [--name <nome>] [--url <url>][--depth <profundidade>] [--] " -"[<caminho>...]" +"<repositório>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "não foi possível criar o diretório '%s'" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" -msgstr "falha ao clonar '%s' no caminho do submódulo '%s'" +msgstr "falha ao clonar '%s' no caminho de submódulo '%s'" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "não é possível abrir o ficheiro '%s'" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "não é possível fechar o ficheiro %s" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" -msgstr "não foi possível obter o o diretório do submódulo de '%s'" +msgstr "não foi possível obter o diretório do submódulo de '%s'" + +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "Caminho de submódulo '%s' não inicializado" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "Pretendia usar 'update --init'?" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "A ignorar submódulo %s não integrado" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "A ignorar submódulo '%s'" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "caminho para a árvore de trabalho" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" msgstr "" -"fatal: o subcomando submodule--helper deve ser invocado com um subcomando" +"caminho para a árvore de trabalho, atravessando limites de submódulos " +"aninhados" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "rebase, merge, checkout ou none" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "criar um clone raso, truncado ao número especificado de revisões" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "trabalhos em paralelo" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "não imprimir progresso da clonagem" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "valor incorreto no parâmetro update" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "o subcomando submodule--helper deve ser invocado com um subcomando" + +#: builtin/submodule--helper.c:862 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "fatal: '%s' não é um subcomando de submodule--helper válido" +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "'%s' não é um subcomando válido de submodule--helper" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10830,27 +11298,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <nome-da-tag>..." -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "o nome da tag é demasiado longo: %.*s..." -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "tag '%s' não encontrada." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tag '%s' eliminada (era %s)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "não foi possível validar a tag '%s'" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10863,7 +11326,7 @@ msgstr "" " %s\n" "Linha começadas com '%c' serão ignoradas.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10960,11 +11423,11 @@ msgstr "imprimir apenas tags que contenham o commit" #: builtin/tag.c:364 msgid "print only tags that are merged" -msgstr "imprimir apenas as tags que foram incorporadas" +msgstr "imprimir apenas as tags que foram integradas" #: builtin/tag.c:365 msgid "print only tags that are not merged" -msgstr "imprimir apenas as tags que não foram incorporadas" +msgstr "imprimir apenas as tags que não foram integradas" #: builtin/tag.c:370 msgid "print only tags of the object" @@ -10994,21 +11457,21 @@ msgstr "as opções --merged e --no-merged só são permitidas com -l" msgid "only one -F or -m option is allowed." msgstr "só é permitido um opção -F ou -m." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "demasiado parâmetros" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' não é um nome de tag válido." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "a tag '%s' já existe" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' atualizada (era %s)\n" @@ -11025,7 +11488,7 @@ msgstr "falha ao criar o diretório %s" #: builtin/update-index.c:85 #, c-format msgid "failed to stat %s" -msgstr "falha ao efetuar stat de %s" +msgstr "falha ao invocar stat de %s" #: builtin/update-index.c:95 #, c-format @@ -11040,7 +11503,7 @@ msgstr "falha ao eliminar o ficheiro %s" #: builtin/update-index.c:110 builtin/update-index.c:212 #, c-format msgid "failed to delete directory %s" -msgstr "falha ao criar o diretório %s" +msgstr "falha ao eliminar o diretório %s" #: builtin/update-index.c:133 #, c-format @@ -11109,7 +11572,7 @@ msgstr "avisar sobre ficheiros que faltem na árvore de trabalho" #: builtin/update-index.c:942 msgid "refresh even if index contains unmerged entries" -msgstr "refrescar mesmo que o índice contenha entradas não incorporadas" +msgstr "refrescar mesmo que o índice contenha entradas não integradas" #: builtin/update-index.c:945 msgid "refresh stat information" @@ -11272,7 +11735,7 @@ msgstr "git verify-commit [-v | --verbose] <commit>..." msgid "print commit contents" msgstr "imprimir conteúdo do commit" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "imprimir informação do gpg em bruto" @@ -11292,7 +11755,7 @@ msgstr "mostrar apenas estatísticas" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <tag>..." -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "imprimir conteúdo da tag" @@ -11308,71 +11771,75 @@ msgstr "git worktree prune [<opções>]" msgid "git worktree list [<options>]" msgstr "git worktree list [<opções>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "A remover worktrees/%s: diretório inválido" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "A remover worktrees/%s: o ficheiro gitdir não existe" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "A remover worktrees/%s: não é possível ler o ficheiro gitdir (%s)" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "A remover worktrees/%s: ficheiro gitdir inválido" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "A remover worktrees/%s: o ficheiro gitdir aponta para uma localização " "inexistente" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "falha ao remover: %s" +msgid "failed to remove '%s'" +msgstr "falha ao remover '%s'" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "'%s' já existe" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "não foi possível criar o diretório de '%s'" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "A preparar %s (identificador %s)" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "extrair o <ramo> mesmo se já tenha sido extraído noutra árvore de trabalho" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "criar um novo ramo" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "criar ou repor um ramo" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "destacar HEAD no commit indicado" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "povoar a nova árvore de trabalho" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B e --detach são mutuamente exclusivos" @@ -11392,7 +11859,7 @@ msgstr "escrever objeto árvore do subdiretório <prefixo>" msgid "only useful for debugging" msgstr "apenas útil para depuração" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "imprimir mensagens de depuração no stderr" @@ -11406,9 +11873,9 @@ msgstr "" "guias de conceitos. Consulte 'git help <comando>' ou 'git help <conceito>'\n" "para ler sobre um subcomando ou conceito específico." -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" -msgstr "" +msgstr "Não é suportado afixar chaves públicas com cURL < 7.44.0" #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" @@ -11473,7 +11940,7 @@ msgstr "Criar um repositório Git vazio ou reinicializar um já existente" #: common-cmds.h:27 msgid "Show commit logs" -msgstr "Mostrado logs de commits" +msgstr "Mostrar histórico de commits" #: common-cmds.h:28 msgid "Join two or more development histories together" @@ -11535,7 +12002,7 @@ msgstr "ser mais silencioso" msgid "use <n> digits to display SHA-1s" msgstr "usar <n> dígitos para mostrar SHA-1s" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "" "atualizar o índice com resoluções de conflitos reutilizadas se possível" @@ -11569,12 +12036,11 @@ msgstr "HEAD incorreta - é necessário uma HEAD" #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." -msgstr "" -"Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'." +msgstr "Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'." #: git-bisect.sh:178 msgid "won't bisect on cg-seek'ed tree" -msgstr "não é possível bisseccionar numa árvore \"cg-seek'ed\"" +msgstr "não é possível bissetar numa árvore \"cg-seek'ed\"" #: git-bisect.sh:182 msgid "Bad HEAD - strange symbolic ref" @@ -11607,7 +12073,7 @@ msgstr "'git bisect $TERM_BAD' só leva um argumento." #: git-bisect.sh:322 #, sh-format msgid "Warning: bisecting only with a $TERM_BAD commit." -msgstr "Aviso: a bisseccionar só com um commit $TERM_BAD." +msgstr "Aviso: a bissetar só com um commit $TERM_BAD." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input @@ -11638,7 +12104,7 @@ msgstr "" #: git-bisect.sh:414 git-bisect.sh:546 msgid "We are not bisecting." -msgstr "Não estamos a bisseccionar." +msgstr "Não se está a bissetar." #: git-bisect.sh:421 #, sh-format @@ -11678,12 +12144,12 @@ msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -"falha bisseccionar:\n" +"falha ao bissetar:\n" "código de saída $res de '$command' é < 0 ou >= 128" #: git-bisect.sh:525 msgid "bisect run cannot continue any more" -msgstr "não é possível continuar a bisseccionar" +msgstr "não é possível continuar a bissetar" #: git-bisect.sh:531 #, sh-format @@ -11691,7 +12157,7 @@ msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" -"falha ao bisseccionar:\n" +"falha ao bissetar:\n" "'bisect_state $state' retornou com o código de erro $res" #: git-bisect.sh:538 @@ -11721,7 +12187,7 @@ msgstr "não é possível alterar o significado do termo '$term'" #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" -"Comando inválido: bissecção em curso usando os termo $TERM_BAD/$TERM_GOOD." +"Comando inválido: está-se a bissetar usando os termos $TERM_BAD/$TERM_GOOD." #: git-bisect.sh:636 msgid "no terms defined" @@ -11748,63 +12214,59 @@ msgstr "" "Para extrair o ramo original e interromper o rebase, execute \"git rebase --" "abort\"." -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." -msgstr "Autostash aplicado." +msgstr "Pilha automática (autostash) aplicada." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Não é possível guardar $stash_sha1" -#: git-rebase.sh:169 +#: git-rebase.sh:172 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 "" -"Surgiram conflitos ao aplicar autostash.\n" -"As suas alterações estão guardadas no stash.\n" +"Surgiram conflitos ao aplicar a pilha automática (autostash).\n" +"As suas alterações estão guardadas na pilha.\n" "Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Rebase recusado pelo hook pre-rebase." -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Parece que o git-am está em curso. Não é possível efetuar rebase." -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "A opção --exec deve ser usada com a opção --interactive" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Rebase não está em curso?" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo." -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Não é possível ler HEAD" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -"Deve editar todos os conflitos do merge e\n" -"marcá-los como resolvidos usando git add" +"Deve editar todos os conflitos da integração\n" +"e marcá-los como resolvidos usando git add" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "Não foi possível voltar para $head_name" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11825,65 +12287,65 @@ msgstr "" "e execute o comando de novo. A execução foi interrompida no caso de\n" "ainda ter algo importante nesse sítio." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "$upstream_name a montante inválido" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" -msgstr "$onto_name: há mais do que uma base de merge" +msgstr "$onto_name: há mais do que uma base de integração" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" -msgstr "$onto_name: não há nenhuma base de merge" +msgstr "$onto_name: não há nenhuma base de integração" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Não aponta para um commit válido: $onto_name" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal: ramo inexistente: $branch_name" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" -msgstr "Não é possível efetuar autostash" +msgstr "Não é possível empilhar automaticamente (autostash)" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" -msgstr "Autostash criado: $stash_abbrev" +msgstr "Pilha automática (autostash) criada: $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." -msgstr "Faça commit ou stash delas." +msgstr "Submeta ou empilhe-as (stash)." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "O ramo atual $branch_name está atualizado." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "O ramo atual $branch_name está atualizado, rebase forçado." -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Alterações de $mb para $onto:" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Primeiro, a recuar a cabeça para replicar as suas alterações no topo desta..." -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name avançado rapidamente para $onto_name." @@ -11946,7 +12408,7 @@ msgstr "Não há alterações locais para guardar" #: git-stash.sh:264 msgid "Cannot initialize stash" -msgstr "Não é possível inicializar o stash" +msgstr "Não é possível inicializar a pilha" #: git-stash.sh:268 msgid "Cannot save the current status" @@ -11963,7 +12425,7 @@ msgstr "opção desconhecido: $opt" #: git-stash.sh:415 msgid "No stash found." -msgstr "Nenhum stash encontrado." +msgstr "Nenhuma pilha encontrada." #: git-stash.sh:422 #, sh-format @@ -11978,12 +12440,12 @@ msgstr "$reference não é uma referência válida" #: git-stash.sh:456 #, sh-format msgid "'$args' is not a stash-like commit" -msgstr "'$args' não é um commit do tipo stash" +msgstr "'$args' não é um commit semelhante a pilha" #: git-stash.sh:467 #, sh-format msgid "'$args' is not a stash reference" -msgstr "'$args' não é uma referência de stash" +msgstr "'$args' não é uma referência de pilha" #: git-stash.sh:475 msgid "unable to refresh index" @@ -11991,7 +12453,7 @@ msgstr "não foi possível refrescar o índice" #: git-stash.sh:479 msgid "Cannot apply a stash in the middle of a merge" -msgstr "Não é possível aplicar um stash durante um merge" +msgstr "Não é possível aplicar uma pilha durante uma integração" #: git-stash.sh:487 msgid "Conflicts in index. Try without --index." @@ -12003,7 +12465,7 @@ msgstr "Não foi possível guardar árvore do índice" #: git-stash.sh:523 msgid "Cannot unstage modified files" -msgstr "Não é possível retirar os ficheiros modificado do índice" +msgstr "Não é possível despreparar os ficheiros modificado" #: git-stash.sh:538 msgid "Index was not unstashed." @@ -12017,7 +12479,7 @@ msgstr "A descartar ${REV} ($s)" #: git-stash.sh:562 #, sh-format msgid "${REV}: Could not drop stash entry" -msgstr "${REV}: Não foi possível descartar elemento do stash" +msgstr "${REV}: Não foi possível descartar elemento da pilha" #: git-stash.sh:570 msgid "No branch name specified" @@ -12027,28 +12489,23 @@ msgstr "Nenhum nome de ramo especificado" msgid "(To restore them type \"git stash apply\")" msgstr "(Para os restaurar execute \"git stash apply\")" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "não é possível tirar um componente do URL '$remoteurl'" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Os caminhos relativos só podem ser usados a partir do topo da árvore de " "trabalho" -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL do repositório: '$repo' deve ser absoluto ou começar com ./|../" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' já existe no índice" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12059,255 +12516,280 @@ msgstr "" "$sm_path\n" "Use -f se pretende mesmo adicioná-lo." -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "A adicionar repositório existente em '$sm_path' ao índice" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' já existe e não é uma repositório git válido" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Um diretório git de '$sm_name' foi encontrado localmente com os remotos:" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "" "Se deseja reutilizar este diretório git local em vez de clonar de novo de" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" "use a opção '--force'. Se o diretório git local não é o repositório correto" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -"ou não tem a certeza do que isto significa, escolha outro nome com a opção " -"'--name'." +"ou se não tem a certeza do que isto significa, escolha outro nome com a " +"opção '--name'." -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "A reativar o diretório git local do submódulo '$sm_name'." -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Não foi possível extrair o submódulo '$sm_path'" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Falha ao adicionar o submódulo '$sm_path'" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Falha ao registar o submódulo '$sm_path'" -#: git-submodule.sh:417 +#: git-submodule.sh:355 #, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "A entrar em '$prefix$displaypath'" +msgid "Entering '$displaypath'" +msgstr "A entrar em '$displaypath'" -#: git-submodule.sh:437 +#: git-submodule.sh:375 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" -"Interrompido em '$prefix$displaypath'; o script retornou um valor diferente " -"de zero." - -#: git-submodule.sh:483 -#, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "Nenhum URL encontrado no submódulo '$displaypath' em .gitmodules" - -#: git-submodule.sh:492 -#, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "Falha ao registar o URL do submódulo '$displaypath'" - -#: git-submodule.sh:494 -#, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "Submódulo '$name' ($url) registado em '$displaypath'" +"Interrompido em '$displaypath'; o script retornou um valor diferente de zero." -#: git-submodule.sh:511 +#: git-submodule.sh:448 #, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "Falha ao registar o modo de atualização do submódulo em '$displaypath'" +msgid "pathspec and --all are incompatible" +msgstr "especificador de caminho e --all são incompatíveis" -#: git-submodule.sh:549 +#: git-submodule.sh:453 #, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "Use '.' se pretende mesmo anular a inicialização todos os submódulos" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "" +"Use '--all' se pretende mesmo anular a inicialização todos os submódulos" -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" -"A árvore de trabalho do submódulo em '$displaypath' contém um diretório .git" +"A árvore de trabalho do submódulo '$displaypath' contém um diretório .git" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" "(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "" -"A árvore de trabalho do submódulo em '$displaypath' contém alterações " -"locais; use '-f' para as descartar" +"A árvore de trabalho do submódulo '$displaypath' contém alterações locais; " +"use '-f' para as descartar" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Diretório '$displaypath' limpo" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" -"Não foi possível remover a árvore de trabalho do submódulo em '$displaypath'" +"Não foi possível remover a árvore de trabalho do submódulo '$displaypath'" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Não foi possível criar o diretório vazio do submódulo '$displaypath'" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "O registo do submódulo '$name' ($url) foi removido do caminho '$displaypath'" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"Submódulo em '$displaypath' não inicializado\n" -"Talvez queira usar 'update --init'?" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -"Não foi possível encontrar a revisão atual no submódulo em '$displaypath'" +"Não foi possível encontrar a revisão atual no caminho de submódulo " +"'$displaypath'" -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" -msgstr "Não foi possível obter no submódulo '$sm_path'" +msgstr "Não foi possível obter no caminho de submódulo '$sm_path'" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" -msgstr "Não é possível obter no submódulo '$displaypath'" +msgstr "Não é possível obter no caminho de submódulo '$displaypath'" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" -msgstr "Não foi possível extrair '$sha1' no submódulo em '$displaypath'" +msgstr "Não é possível extrair '$sha1' no caminho de submódulo '$displaypath'" -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" -msgstr "Submódulo em '$displaypath': '$sha1' extraído" +msgstr "Caminho de submódulo '$displaypath': '$sha1' extraído" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -"Não foi possível efetuar rebase de '$sha1' no submódulo em '$displaypath'" +"Não foi possível efetuar rebase de '$sha1' no caminho de submódulo " +"'$displaypath'" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" -msgstr "Submódulo em '$displaypath': rebase concluído em '$sha1'" +msgstr "Caminho de submódulo '$displaypath': rebase concluído em '$sha1'" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" -msgstr "Não é possível efetuar merge de '$sha1' no submódulo em '$displaypath'" +msgstr "Não é possível integrar '$sha1' no caminho de submódulo '$displaypath'" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" -msgstr "Submódulo em '$displaypath': merge em '$sha1' concluído" +msgstr "Caminho de submódulo '$displaypath': integrado em '$sha1'" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" -msgstr "Falha ao executar '$command $sha1' no submódulo em '$prefix$sm_path'" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" +msgstr "" +"Falha ao executar '$command $sha1' no caminho de submódulo '$displaypath'" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "Submódulo em '$prefix$sm_path': '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "Caminho de submódulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" -msgstr "Falha ao percorrer o submódulo em '$displaypath'" +msgstr "Falha ao percorrer o caminho de submódulo '$displaypath'" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "A opção --cached não pode ser usada com a opção --files" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "modo inesperado $mod_dst" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Aviso: $display_name não contém o commit $sha1_src" -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Warn: $display_name não contém o commit $sha1_dst" -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " Warn: $display_name contém os commits $sha1_src e $sha1_dst" -#: git-submodule.sh:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "blob" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "Falha ao percorrer recursivamente o submódulo em '$sm_path'" +msgstr "Falha ao percorrer recursivamente o caminho de submódulo '$sm_path'" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" -msgstr "A sincronizar o URL do submódulo em '$displaypath'" +msgstr "A sincronizar o URL do submódulo '$displaypath'" + +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "Consulte git-${cmd}(1) para obter mais detalhes." + +#~ msgid "'%s': %s" +#~ msgstr "'%s': %s" + +#~ msgid "unable to access '%s': %s" +#~ msgstr "não é possível aceder a '%s': %s" + +#~ msgid "could not open '%s' for reading: %s" +#~ msgstr "não foi possível abrir '%s' para leitura: %s" + +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "não foi possível abrir '%s' para escrita: %s" + +#~ msgid " git branch -d %s\n" +#~ msgstr " git branch -d %s\n" + +#~ msgid " git branch --set-upstream-to %s\n" +#~ msgstr " git branch --set-upstream-to %s\n" + +#~ msgid "cannot open %s: %s\n" +#~ msgstr "não é possível abrir %s: %s\n" + +#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed" +#~ msgstr "" +#~ "Prepare as suas alterações em .gitmodules ou esconda-as (stash) para " +#~ "prosseguir" + +#~ msgid "could not verify the tag '%s'" +#~ msgstr "não foi possível validar a tag '%s'" + +#~ msgid "failed to remove: %s" +#~ msgstr "falha ao remover: %s" + +#~ msgid "The --exec option must be used with the --interactive option" +#~ msgstr "A opção --exec deve ser usada com a opção --interactive" + +#~ msgid "" +#~ "Submodule path '$displaypath' not initialized\n" +#~ "Maybe you want to use 'update --init'?" +#~ msgstr "" +#~ "Submódulo em '$displaypath' não inicializado\n" +#~ "Talvez queira usar 'update --init'?" #~ msgid "unable to parse format" #~ msgstr "não foi possível analisar o formato" @@ -12354,8 +12836,8 @@ msgstr "A sincronizar o URL do submódulo em '$displaypath'" #~ "Quando push.default está definido como 'matching', o Git publica\n" #~ "os ramos locais nos ramos remotos que já existam com o mesmo nome.\n" #~ "\n" -#~ "Desde a versão 2.0, o Git assume o comportamento mais conservativo " -#~ "'simple',\n" +#~ "Desde a versão 2.0, o Git assume o comportamento mais conservativo 'simple'," +#~ "\n" #~ "publicando só o ramo atual no ramo remoto correspondente, que é usado\n" #~ "para atualizar o ramo atual com 'git pull'.\n" #~ "Consulte 'git help config' e procure por 'push.default' para mais " @@ -12369,9 +12851,6 @@ msgstr "A sincronizar o URL do submódulo em '$displaypath'" #~ msgid "Could not append '%s'" #~ msgstr "Não foi possível acrescentar '%s'" -#~ msgid "Could not set '%s'" -#~ msgstr "Não foi possível definir '%s'" - #~ msgid "Missing author: %s" #~ msgstr "Autor em falta: %s" @@ -4,14 +4,14 @@ # # Translators: # Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2016 -# insolor <insolor@gmail.com>, 2014 -# insolor <insolor@gmail.com>, 2014 +# insolor, 2014 +# insolor, 2014 msgid "" msgstr "" "Project-Id-Version: Git Russian Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-03-16 00:16+0800\n" -"PO-Revision-Date: 2016-03-15 18:54+0000\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-06-11 09:37+0000\n" "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n" "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n" "MIME-Version: 1.0\n" @@ -31,7 +31,7 @@ msgid "" "as appropriate to mark resolution and make a commit." msgstr "Исправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,\nчтобы пометить исправление и сделайте коммит." -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)." @@ -74,7 +74,7 @@ msgstr "формат" msgid "archive format" msgstr "формат архива" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "префикс" @@ -82,9 +82,9 @@ msgstr "префикс" msgid "prepend prefix to each pathname in the archive" msgstr "добавлять префикс перед каждым путем файла в архиве" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 +#: 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 msgid "file" @@ -118,7 +118,8 @@ msgstr "сжимать лучше" msgid "list supported archive formats" msgstr "перечислить поддерживаемые форматы архивов" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "репозиторий" @@ -255,11 +256,16 @@ msgstr "Неоднозначное имя объекта: «%s»." msgid "Not a valid branch point: '%s'." msgstr "Недопустимая точка ветки: «%s»." -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "«%s» уже находится на «%s»" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD рабочего каталога %s не обновлён" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -270,7 +276,7 @@ msgstr "«%s» не похож на файл пакета версии 2" msgid "unrecognized header: %s%s (%d)" msgstr "неопознанный заголовок: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "не удалось открыть «%s»" @@ -279,10 +285,10 @@ msgstr "не удалось открыть «%s»" msgid "Repository lacks these prerequisite commits:" msgstr "В репозитории отсутствуют необходимые коммиты:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: 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 msgid "revision walk setup failed" msgstr "сбой инициализации прохода по редакциям" @@ -325,21 +331,21 @@ msgstr "критическая ошибка rev-list" msgid "ref '%s' is excluded by the rev-list options" msgstr "ссылка «%s» исключена в соответствии с опциями rev-list" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "неопознанный аргумент: %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "Отклонение создания пустого пакета." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "не удалось создать «%s»" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "критическая ошибка index-pack" @@ -348,8 +354,8 @@ msgstr "критическая ошибка index-pack" msgid "invalid color value: %.*s" msgstr "недопустимое значение цвета: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "не удалось разобрать %s" @@ -383,21 +389,21 @@ msgstr "неправильное числовое значение «%s» для msgid "failed to expand user dir in: '%s'" msgstr "сбой разворачивания пути каталога пользователя: «%s»" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "неправильный уровень сжатия zlib %d" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "недопустимый режим создания объекта: %s" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "не удалось разобрать конфигурацию из командной строки" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "произошла неизвестная ошибка при чтении файлов конфигурации" @@ -416,24 +422,27 @@ msgstr "неправильная переменная конфигурации msgid "%s has multiple values" msgstr "%s имеет несколько значений" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "не удалось установить «%s» в «%s»" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" -msgstr "Не удалось установить «%s» в «%s»" +msgid "could not unset '%s'" +msgstr "не удалось сбросить значение для «%s»" #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Не удалось запустить «git rev-list»" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "сбой записи в rev-list: %s" +msgid "failed write to rev-list" +msgstr "сбой записи в rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "сбой закрытия стандартного ввода у rev-list: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "сбой закрытия стандартного ввода у rev-list" #: date.c:95 msgid "in the future" @@ -526,62 +535,62 @@ msgstr[3] "%lu лет назад" msgid "failed to read orderfile '%s'" msgstr "сбой чтения orderfile «%s»" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "Выполняется неточное определение переименования" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Сбой разбора величины среза (cut-off) у dirstat «%s»\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "Неизвестный параметр dirstat: «%s»\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Неизвестное значения для переменной «diff.submodule»: «%s»" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "критическая ошибка при внешнем сравнении, останов на %s" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow требует ровно одной спецификации пути" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Сбой разбора параметра опции --submodule: «%s»" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "не удалось получить имя ядра и информацию" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "Кэш неотслеживаемых файлов отключен на этой системе или в этом месте." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "не удалось запустить gpg." @@ -595,28 +604,28 @@ msgstr "gpg не удалось подписать данные" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "не удалось создать временный файл «%s»: %s" +msgid "could not create temporary file '%s'" +msgstr "не удалось создать временный файл «%s»" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "сбой записи отсоединенной подписи в «%s»: %s" +msgid "failed writing detached signature to '%s'" +msgstr "сбой записи отсоединенной подписи в «%s»" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "«%s»: не удалось прочесть %s" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "«%s»: %s" +msgid "failed to stat '%s'" +msgstr "не удалось выполнить stat «%s»" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "«%s»: слишком мало данных прочитано %s" +msgid "'%s': short read" +msgstr "«%s»: слишком мало данных прочитано" #: help.c:205 #, c-format @@ -676,12 +685,29 @@ msgstr[3] "\nВозможно, вы имели в виду что-то из эт msgid "%s: %s - %s" msgstr "%s: %s — %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "Не удалось создать «%s.lock»: %s.\n\nПохоже, что другой процесс git запущен в этом репозитории,\nнапример редактор открыт из «git commit». Пожалуйста, убедитесь,\nчто все процессы были завершены и потом попробуйте снова.\nЕсли это не поможет, то возможно процесс git был ранее завершен\nс ошибкой в этом репозитории: \nудалите файл вручную для продолжения." + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "Не удалось создать «%s.lock»: %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "сбой чтения кэша" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "не удалось записать новый файл индекса" @@ -728,7 +754,7 @@ msgstr "невозможно прочитать объект %s «%s»" msgid "blob expected for %s '%s'" msgstr "ожидается двоичный объект для %s «%s»" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "не удалось открыть «%s»" @@ -855,7 +881,7 @@ msgstr "Пропуск %s (слиты одинаковые изменения к msgid "Auto-merging %s" msgstr "Автослияние %s" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "подмодуль" @@ -883,34 +909,34 @@ 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:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Добавление %s" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Критическая ошибка слияния, такого не должно случаться." -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Уже обновлено!" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "сбой слияния деревьев «%s» и «%s»" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "Необработанный путь??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "Слияние:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" @@ -919,16 +945,16 @@ msgstr[1] "найдено %u общих предка:" msgstr[2] "найдено %u общих предков:" msgstr[3] "найдено %u общих предков:" -#: merge-recursive.c:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "слияние не вернуло коммит" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "Не удалось разобрать объект «%s»" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "Не удается записать индекс." @@ -958,28 +984,28 @@ msgstr "Неправильное значение переменной %s: «%s msgid "unable to parse object: %s" msgstr "не удалось разобрать объект: %s" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "…" -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "использование: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " или: %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-КОЛИЧЕСТВО" @@ -988,7 +1014,7 @@ msgstr "-КОЛИЧЕСТВО" msgid "malformed object name '%s'" msgstr "Неправильное имя объекта «%s»" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "Не удалось предоставить доступ к %s на запись" @@ -1053,7 +1079,7 @@ msgid "" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "Не указан шаблон для исключения с помощью :(exclude).\nВозможно, вы забыли «:/» или «.» ?" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "не удалось разобрать формат для --pretty" @@ -1075,23 +1101,23 @@ msgid "" "Using version %i" msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "Не удалось открыть «%s» для записи" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "не удалось удалить ссылку %s: %s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "не удалось удалить ссылки: %s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "не удалось удалить ссылки %s" @@ -1230,82 +1256,82 @@ msgstr "format: пропущена частица %%(end)" msgid "malformed object name %s" msgstr "неправильное имя объекта %s" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Нельзя извлечь одновременно %s и %s в %s" -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s обычно отслеживает %s, а не %s" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s отслеживает и %s и %s" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "Внутренняя ошибка" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD не указывает на ветку" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "нет такой ветки: «%s»" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "вышестоящая ветка не настроена для ветки «%s»" -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "назначение для отправки «%s» на внешнем сервере «%s» не имеет локальной отслеживаемой ветки" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "ветка «%s» не имеет внешнего сервера для отправки" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "спецификации пути для отправки «%s» не включают в себя «%s»" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "отправка не имеет точки назначения (push.default выставлен в «nothing»)" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "не удалось выполнить «simple» отправку в единственную точку назначения" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "(для исправления запустите «git branch --unset-upstream»)\n" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Ваша ветка обновлена в соответствии с «%s».\n" -#: remote.c:2084 +#: remote.c:2085 #, 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" @@ -1314,11 +1340,11 @@ msgstr[1] "Ваша ветка опережает «%s» на %d коммита. msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n" msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n" -#: remote.c:2090 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1328,11 +1354,11 @@ msgstr[1] "Ваша ветка отстает от «%s» на %d коммита msgstr[2] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n" msgstr[3] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n" -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (используйте «git pull», чтобы обновить вашу локальную ветку)\n" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1345,20 +1371,20 @@ msgstr[1] "Ваша ветка и «%s» разделились\nи теперь msgstr[2] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n" msgstr[3] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n" -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "похоже, ваша текущая ветка повреждена" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "ваша текущая ветка «%s» еще не содержит ни одного коммита" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "опцию --first-parent нельзя использовать одновременно с --bisect" @@ -1402,7 +1428,7 @@ msgid "" "and commit the result with 'git commit'" msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»\nи сделайте коммит с помощью «git commit»" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "Не удалось записать в %s" @@ -1560,12 +1586,12 @@ msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)» msgid "Could not create sequencer directory %s" msgstr "Не удалось создать каталог для указателя следования коммитов %s" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "Ошибка оборачивания %s." -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "отбор лучшего или возврат коммита не выполняется" @@ -1577,63 +1603,72 @@ msgstr "не удалось определить HEAD" msgid "cannot abort from a branch yet to be born" msgstr "нельзя отменить изменения с ветки, которая еще не создана" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "не удалось открыть %s: %s" +msgid "cannot open %s" +msgstr "не удалось открыть %s" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "не удалось прочитать %s: %s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "неожиданный конец файла" -#: sequencer.c:888 +#: sequencer.c:887 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "сохраненный файл с HEAD перед отбором лучшего «%s» поврежден" -#: sequencer.c:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "Не удалось отформатировать %s." -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не удалось отобрать %s" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s: плохая редакция" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "Нельзя возвратить изначальный коммит" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "Нельзя отобрать лучшее в пустую ветку" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "не удалось прочитать %s" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "Ожидаемая версия git репозитория <= %d, а обнаружена %d" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "обнаружены неизвестные расширения репозитория:" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)" @@ -1651,29 +1686,38 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "Обычно Git не создает ссылки, оканчивающиеся на 40 шестнадцатеричных\nсимволов, потому, что они будут игнорироваться, когда вы просто\nукажете это 40-символьное шестнадцатеричное число. Такие ссылки\nмогли быть созданы по ошибке. Например, с помощью:\n\n git checkout -b $br $(git rev-parse …)\n\n, если «$br» оказался пустым, то ссылка с 40-символьным\nшестнадцатеричным числом будет создана. Пожалуйста, просмотрите эти\nссылки и, возможно, удалите их. Вы можете отключить это сообщение\nзапустив «git config advice.objectNameWarning false»" -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "Не удалось изменить не слитый .gitmodules, сначала разрешите конфликты" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Не удалось найти раздел в .gitmodules, где путь равен %s" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr " Не удалось обновить .gitmodules запись %s" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Не удалось удалить запись в .gitmodules для %s" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "сбой индексирования обновленного .gitmodules" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "нельзя использовать отприцательные значения для submodule.fetchJobs" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "неправильное значение %s" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1733,7 +1777,171 @@ msgstr "не удалось переименовать временный фай msgid "Could not read ref %s" msgstr "Не удалось прочитать ссылку %s" -#: unpack-trees.c:203 +#: 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." +msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%sСделайте коммит или спрячьте ваши изменения перед переключением веток." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%s" + +#: unpack-trees.c:69 +#, 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." +msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%sСделайте коммит или спрячьте ваши изменения перед слиянием веток." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%s" + +#: unpack-trees.c:74 +#, 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." +msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%sСделайте коммит или спрячьте ваши изменения перед %s." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "Обновление указанных каталогов приведет к потере неотслеживаемых файлов в них:\n%s" + +#: unpack-trees.c:85 +#, 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." +msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%sПереместите эти файлы или удалите их перед %s." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by checkout:\n" +"%%s" +msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%sПереместите эти файлы или удалите их перед %s." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "Запись «%s» частично совпадает с «%s». Не удалось назначить соответствие." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "Не удалось обновить частичное состояние: следующие элементы не последней версии:\n%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout update:\n" +"%s" +msgstr "Указанные файлы из рабочего каталога будут перезаписаны при обновлении частичного состояния:\n%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout update:\n" +"%s" +msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении частичного состояния:\n%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "Прерываю\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "Распаковка файлов" @@ -1771,231 +1979,227 @@ msgstr "неправильная часть пути «..»" msgid "could not open '%s' for reading and writing" msgstr "не удалось открыть «%s» для чтения и записи" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "не удалось открыть «%s» для записи" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "не удалось открыть «%s» для чтения" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "«%s» недоступно: %s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "«%s» недоступно" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "не удалось получить текущий рабочий каталог" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "не удалось открыть «%s» для записи" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "не удалось записать в %s" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "не удалось закрыть %s" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Не слитые пути:" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (используйте «git reset %s <файл>…», чтобы убрать из индекса)" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (используйте «git rm --cached <файл>…», чтобы убрать из индекса)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (используйте «git add <файл>…», чтобы пометить разрешение конфликта)" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (используйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "Изменения, которые будут включены в коммит:" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "Изменения, которые не в индексе для коммита:" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (используйте «git add <файл>…», чтобы добавить файл в индекс)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working " "directory)" msgstr " (используйте «git checkout -- <файл>…», чтобы отменить изменения\n в рабочем каталоге)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (сделайте коммит или отмените изменения в неотслеживаемом или измененном содержимом в подмодулях)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "оба удалены:" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "добавлено нами:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "удалено ими:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "добавлено ими:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "удалено нами:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "оба добавлены:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "оба измены:" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "ошибка: необработанный статус не слитых изменений %x" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "новый файл:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "скопировано:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "удалено:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "изменено:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "переименовано:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "изменен тип:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "неизвестно:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "не слитые:" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "новые коммиты, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "изменено содержимое, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "неотслеживаемое содержимое, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "ошибка: необработанный статус изменений %c" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Измененные, но не обновленные подмодули:" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Изменения в подмодулях, которые будут закоммичены:" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "Не трогайте строку выше этой.\nВсё, что ниже — будет удалено." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "У вас есть не слитые пути." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (разрешите конфликты, затем запустите «git commit»)" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "Все конфликты исправлены, но вы все еще в процессе слияния." -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " (используйте «git commit», чтобы завершить слияние)" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "Вы в процессе сессии am." -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "Текущий патч пустой." -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (разрешите конфликты, затем запустите «git am --continue»)" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (используйте «git am --skip», чтобы пропустить этот патч)" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (используйте «git am --abort», чтобы восстановить оригинальную ветку)" @@ -2137,43 +2341,43 @@ msgstr "Вы сейчас в процессе двоичного поиска." msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (используйте «git bisect reset», чтобы вернуться на исходную ветку)" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "На ветке " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "интерактивное перемещение в процессе; над " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "перемещение в процессе; над " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEAD отделён на " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEAD отделён начиная с " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "Сейчас ни на одной из веток" -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "Начальный коммит" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "Неотслеживаемые файлы" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "Игнорируемые файлы" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2181,82 +2385,82 @@ msgid "" "new files yourself (see 'git help status')." msgstr "%.2f секунды занял вывод списка неотслеживаемых файлов. «status -uno» возможно может ускорить это, но будьте внимательны, и не забудьте добавить новые файлы вручную (смотрите «git help status» для подробностей)." -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "Неотслеживаемые файлы не показаны%s" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr "(используйте опцию «-u», чтобы показать неотслеживаемые файлы)" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "Нет изменений" -#: wt-status.c:1513 +#: wt-status.c:1535 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "нет изменений добавленных для коммита\n(используйте «git add» и/или «git commit -a»)\n" -#: wt-status.c:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "нет изменений добавленных для коммита\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы (используйте «git add», чтобы отслеживать их)\n" -#: wt-status.c:1522 +#: wt-status.c:1544 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы\n" -#: wt-status.c:1525 +#: wt-status.c:1547 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», чтобы отслеживать их)\n" -#: wt-status.c:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "нечего коммитить\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые файлы)\n" -#: wt-status.c:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "нечего коммитить, нет изменений в рабочем каталоге\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "Начальный коммит на " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (нет ветки)" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "исчез" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "позади" -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "впереди " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "сбой отсоединения «%s»" @@ -2270,7 +2474,7 @@ msgstr "git add [<опции>] [--] <спецификация-пути>…" msgid "unexpected diff status %c" msgstr "неожиданный статус различий %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "сбой при обновлении файлов" @@ -2283,7 +2487,7 @@ msgstr "удалить «%s»\n" msgid "Unstaged changes after refreshing the index:" msgstr "Непроиндексированные изменения после обновления индекса:" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "Не удалось прочитать индекс" @@ -2319,14 +2523,14 @@ 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:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: 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 msgid "dry run" msgstr "пробный запуск" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: 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 "быть многословнее" @@ -2334,7 +2538,7 @@ msgstr "быть многословнее" msgid "interactive picking" msgstr "интерактивный выбор" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "интерактивный выбор блоков" @@ -2402,16 +2606,16 @@ 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:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "файл индекса поврежден" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: 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:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "не удалось прочитать «%s»" @@ -2439,16 +2643,6 @@ msgstr "Не удалось скопировать заметку из «%s» в msgid "fseek failed" msgstr "сбой при выполнении fseek" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "не удалось открыть «%s» для чтения: %s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "не удалось открыть «%s» для записи: %s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2458,340 +2652,342 @@ msgstr "не удалось разобрать патч «%s»" msgid "Only one StGIT patch series can be applied at once" msgstr "Только серия патчей StGIT может быть применена за раз" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "недопустимая метка даты/времени" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "недопустимая строка даты" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "недопустимое смещение часового пояса" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "Сбой определения формата патча." -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "не удалось создать каталог «%s»" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "Не удалось разделить патчи на части." -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "не удалось записать индекс" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Когда вы устраните эту проблему, запустите «%s --continue»." -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Если вы хотите пропустить этот патч, то запустите «%s --skip»." -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Чтобы вернуться на предыдущую ветку и остановить применение изменений, запустите «%s --abort»." -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "Патч пуст. Возможно, он был неправильно разделён?" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "неправильная строка идентификации: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "не удалось разобрать коммит %s" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию." -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "Использую индекс для реконструкции базового дерева…" -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке." -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…" -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "Не удалось слить изменения." -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "git write-tree не удалось записать дерево" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "применение к пустой истории" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "сбой записи объекта коммита" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "нельзя продолжнить: %s не существует " -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "не удалось использовать интерактивное поведение, без stdin подключенного к терминалу." -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "Тело коммита:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить всё: " -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Индекс не пустой: нельзя применять патчи (в индексе: %s)" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "Применение: %.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "Нет изменений — Патч уже применен." -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "Ошибка применения изменений на %s %.*s" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "Копию изменений, которые не удалось применить, вы можете найти в: %s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "Нет изменений — возможно, вы забыли вызвать «git add»?\nЕсли ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч." -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" msgstr "У вас все еще имеются не слитые пути в индексе.\nВозможно, вы забыли вызвать «git add»?" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Не удалось разобрать объект «%s»." -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "не удалось очистить индекс" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\nПеремотка на ORIG_HEAD не выполняется" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Неправильное значение для --patch-format: %s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<опции>] [(<mbox>|<Maildir>)…]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<опции>] (--continue | --skip | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "запустить в интерактивном режиме" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "историческая опция — ничего не делает" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "разрешить откатиться к трехходовому слиянию, если нужно" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "тихий режим" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "добавить строку Signed-off-by к сообщению коммита" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "перекодировать в utf8 (по умолчанию)" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "передать флаг -k в git-mailinfo" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "передать флаг -b в git-mailinfo" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "передать флаг -m в git-mailinfo" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "передать флаг --keep-cr в git-mailsplit для формата mbox" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "обрезать все до строки обрезки" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "действие" -#: 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:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: 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 msgid "pass it through git-apply" msgstr "передать его в git-apply" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "корень" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: 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:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 +#: 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/show-ref.c:175 builtin/tag.c:340 #: parse-options.h:132 parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "количество" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "формат" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "формат, в котором находятся патчи" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "переопределить сообщение об ошибке, если не удалось наложить изменения" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "продолжить применение изменений после разрешения конфиликта" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "синоним для --continue" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "пропустить текущий патч" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "восстановить оригинальную ветку и отменить операцию применения изменений." -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "соврать о дате коммитера" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "использовать текущее время как время авторства" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "подписать коммиты с помощью GPG" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(внутреннее использование для git-rebase)" -#: builtin/am.c:2340 +#: builtin/am.c:2339 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "Опция -b/--binary уже долгое время ничего не делает и будет удалена с следующих версиях Git. Пожалуйста, не используйте ее." -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "сбой чтения индекса" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "предыдущий каталог перемещения %s еще существует, но передан mbox." -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его." -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем." @@ -2824,37 +3020,37 @@ msgstr "regexec возвратил %d для ввода: %s" msgid "unable to find filename in patch at line %d" msgstr "не удалось найти имя файла в строке патча %d" -#: builtin/apply.c:940 +#: 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 — ожидалось /dev/null, получено %s на строке %d" -#: builtin/apply.c:944 +#: 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:945 +#: 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:952 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: плохой git-diff — ожидалось /dev/null на строке %d" -#: builtin/apply.c:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: не ожидаемая строка: %.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "фрагмент изменений без заголовка на строке %d: %.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname" @@ -2867,65 +3063,65 @@ msgstr[1] "заголовок git diff не нашел информацию об msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "новый файл зависит от старого содержимого" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "удаленный файл все еще имеет содержимое" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "патч поврежден на строке %d" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "новый файл %s зависит от старого содержимого" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "удаленный файл %s все еще имеет содержимое" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** предупреждение: файл %s становится пустым, но не удаляется" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "поврежденный двоичный патч на строке %d: %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "неопознанный двоичный патч на строке %d" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "патч с мусором на строке %d" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "не удалось прочитать символьную ссылку %s" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "не удалось открыть или прочесть %s" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "неправильное начало строки: «%c»" -#: builtin/apply.c:2896 +#: 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)." @@ -2934,177 +3130,177 @@ msgstr[1] "Часть #%d успешно применена на %d (со сдв msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)." msgstr[3] "Часть #%d успешно применена на %d (со сдвигом в %d строк)." -#: builtin/apply.c:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "при поиске:\n%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "пропущены данные двоичного патча для «%s»" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "не удалось применить двоичный патч к «%s»" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "после применения двоичного патча для «%s» был получен неправильный результат (ожидалось %s, получено %s)" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "ошибка применения изменений: %s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" -msgstr "не удалось перейти на %s" +msgstr "не удалось переключить состояние на %s" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "ошибка чтения %s" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "чтение из «%s» за символической ссылкой" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "путь %s был переименован/удален" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s: нет в индексе" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s: не совпадает с индексом" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "патч удаления не удалил содержимое файла" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s: неправильный тип" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s имеет тип %o, а ожидался %o" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "неправильный путь «%s»" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s: уже содержится в индексе" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s: уже содержится в рабочем каталоге" -#: builtin/apply.c:3769 +#: 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:3774 +#: 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:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "затронутый файл «%s» находится за символической ссылкой" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s: не удалось применить патч" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "Проверка патча %s…" -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: 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:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "не удалось удалить %s из индекса" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "поврежденный патч для подмодуля %s" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "не удалось выполнить stat для созданного файла «%s»" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "не удалось создать вспомогательный файл для созданного файла %s" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "не удалось создать запись в кэше для %s" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "закрытие файла «%s»" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "не удалось записать файл «%s» с режимом доступа %o" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "Патч %s применен без ошибок." -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "внутренняя ошибка" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." @@ -3113,147 +3309,157 @@ msgstr[1] "Применение патча %%s с %d отказами…" msgstr[2] "Применение патча %%s с %d отказами…" msgstr[3] "Применение патча %%s с %d отказами…" -#: builtin/apply.c:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "усечение имени .rej файла до %.*s.rej" -#: builtin/apply.c:4300 +#: 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:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "Блок №%d отклонен." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Патч «%s» пропущен." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "не распознанный ввод" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "не удалось прочитать файл индекса" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "не применять изменения по указанному пути" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "применять изменения по указанному пути" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "удалить <количество> ведущих косых черт из традиционных путей списка изменений" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "игнорировать добавления, сделанные этим патчем" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "вместо применения патча вывести статистику добавлений и удалений для ввода" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "показать количество добавленных и удаленных строк в десятичном представлении" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "вместо применения патча вывести статистику изменений для ввода" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "вместо применения патча проверить подходит ли он" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "проверить, что патч применяется к текущему индексу" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "применить патч, не изменяя рабочий каталог" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "принять патч, который затрагивает файлы за рабочим каталогом" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "а также применить патч (используйте с --stat/--summary/--check)" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "попытаться сделать трехходовое слияние, если патч не применяется" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "построить временный индекс, основанный на встроенной информации об индексе" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "пути, отделённые НУЛЕВЫМ символом" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "удостовериться, что по крайней мере <n> строк контекста совпадают" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "определять новые или модифицированные строки, у которых есть ошибки в пробельных символах" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "игнорировать изменения в пробельных символах при поиске контекста" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "применить патч с обращением изменений" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "не ожидать как минимум одной строки контекста" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставить отклоненные блоки изменений в соответствующих *.rej файлах" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "разрешить перекрывающиеся блоки изменений" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "разрешить некорректно определенные пропущенные пустые строки в конце файла" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "не доверять количеству строк из заголовка блока изменений" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "добавить <корень> спереди ко всем именам файлов" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "--3way вне репозитория" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "--index вне репозитория" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "--cached вне репозитория" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "не удалось открыть патч «%s»" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" @@ -3262,7 +3468,7 @@ msgstr[1] "пропущено %d ошибки в пробельных симво msgstr[2] "пропущено %d ошибок в пробельных символах" msgstr[3] "пропущено %d ошибок в пробельных символах" -#: builtin/apply.c:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3330,99 +3536,99 @@ msgstr "<опции-rev-list> документированы в git-rev-list(1)" msgid "Blaming lines" msgstr "Просмотр авторов строк" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "Показать записи авторства постепенно, в процессе нахождения" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Не показывать SHA-1 для коммитов, не входящих в границы запроса (По умолчанию: отключено)" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Не воспринимать корневые коммиты как граничные (По умолчанию: отключено)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "Показать статистику расходов на выполнение запроса" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "Принудительно выводить прогресс выполнения" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "Показать оценку для записей авторства" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "Показать оригинальное имя файла (По умолчанию: автоматически)" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "Показать оригинальные номера строк (По умолчанию: отключено)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "Показать в формате для программного разбора" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "Показать в машиночитаемом формате, с построчной информацией о коммите" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Использовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)" -#: builtin/blame.c:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "Показать необработанные временные метки (По умолчанию: отключено)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "Не показывать имя автора и временные метки (По умолчанию: отключено)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "Показать почту автора вместо имени (По умолчанию: отключено)" -#: builtin/blame.c:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "Игнорировать различия в пробелах" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "Потратить больше времени, для нахождения лучших совпадений" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Использовать редакции из <файла> вместо вызова git-rev-list" -#: builtin/blame.c:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "Использовать содержимое <файла> как финальный снимок" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "мин-длина" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "Найти копирование строк в пределах и между файлами" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "Найти перемещения строк в пределах и между файлами" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "начало,конец" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "Обработать только строки в диапазоне начало,конец, начиная с 1" @@ -3432,392 +3638,413 @@ 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "4 года и 11 месяцев назад" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<опции>] [-l] [-f] <имя-ветки> [<точка-начала>]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<опции>] [-r] (-d | -D) <имя-ветки>…" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<опции>] (-m | -M) [<старая-ветка>] <новая-ветка>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<опции>] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "удаление ветки «%s», которая была слита с\n «%s», но не слита с HEAD." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "не удаление ветки «%s», которая еще не слита с\n «%s», хотя уже слита с HEAD." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Не удалось найти объект коммита для «%s»" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "Ветка «%s» не слита полностью.\nЕсли вы уверены, что хотите ее удалить, запустите «git branch -D %s»." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "Не удалось обновить файл конфигурации" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "нельзя использовать одновременно ключи -a и -d" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "Не удалось найти объект коммита для HEAD" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "Нельзя удалить ветку «%s», так как вы сейчас на ней находитесь." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "Нельзя удалить ветку «%s» т.к. она активна на «%s»" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "внешняя отслеживаемая ветка «%s» не найдена." -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "ветка «%s» не найдена." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Ошибка удаления внешней отслеживаемой ветки «%s»" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "Ошибка удаления ветки «%s»" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Внешняя отслеживаемая ветка %s удалена (была %s).\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Ветка %s удалена (была %s).\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: пропал]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: позади %d]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[позади %d]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: впереди %d]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[впереди %d]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: впереди %d, позади %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[впереди %d, позади %d]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** недействительная ссылка ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(нет ветки, перемещение %s)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(нет ветки, двоичный поиск начат на %s)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD отделён на %s)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD отделён начиная с %s)" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(нет ветки)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "Производится перемещение ветки %s на %s" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "Производится двоичный поиск в ветке %s на %s" + +#: builtin/branch.c:560 msgid "cannot rename the current branch while not on any." msgstr "невозможно переименовать текущую ветку, если вы не находитесь ни на одной из них." -#: builtin/branch.c:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "Недействительное имя ветки: «%s»" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "Сбой переименования ветки" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Переименована неправильно названная ветка «%s»" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Ветка переименована в %s, но HEAD не обновлен!" -#: builtin/branch.c:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "Ветка переименована, но произошел сбой обновления файла конфигурации" -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" -msgstr "не удалось записать шаблон описания ветки: %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "не удалось записать шаблон описания ветки" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "Общие параметры" -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "показывать хэш-сумму и тему, укажите дважды для вышестоящей ветки" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "не выводить информационные сообщения" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "установить режим отслеживания вышестоящей ветки (см. git-pull(1))" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "изменить информацию о вышестоящей ветке" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "вышестоящая" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "изменить информацию о вышестоящей ветке" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "использовать цветной вывод" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "выполнить действия на отслеживаемых внешних ветках" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "вывод только веток, которые содержат коммит" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "Специфичные для git-branch действия:" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "показать список и отслеживаемых и локальных веток" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "удалить полностью слитую ветку" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "удалить ветку (даже никуда не слитую)" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "переместить/переименовать ветки и ее журнал ссылок" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "переместить/переименовать ветку, даже если целевое имя уже существует" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "показать список имен веток" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "создать журнал ссылок ветки" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "изменить описание ветки" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "принудительное создание, перемещение или удаление ветки" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "вывод только слитых веток" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "вывод только не слитых веток" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "показать список веток по столбцам" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "ключ" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "имя поля, по которому выполнить сортировку" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: 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/tag.c:369 msgid "object" msgstr "объект" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "вывод только веток, определенного объекта" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "Не удалось определить HEAD как действительную ссылку." -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "HEAD не найден в refs/heads!" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "--column и --verbose нельзя использовать одновременно" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "требуется имя ветки" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "Нельзя дать описание отделённому HEAD" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "нельзя изменить описание более одной ветки за раз" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "Еще нет коммита на ветке «%s»." -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "Нет ветки с именем «%s»." -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "слишком много веток для операции переименования" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "слишком много веток для указания новых вышестоящих" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "невозможно установить вышестоящий репозиторий для HEAD на %s, так как он не указывает ни на одну ветку." -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "нет такой ветки «%s»" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "ветка «%s» не существует" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "слишком много веток для убирания вышестоящих" -#: builtin/branch.c:784 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "невозможно убрать вышестоящий репозиторий для HEAD, так как он не указывает ни на одну ветку." -#: builtin/branch.c:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Ветка «%s» не имеет информации о вышестоящей ветке" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "не имеет смысла создавать «HEAD» вручную" -#: builtin/branch.c:810 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "параметры -a и -r для «git branch» не имеют смысла с указанием имени ветки" -#: builtin/branch.c:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using " "--track or --set-upstream-to\n" msgstr "Флаг --set-upstream устарел и будет удален в будущем. Вместо него используйте --track или --set-upstream-to\n" -#: builtin/branch.c:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3825,16 +4052,6 @@ msgid "" "\n" msgstr "\nЕсли вы хотите, чтобы «%s» отслеживала «%s», сделайте следующее:\n\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr "git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -3930,7 +4147,7 @@ msgstr "прочитать имена файлов из стандартного msgid "terminate input and output records by a NUL character" msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "не выводить прогресс выполнения" @@ -3993,7 +4210,7 @@ msgstr "индекс должен быть между 1 и 3 или all" #: builtin/checkout-index.c:160 msgid "check out all files in the index" -msgstr "перейти на состояние всех файлов из индекса" +msgstr "переключиться на состояние всех файлов из индекса" #: builtin/checkout-index.c:161 msgid "force overwrite of existing files" @@ -4020,8 +4237,9 @@ msgid "write the content to temporary files" msgstr "записать содержимое во временные файлы" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: 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 msgid "string" msgstr "строка" @@ -4071,79 +4289,79 @@ msgstr "путь «%s»: не удалось слить" msgid "Unable to add merge result for '%s'" msgstr "Не удалось добавить результат слияния «%s»" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "«%s» нельзя использовать при обновлении путей" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "«%s» нельзя использовать одновременно с %s" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Нельзя обновлять пути и переключаться на ветку «%s» одновременно." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "файл индекса поврежден" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "путь «%s» не слит" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "сначала нужно разрешить конфликты в вашем текущем индексе" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Не удалось создать журнал ссылок для «%s»: %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD сейчас на" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "не удалось обновить HEAD" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "Сброс ветки «%s»\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "Уже на «%s»\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Переключение и сброс ветки «%s»\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Переключено на новую ветку «%s»\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "Переключено на ветку «%s»\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " … и еще %d.\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4160,7 +4378,7 @@ msgstr[1] "Предупреждение: вы оставляете позади msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n" msgstr[3] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4179,162 +4397,162 @@ msgstr[1] "Если вы хотите сохранить их с помощью msgstr[2] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" msgstr[3] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "внутренняя ошибка при хождении по редакциям" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "Предыдущая позиция HEAD была" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "Вы находитесь на еще не созданной ветке" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "ожидается только одна ссылка, а передано %d." -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "неправильная ссылка: %s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "в дереве нет такой ссылки: %s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "нельзя использовать пути при переключении веток" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "нельзя использовать «%s» при переключении веток" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "«%s» нельзя использовать одновременно с «%s»" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Нельзя переключить ветку на не коммит «%s»" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: 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 msgid "branch" msgstr "ветка" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" -msgstr "создать и перейти на новую ветку" +msgstr "создать и переключиться на новую ветку" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" -msgstr "создать/сбросить и перейти на новую ветку" +msgstr "создать/сбросить и перключиться на новую ветку" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "создать журнал ссылок для новой ветки" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "отсоединить HEAD на указанном коммите" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "установить информацию о вышестоящей ветке для новой ветки" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "новая-ветка" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "новая ветка без родителей" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" -msgstr "перейти на нашу версию для не слитых файлов" +msgstr "переключиться на нашу версию для не слитых файлов" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" -msgstr "перейти на их версию для не слитых файлов" +msgstr "переключиться на их версию для не слитых файлов" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" -msgstr "принудительный переход (отбрасывает все локальные изменения)" +msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "выполнить трехходовое слияние с новой веткой" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "обновить игнорируемые файлы (по умолчанию)" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "стиль" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "стиль конфликтов слияния (merge или diff3)" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "не ограничивать спецификаторы пути только частичными записями" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" -msgstr "пересмотр «git checkout <no-such-branch>»" +msgstr "пересмотр «git checkout <нет-такой-ветки>»" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "не проверять, что другое дерево уже содержит указанную ссылку" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: 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/send-pack.c:168 msgid "force progress reporting" msgstr "принудительно выводить прогресс" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B и --orphan нельзя использовать одновременно" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track требует имя ветки" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "Пропущено имя ветки; попробуйте -b" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "неправильная спецификация пути" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, 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 "Нельзя обновить пути и одновременно переключить на ветку «%s».\nВы хотели переключиться на «%s», что не может быть определено как коммит?" +msgstr "Нельзя обновить пути и одновременно переключиться на ветку «%s».\nВы хотели переключиться на «%s», что не может быть определено как коммит?" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach не принимает путь «%s» как аргумент" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4466,8 +4684,8 @@ msgstr "интерактивная очистка" msgid "remove whole directories" msgstr "удалить каталоги полностью" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: 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 msgid "pattern" msgstr "шаблон" @@ -4503,286 +4721,290 @@ msgstr "clean.requireForce установлен по умолчанию как t msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "не переключать рабочую копию на HEAD" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "создать голый репозиторий" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "создать зеркало репозитория (включает в себя и параметр bare)" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "для клонирования из локального репозитория" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "не использовать жесткие ссылки, всегда копировать файлы" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "настроить как общедоступный репозиторий" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "инициализировать подмодули в клоне" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "количество подмодулей, которые будут клонированы парралельно" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "каталог-шаблонов" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "каталог, шаблоны из которого будут использованы" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "ссылаемый репозиторий" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "используйте --reference только при клонировании" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "имя" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" -msgstr "перейти на <ветку>, вместо HEAD внешнего репозитория" +msgstr "переключиться на <ветку>, вместо HEAD внешнего репозитория" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "путь к git-upload-pack на внешнем репозитории" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 -#: builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 +#: builtin/pull.c:201 msgid "depth" msgstr "глубина" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "сделать частичный клон указанной глубины" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "клонировать только одну ветку, HEAD или --branch" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "все склонированные подмодули будут частичными клонами" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "каталог-git" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "разместить каталог git отдельно от рабочей копии" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "ключ=значение" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "установить параметры внутри нового репозитория" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "использовать только IPv4 адреса" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "использовать только IPv6 адреса" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "Имя каталога не может быть угадано.\nУкажите имя каталога с помощью параметра командной строки" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается." -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "ссылаемый репозиторий «%s» не является локальным." -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "ссылаемый репозиторий «%s» является частичным" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "ссылаемый репозиторий «%s» является сращенным" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "не удалось выполнить stat «%s»" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s уже существует и не является каталогом" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "не удалось выполнить stat %s\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "не удалось создать ссылку «%s»" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "не удалось копировать файл в «%s»" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "готово.\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" -msgstr "Клонирование прошло успешно, но во время перехода на версию произошла ошибка.\nС помощь команды «git status» вы можете просмотреть, какие файлы были обновлены, а повторить попытку перехода на версию с помощью «git checkout -f HEAD»\n" +msgstr "Клонирование прошло успешно, но во время переключения состояния произошла ошибка.\nС помощь команды «git status» вы можете просмотреть, какие файлы были обновлены, а повторить попытку переключения на ветку с помощью «git checkout -f HEAD»\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Не удалось найти внешнюю ветку %s для клонирования." -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "Проверка соединения… " -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "внешний репозиторий прислал не все необходимые объекты" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "не удалось обновить %s" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя перейти на такую версию.\n" +msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на такую версию.\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" -msgstr "не удалось перейти на версию в рабочем каталоге" +msgstr "не удалось переключиться на версию в рабочем каталоге" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "не удалось записать параметры в файл конфигурации" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "не удалось выполнить перепаковку для очистки" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "не удалось отсоединить временные альтернативные файлы" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "Слишком много аргументов." -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "Вы должны указать репозиторий для клонирования." -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare и --origin %s нельзя использовать одновременно." -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare и --separate-git-dir нельзя использовать одновременно." -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "репозиторий «%s» не существует" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "глубина %s не является положительным числом" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевой путь «%s» уже существует и не является пустым каталогом." -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "рабочий каталог «%s» уже существует." -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "не удалось создать родительские каталоги для «%s»" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "не удалось создать рабочий каталог «%s»" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клонирование в голый репозиторий «%s»…\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клонирование в «%s»…\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://." -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "исходный репозиторий является частичным, --local игнорируется" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local игнорируется" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "Не знаю как клонировать %s" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "Похоже, что вы клонировали пустой репозиторий." @@ -4885,103 +5107,103 @@ msgid "" "the remaining commits.\n" msgstr "Если вы хотите пропустит этот коммит, используйте команду:\n\n git reset\n\nПосле этого «git cherry-pick --continue» продолжит отбор лучшего\nв оставшихся коммитах.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "сбой распаковки объекта дерева HEAD" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "не удалось создать временный индекс" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "сбой интерактивного добавления" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "не удалось обновить временный индекс" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "Сбой при обновлении основного кэша дерева" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "не удалось записать файл new_index" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "нельзя создать частичный коммит во время слияния." -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "нельзя создать частичный коммит во время отбора лучшего коммита." -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "не удалось прочитать индекс" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "не удалось записать временный файл индекса" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "у коммита «%s» отсутствует автор в заголовке" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "у коммита «%s» строка автора в неправильном формате" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "параметр --author в неправильном формате" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "неправильный формат даты: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "не удалось запросить коммит %s" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "(чтение файла журнала из стандартного ввода)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "не удалось прочитать файл журнала из стандартного ввода" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "не удалось прочитать файл журнала «%s»" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "не удалось прочитать MERGE_MSG" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "не удалось прочитать SQUASH_MSG" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "не удалось прочитать MERGE_MSG" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "не удалось записать шаблон описания коммита" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -4991,7 +5213,7 @@ msgid "" "and try again.\n" msgstr "\nПохоже, что вы пытаетесь закоммитить слияние.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5001,14 +5223,14 @@ msgid "" "and try again.\n" msgstr "\nПохоже, что вы пытаетесь закоммитить отбор лучшего.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут проигнорированы, а пустое сообщение\nотменяет процесс коммита.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5016,341 +5238,341 @@ msgid "" "An empty message aborts the commit.\n" msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\nесли хотите. Пустое сообщение отменяет процесс коммита.\n" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sАвтор: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sДата: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sКоммитер: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "Не удалось прочитать индекс" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "Ошибка при построении деревьев" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 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:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Неправильный режим неотслеживаемых файлов «%s»" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "--long и -z нельзя использовать одновременно" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "Указание одновременно опций --reset-author и --author не имеет смысла" -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "Нечего исправлять." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "Вы в процессе слияния — сейчас нельзя исправлять." -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Вы в процессе отбора лучшего — сейчас нельзя исправлять." -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "Опции --squash и --fixup не могут использоваться одновременно" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup." -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Опция -m не может использоваться с -c/-C/-F/--fixup." -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author может использоваться только одновременно с опциями -C, -c или --amend." -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Может использоваться только одна из опций --include/--only/--all/--interactive/--patch." -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 msgid "No paths with --include/--only does not make sense." msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла." -#: builtin/commit.c:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "Умно… отмена последнего с измененным индексом." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Пути явно указаны пути без опций -i или -o; предполагаю опцию --only…" -#: builtin/commit.c:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Неправильное значение режима очистки %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "С опцией -a указание пути не имеет смысла." -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "кратко показать статус" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "показать информацию о версии" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "машиночитаемый вывод" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "показать статус в длинном формате (по умолчанию)" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "завершать записи НУЛЕВЫМ байтом" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "режим" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как обычно), no (нет). (По умолчанию: all)" -#: builtin/commit.c:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "показать игнорируемые файлы" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "когда" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (измененные), untracked (неотслеживаемые). (По умолчанию: all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "показать неотслеживаемые файлы по столбцам" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "нельзя запросить новосозданный коммит" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "нельзя разобрать новосозданный коммит" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "отделённый HEAD" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (корневой коммит)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "не выводить сводку после успешного коммита" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "добавить список изменений в шаблон сообщения коммита" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "Опции сообщения коммита" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "прочитать сообщение из файла" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "автор" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "подменить автора коммита" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "дата" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "подменить дату коммита" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "сообщение" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "сообщение коммита" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "коммит" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "использовать и отредактировать сообщение от указанного коммита" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "использовать сообщение указанного коммита" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" msgstr "использовать форматированное сообщение автоуплотнения для уплотнения указанного коммита" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "коммит теперь за моим авторством (с использованием -C/-c/--amend)" -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "добавить Signed-off-by:" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "использовать указанный файл шаблона" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "принудительно редактировать коммит" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "по-умолчанию" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "как удалять пробелы и #комментарии из сообщения коммита" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "включить статус файлов в шаблон сообщения коммита" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "подписать коммит с помощью GPG" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "Опции содержимого коммита" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "закоммитить все измененные файлы" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "добавить указанные файлы в индекс для коммита" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "интерактивное добавление файлов" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "интерактивное добавление изменений" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "закоммитить только указанные файлы" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "пропустить перехватчик перед-коммитом" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "показать, что будет закоммичено" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "исправить предыдущий коммит" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "пропустить перехватчик после-перезаписи" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "разрешить запись пустого коммита" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "разрешить запись изменений с пустым сообщением" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "не удалось разобрать HEAD коммит" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Файл MERGE_HEAD поврежден (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "не удалось прочитать MERGE_MODE" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "не удалось открыть сообщение коммита: %s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Отмена коммита; вы не изменили сообщение.\n" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Отмена коммита из-за пустого сообщения коммита.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5493,7 +5715,7 @@ msgstr "показать источник настройки (файл, стан msgid "unable to parse default color value" msgstr "не удалось разобрать значение цвета по умолчанию" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5503,7 +5725,7 @@ msgid "" "#\temail = %s\n" msgstr "# Это файл конфигурации пользователя Git.\n[user]\n# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n#\tuser = %s\n#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "не удалось создать файл конфигурации %s" @@ -5539,7 +5761,7 @@ msgstr "аннотированная метка %s не содержит вст msgid "tag '%s' is really '%s' here" msgstr "метка «%s» уже здесь «%s»" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "Недействительное имя объекта %s" @@ -5626,9 +5848,9 @@ msgstr "рассматривать последние <n> меток (по ум msgid "only consider tags matching <pattern>" msgstr "рассматривать только метки по <шаблону>" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" -msgstr "если не найдено, показать сокращенный номер ревизии коммита" +msgstr "если не найдено, показать сокращенный номер редакции коммита" #: builtin/describe.c:411 msgid "mark" @@ -5660,21 +5882,21 @@ msgstr "«%s»: не является обычным файлом или сим msgid "invalid option: %s" msgstr "неправильный параметр: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "Не является репозиторием git" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "передан неправильный объект «%s»." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "передано больше двух двоичных объектов: «%s»" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "передан необработанный объект «%s»." @@ -5747,19 +5969,19 @@ msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <гру msgid "git fetch --all [<options>]" msgstr "git fetch --all [<опции>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "извлечь со всех внешних репозиториев" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "дописать к .git/FETCH_HEAD вместо перезаписи" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "путь к программе упаковки пакета на машине с внешним репозиторием" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "принудительная перезапись локальной ветки" @@ -5767,7 +5989,7 @@ msgstr "принудительная перезапись локальной в msgid "fetch from multiple remotes" msgstr "извлечь с нескольких внешних репозиториев" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "извлечь все метки и связанные объекты" @@ -5779,19 +6001,19 @@ msgstr "не извлекать все метки (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "количество подмодулей, которые будут скачаны парралельно" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории" -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "по требованию" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "управление рекурсивным извлечением подмодулей" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "оставить загруженный пакет данных" @@ -5799,15 +6021,15 @@ msgstr "оставить загруженный пакет данных" msgid "allow updating of HEAD ref" msgstr "разрешить обновление ссылки HEAD" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "глубокая история частичного клона" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "преобразовать в полный репозиторий" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "каталог" @@ -5819,15 +6041,15 @@ msgstr "присоединять это спереди к выводу путе msgid "default mode for recursion" msgstr "режим по умолчанию для рекурсии" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "принимать ссылки, которые обновляют .git/shallow" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "соответствие-ссылок" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "указать соответствие ссылок при извлечении" @@ -5885,11 +6107,6 @@ msgstr "принудительное обновление" msgid "(non-fast-forward)" msgstr "(без перемотки вперед)" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "не удалось открыть %s: %s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6084,55 +6301,55 @@ msgstr "Проверка соединения" msgid "Checking object directories" msgstr "Проверка каталогов объектов" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<опции>] [<объект>…]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "показать недоступные объекты" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "показать объекты, на которые нет ссылок" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "вывести отчет по меткам" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "вывести отчет по корневым узлам" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "воспринимать объекты в индексе как корневые узлы" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "создать корневые узлы журналов ссылок (по умолчанию)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "также проверять пакеты и альтернативные объекты" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "только проверить соединение" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "использовать более строгую проверку" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "записать объекты на которые нет ссылок в .git/lost-found" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "показать прогресс выполнения" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "Проверка объектов" @@ -6227,214 +6444,214 @@ msgstr "не удалось прочитать дерево (%s)" msgid "unable to grep from object of type %s" msgstr "не удалось выполнить grep из объекта типа %s" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "параметр «%c» ожидает числовое значение" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "не удалось открыть «%s»" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "искать в индексе, а не в рабочем каталоге" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "искать в содержимом не управляемым git" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "игнорировать файлы указанные в «.gitignore»" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "искать в несовпадающих строках" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "без учета регистра" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "искать совпадения шаблона только на границах слов" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "обработка двоичных файлов как текста" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "не искать совпадения шаблона в двоичных файлах" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "обрабатываться двоичные файлы с помощью фильтров textconv" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "на глубине максиму <глубина> уровней" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "использовать расширенные регулярные выражения POSIX" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "интерпретировать шаблоны как фиксированные строки" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "использовать Perl-совместимые регулярные выражения" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "вывести номера строк" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "не выводить имена файлов" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "выводить имена файлов" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "выводить имена файлов относительно каталога репозитория" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "выводить только имена файлов, а не совпадающие строки" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "синоним для --files-with-matches" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "выводить только несовпадающие имена файлов" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "выводить двоичный НОЛЬ после списка имен файлов" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "выводить количество совпадений, а не совпадающие строки" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "подсвечивать совпадения" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "выводить пустую строку после совпадений из разных файлов" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "выводить имя файла только раз на несколько совпадений в одном файле" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "показать <n> строк контекста перед и после совпадения" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "показать <n> строк контекста перед совпадением" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "показать <n> строк контекста после совпадения" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "использовать <кол> рабочих потоков" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "тоже, что и -C КОЛИЧЕСТВО" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "показать строку с именем функции перед совпадением" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "показать окружающую функцию" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "прочитать шаблоны из файла" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "поиск соответствий с <шаблоном>" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "объединить шаблоны указанные с помощью -e" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "ничего не выводить, указать на совпадение с помощью кода выхода" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "показать только совпадения из файлов в которых совпадают все шаблоны" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "показать дерево разбора для выражения поиска" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "пейджер" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "показать совпадающие файлы с помощью программы-пейджера" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "не задан шаблон." -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "указано неправильное количество потоков (%d)" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager работает только в рабочем каталоге" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached или --untracked нельзя использовать одновременно с --no-index." -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." -msgstr "--no-index или --untracked нельзя использовать одновременно с указанием ревизии." +msgstr "--no-index или --untracked нельзя использовать одновременно с указанием редакции." -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard не может использоваться для отслеживаемого содержимого." -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "указано одновременно --cached и дерево." @@ -6521,8 +6738,8 @@ msgstr "версия emacsclient «%d» слишком старая (< 22)." #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "сбой при запуске «%s»: %s" +msgid "failed to exec '%s'" +msgstr "сбой при запуске «%s»" #: builtin/help.c:205 #, c-format @@ -6780,15 +6997,19 @@ msgstr "безумная путаница" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "завершено с %d локальными объектами" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "завершено с %d локальным объектом" +msgstr[1] "завершено с %d локальными объектами" +msgstr[2] "завершено с %d локальными объектами" +msgstr[3] "завершено с %d локальными объектами" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" @@ -6797,59 +7018,59 @@ msgstr[1] "пакет содержит %d неразрешенные дельт msgstr[2] "пакет содержит %d неразрешенных дельт" msgstr[3] "пакет содержит %d неразрешенных дельт" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "нельзя сжать присоединенный объект (%d)" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "локальный объект %s поврежден" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "ошибка при закрытии файла пакета" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "не удалось записать файл удержания «%s»" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "не удалось закрыть записанный файл удержания «%s»" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "не удалось сохранить файл пакета" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "не удалось сохранить файл индекса" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "плохой pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "нет поддержки потоков, игнорирование %s" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Не удалось открыть существующий файл пакета «%s»" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Не удалось открыть существующий файл индекса для «%s»" -#: builtin/index-pack.c:1587 +#: builtin/index-pack.c:1589 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" @@ -6858,7 +7079,7 @@ msgstr[1] "не дельты: %d объекта" msgstr[2] "не дельты: %d объектов" msgstr[3] "не дельты: %d объектов" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1596 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" @@ -6867,26 +7088,26 @@ msgstr[1] "длина цепочки = %d: %lu объекта" msgstr[2] "длина цепочки = %d: %lu объектов" msgstr[3] "длина цепочки = %d: %lu объектов" -#: builtin/index-pack.c:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "имя пакета «%s» не оканчивается на «.pack»" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "Не удалось вернуться в текущий рабочий каталог" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "плохой %s" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin нельзя использовать без --stdin" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "имя пакета «%s» не оканчивается на «.pack»" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "--verify без указания имени файла пакета" @@ -6925,27 +7146,27 @@ msgstr "не удалось скопировать файл «%s» в «%s»" msgid "ignoring template %s" msgstr "игнорирование шаблона %s" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "шаблоны не найдены %s" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "не копирую шаблоны в неправильной версии формата %d из «%s»" +msgid "not copying templates from '%s': %s" +msgstr "не копирую шаблоны из «%s»: %s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s уже существует" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "не удается обработать файл типа %d" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "не удается переместить файл %s в %s" @@ -6953,55 +7174,55 @@ 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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s репозиторий Git в %s%s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "Переинициализация существующего" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "Инициализирован пустой" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr " общий" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] " "[--shared[=<permissions>]] [<directory>]" msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доступа>]] [<каталог>]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "права-доступа" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "укажите, если репозиторий git будет использоваться несколькими пользователями" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "не удалось выполнить mkdir %s" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "не удалось выполнить chdir в %s" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "%s (или --work-tree=<каталог>) нельзя использовать без указания %s (или --git-dir=<каталог>)" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "Не удалось получить доступ к рабочему каталогу «%s»" @@ -7045,274 +7266,317 @@ msgstr "git show [<опции>] <объект>…" msgid "invalid --decorate option: %s" msgstr "неправильный параметр для --decorate: %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "не выводить различия" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "показать источник" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "Использовать файл соответствия почтовых адресов" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "опции формата вывода ссылок" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "Обработать диапазон строк n,m из файла, начиная с 1" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "Финальный вывод: %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: плохой файл" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "Не удалось прочитать объект %s" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "Неизвестный тип объекта: %d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "в format.headers не указано значение" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "слишком длинное имя выходного каталога" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "Ну удалось открыть файл изменений %s" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "Нужен только один диапазон." -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "Не является диапазоном." -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "Сопроводительное письмо должно быть в формате электронной почты" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "ошибка в поле in-reply-to: %s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "Два выходных каталога?" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, 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 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Не удалось разрешить «%s» как ссылку." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "Не удалось найти точную базу слияния." + +#: builtin/log.c:1235 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "Не удалось получить вышестоящую ветку. Если вы хотите записать базовый коммит автомитически, то используйте git branch --set-upstream-to для отслеживания внешней ветки.\nИли же вы можете указать базовый коммит указанием --base=<идентификатор-базового-коммита> вручную." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "Не удалось найти точную базу слияния" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "базовый коммит должен быть предком списка редакций" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "базовый коммит не должен быть в списке редакций" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "не удалось получить идентификатор патча" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "выводить [PATCH n/m] даже когда один патч" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "выводить [PATCH] даже когда несколько патчей" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "выводить патчи на стандартный вывод" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "генерировать сопроводительное письмо" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "использовать простую последовательность чисел для имен выходных файлов" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "суффикс" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "использовать суффикс <суффикс> вместо «.patch»" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "начать нумерацию патчей с <n>, а не с 1" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "пометить серию как энную попытку" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Использовать [<префикс>] вместо [PATCH]" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "сохранить результирующие файлы в <каталог>" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "не обрезать/добавлять [PATCH]" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "не выводить двоичные различия" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "выводить нулевую хэш-сумму в заголовке From" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "не включать патч, если коммит уже есть в вышестоящей ветке" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "выводить в формате патча, а не в стандартном (патч + статистика)" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "Передача сообщений" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "заголовок" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "добавить заголовок сообщения" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "почта" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "добавить заголовок To:" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "добавить заголовок Cc:" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "идентификатор" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "идентификатор-сообщения" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "сделать первое письмо ответом на <идентификатор-сообщения>" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "вложение" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "приложить патч" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "включить патч в текст письма" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "подпись" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "добавить подпись" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "базовый коммит" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "добавить информацию о требовании дерева к серии патчей" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "добавить подпись из файла" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "не выводить имена файлов патчей" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n и -k нельзя использовать одновременно" -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix и -k нельзя использовать одновременно." -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "--name-only не имеет смысла" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "--name-status не имеет смысла" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "--check не имеет смысла" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "стандартный вывод или каталог?" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "Не удалось создать каталог «%s»" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "не удалось прочитать файл подписи «%s»" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "Сбой при создании выходных файлов" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<вышестоящая-ветка> [<голова> [<ограничение>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> " "manually.\n" msgstr "Не удалось найти отслеживаемую внешнюю ветку, укажите <вышестоящую-ветку> вручную.\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "Неизвестный коммит %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<опции>] [<файл>…]" @@ -7500,170 +7764,174 @@ msgstr "git merge [<опции>] <сообщение> HEAD <коммит>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "при указании параметра «m» требуется указать значение" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Не удалось найти стратегию слияния «%s».\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "Доступные стратегии:" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "Доступные пользовательские стратегии:" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "не выводить статистику изменений после окончания слияния" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "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:132 msgid "(synonym to --stat)" msgstr "(синоним для --stat)" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "создать один коммит, вместо выполнения слияния" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "отредактировать сообщение перед выполнением коммита" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "разрешить перемотку вперед (по умолчанию)" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "отменить выполнение слияния, если перемотка вперед невозможна" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "Проверить, что указанный коммит имеет верную электронную подпись GPG" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "стратегия" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "используемая стратегия слияния" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "опция=значение" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "опции для выбранной стратегии слияния" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "отменить выполнение происходящего слияния" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "разрешить слияние несвязанных историй изменений" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "не удалось выполнить stash." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "сбой при выполнении stash" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "неправильный объект: %s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "сбой при выполнении read-tree" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (нечего уплотнять)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Уплотнение коммита — не обновляя HEAD\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: 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:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "Запись SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "Завершение SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Нет сообщения слияния — не обновляем HEAD\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "«%s» не указывает на коммит" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправильная строка branch.%s.mergeoptions: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "Не обрабатываю ничего, кроме слияния двух указателей на ветки." -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Неизвестный параметр merge-recursive: -X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "не удалось записать %s" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "Не удалось прочесть из «%s»" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7673,157 +7941,161 @@ msgid "" "the commit.\n" msgstr "Пожалуйста, введите сообщение коммита, для объяснения, зачем нужно\nэто слияние, особенно, если это слияние обновленной вышестоящей\nветки в тематическую ветку.\n\nСтроки, начинающиеся с «%c» будут проигнорированы, а пустое\nсообщение отменяет процесс коммита.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "Пустое сообщение коммита." -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "Прекрасно.\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "«%s» не является коммитом" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "Нет текущей ветки." -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "У текущей ветки нет внешнего репозитория." -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию." -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Не указана внешняя отслеживаемая ветка для %s на %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "не удалось закрыть «%s»" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)." -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед слиянием." -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 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:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Вы не завершили отбор лучшего (присутствует файл CHERRY_PICK_HEAD)." -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "Нельзя использовать одновременно --squash и --no-ff." -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен." -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "Уплотнение коммита в пустую ветку еще не поддерживается" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустую ветку." -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "%s не является тем, что можно слить" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "Можно только один коммит в пустую ветку." -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s." -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s." -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Коммит %s не содержит GPG подпись." -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "отказ слияния несвязанных историй изменений" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "Обновление %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Попытка тривиального слияния в индексе…\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "Не вышло.\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "Перемотка вперед невозможна, отмена." -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Перемотка дерева к исходному состоянию…\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Попытка слияния с помощью стратегии %s…\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ни одна стратегия слияния не обработала слияние.\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Сбой при слиянии с помощью стратегии %s.\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед выполнением коммита\n" @@ -7858,7 +8130,7 @@ msgstr "вывести предков для одного многоходово #: builtin/merge-base.c:218 msgid "list revs not reachable from others" -msgstr "вывести список ревизий, которые не достижимы из друг друга" +msgstr "вывести список редаций, которые не достижимы из друг друга" #: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" @@ -7931,7 +8203,7 @@ msgstr "git mv [<опции>] <источник>… <назначение>" msgid "Directory %s is in index and no submodule?" msgstr "Каталог %s в индексе и не является подмодулем?" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "Чтобы продолжить, проиндексируйте или спрячьте ваши изменения в файле .gitmodules" @@ -8009,48 +8281,48 @@ msgstr "%s, откуда=%s, куда=%s" msgid "Renaming %s to %s\n" msgstr "Переименование %s в %s\n" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "сбой при переименовании «%s»" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<опции>] <коммит>…" -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<опции>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<опции>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "выводить только имена (без SHA-1)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "использовать только метки для именования коммитов" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "использовать только ссылки, соответствующие <шаблону> " -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "вывести список всех коммитов, достижимых со всех ссылок" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "прочитать из стандартного ввода" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "разрешить вывод «undefined», если не найдено (по умолчанию)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "разыменовывать введенные метки (для внутреннего использования)" @@ -8191,24 +8463,16 @@ msgstr "не удалось записать объект заметки" msgid "The note contents have been left in %s" msgstr "Содержимое заметки осталось в %s" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "не удалось прочитать «%s»" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "не удалось открыть или прочитать «%s»" -#: 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:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Не удалось разрешить «%s» как ссылку." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8221,7 +8485,7 @@ msgstr "Не удалось прочитать данные заметки из #: 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:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "передано слишком много параметров" @@ -8266,7 +8530,7 @@ msgstr "Не удалось добавить заметку. Найдена су msgid "Overwriting existing notes for object %s\n" msgstr "Перезапись существующих заметок у объекта %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "Удаление заметки у объекта %s\n" @@ -8302,63 +8566,63 @@ msgid "" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "Опции -m/-F/-c/-C для подкоманды «edit» устарели.\nИспользуйте вместо них «git notes add -f -m/-F/-c/-C».\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "Общие опции" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "Опции слияния" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy " "(manual/ours/theirs/union/cat_sort_uniq)" msgstr "разрешить конфликты заметок с помощью указанной стратегии (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "Коммит не слитых заметок" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "завершить слияние заметок коммитом не слитых заметок" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "Отмена разрешения слияния заметок" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "отменить слияние заметок" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "Слияние заметок в %s уже выполняется на %s" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "У объекта %s нет заметки\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "попытка удаления несуществующей заметки не является ошибкой" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "прочитать имена объектов из стандартного ввода" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "ссылка-на-заметку" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "использовать заметку из <ссылка-на-заметку>" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "Неизвестная подкоманда: %s" @@ -8378,165 +8642,169 @@ msgstr "git pack-objects [<опции>…] <имя-базы> [< <список-с msgid "deflate error (%d)" msgstr "ошибка сжатия (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "отключение записи битовых карт, так как карты были разбиты на части из-за pack.packSizeLimit" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "Запись объектов" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "отключение записи битовых карт, так как некоторые объекты не были упакованы" -#: builtin/pack-objects.c:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "Сжатие объектов" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "неподдерживаемая версия индекса %s" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "плохая версия индекса «%s»" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "не выводить прогресс выполнения" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "показать прогресс выполнения" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "показать прогресс выполнения во время записи объектов" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "похоже на --all-progress при включенном прогрессе выполнения" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "версия[,смещение]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "записать файл индекса пакета в указанной версии формата" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "максимальный размер каждого выходного файла пакета" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "игнорировать упакованные объекты" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "ограничить окно пакета по количеству объектов" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2619 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "использовать повторно существующие дельты" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "использовать повторно существующие объекты" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "использовать объекты OFS_DELTA" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 msgid "use threads when searching for best delta matches" msgstr "использовать многопоточность при поиске лучших совпадений дельт" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "не создавать пустые выходные пакеты" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "прочитать аргументы редакций из стандартного ввода" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 msgid "limit the objects to those that are not yet packed" msgstr "ограничиться объектами, которые еще не упакованы" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "включить объекты, которые достижимы по любой из ссылок" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "включить объекты, на которые ссылаются записи журнала ссылок" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "включить объекты, на которые ссылается индекс" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "вывести пакет на стандартный вывод" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "сохранять ссылки на недоступные объекты" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "время" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "распаковать недоступные объекты, которые новее, чем <время>" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "создавать тонкие пакеты" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "создавать пакеты, подходящие для частичных извлечений" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "уровень сжатия пакета" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "не скрывать коммиты сращениями" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 msgid "use a bitmap index if available to speed up counting objects" msgstr "по возможности использовать индекс в битовых картах, для ускорения подсчета объектов" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "запись индекса в битовых картах вместе с индексом пакета" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "Подсчет объектов" @@ -8564,15 +8832,15 @@ msgstr "Удаление дублирующихся объектов" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <время>] [--] [<имя-ветки>…]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "не удалять, только показать список" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "вывести список удаленных объектов" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "удалить объекты старее чем <дата-окончания>" @@ -8584,65 +8852,69 @@ msgstr "нельзя почистить неиспользуемые объек msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<опции>] [<репозиторий> [<спецификация-ссылки>…]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "Опции, связанные со слиянием" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "забрать изменения с помощью перебазирования, а не слияния" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "разрешить перемотку вперед" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "автоматически выполнять stash/stash pop до и после перемещения" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "Опции, связанные с извлечением изменений" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "количество подмодулей, которые будут получены парралельно" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Неправильное значение для pull.ff: %s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "Не удалось получить с перемещением: У вас есть непроиндексированные изменения." -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "К тому же, в вашем индексе есть незакоммиченные изменения." -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "Не удалось получить с перемещением: В вашем индексе есть незакоммиченные изменения." -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "Нет претендентов для перемещения среди ссылок, которые вы только что получили." -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "Нет претендентов для слияния среди ссылок, которые вы только что получили." -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "Обычно это означает, что вы передали спецификацию ссылки с помощью шаблона и этот шаблон ни с чем не совпал на внешнем репозитории." -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -8650,46 +8922,57 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "Вы попросили получить изменения со внешнего репозитория «%s», но не указали ветку. Так как это не репозиторий по умолчанию для вашей текущей ветки, вы должны указать ветку в командной строке." -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Вы сейчас ни на одной из веток." -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Пожалуйста, укажите на какую ветку вы хотите переместить изменения." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Пожалуйста, укажите с какой веткой вы хотите слить изменения." -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "Для дополнительной информации, смотрите git-pull(1)." -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<внешний-репозиторий>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<ветка>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "У текущей ветки нет информации об отслеживании." -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" -msgstr "Если вы хотите указать информацию о отслеживаемой ветке, выполните:\n\n git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "Если вы хотите указать информацию о отслеживаемой ветке, выполните:" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "Ваша конфигурация указывает, что нужно слить изменения со ссылкой\n«%s» из внешнего репозитория, но такая ссылка не была получена." -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "--[no-]autostash можно использовать только вместе с --rebase." + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "Обновление еще не начавшейся ветки с изменениями, добавленными в индекс." -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -8697,7 +8980,7 @@ msgid "" "commit %s." msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nс коммита %s." -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -8708,11 +8991,11 @@ msgid "" "to recover." msgstr "Не удалось перемотать вперёд изменения в вашем рабочем каталоге.\nПосле того, как вы убедитесь, что вы сохранили всё необходимое из вывода\n$ git diff %s\n, запустите\n$ git reset --hard\nдля восстановления исходного состояния." -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "Нельзя слить несколько веток в пустой указатель на ветку." -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "Невозможно переместить над несколькими ветками." @@ -9011,12 +9294,24 @@ msgstr "не обновлять индекс или рабочий катало #: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" -msgstr "пропустить применение фильтра частичного перехода" +msgstr "пропустить применение фильтра частичного переключения на состояние" #: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "отладка unpack-trees" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <каталог-git>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "тихий режим" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "Вы должны указать каталог." + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9330,26 +9625,28 @@ msgstr "* внешний репозиторий %s" msgid " Fetch URL: %s" msgstr " URL для извлечения: %s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(нет URL)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " URL для отправки: %s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " HEAD ветка: %s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD ветка (HEAD внешнего репозитория неоднозначный, может быть одним из):\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -9358,11 +9655,11 @@ msgstr[1] " Внешние ветки:%s" msgstr[2] " Внешние ветки:%s" msgstr[3] " Внешние ветки:%s" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (статус не запрошен)" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Локальная ветка, настроенная для «git pull»:" @@ -9370,11 +9667,11 @@ msgstr[1] " Локальные ветки, настроенные для «git msgstr[2] " Локальные ветки, настроенные для «git pull»:" msgstr[3] " Локальные ветки, настроенные для «git pull»:" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " Локальные ссылки, зеркалируемые с помощью «git push»" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" @@ -9383,128 +9680,128 @@ msgstr[1] " Локальные ссылки, настроенные для «gi msgstr[2] " Локальные ссылки, настроенные для «git push»%s:" msgstr[3] " Локальные ссылки, настроенные для «git push»%s:" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "удалить refs/remotes/<имя>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "Не удалось определить внешний HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Несколько внешних HEAD веток. Укажите явно одну из них:" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "Не удалось удалить %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "Неправильная ссылка: %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "Не удалось настроить %s" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s будет висящей веткой!" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s стала висящей веткой!" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "Удаление %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [будет удалена] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [удалена] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "почистить внешние репозитории после извлечения" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Нет такого внешнего репозитория «%s»" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "добавить ветку" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "не указан внешний репозиторий" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "запросить URL отправки, вместо URL извлечения" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "вернуть все URL" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "URL не настроены для внешнего репозитория «%s»" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "управление URL отправки" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "добавить URL" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "удалить URL" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add нельзя использовать одновременно с --delete" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Неправильный шаблон старого URL: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "Не найдены совпадения URL: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "Нельзя удалить все URL не-отправки" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "быть многословнее; должно стоять перед подкомандой" @@ -9998,10 +10295,6 @@ msgstr "разрешить рекурсивное удаление" msgid "exit with a zero status even if nothing matched" msgstr "выход с нулевым кодом возврата, даже если ничего не найдено" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "Пожалуйста, проиндексируйте ваши изменения в .gitmodules или спрячьте их, чтобы продолжить" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10192,80 +10485,178 @@ msgstr "пропустить и удалить все строки, начина msgid "prepend comment character and space to each line" msgstr "добавить перед каждой строкой символ комметария и пробел" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "Нет такой ссылки: %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "Ожидалось полное имя ссылки, а получено %s" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "не удалось обрезать один компонент url «%s»" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "альтернативный символ для относительных путей" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "URL для подмодуля по пути «%s» не найден в .gitmodules" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "Сбой регистрации адреса для пути подмодуля «%s»" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "Подмодуль «%s» (%s) зарегистрирован по пути «%s»\n" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "внимание: предполагаемый режим обновления для подмодуля «%s»\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "Сбой регистрации режима обновления для пути подмодуля «%s»" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "Не выводить информацию о инициализации подмодуля" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<путь>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <путь>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "не найдено соответствие подмодулей в .gitmodules для пути «%s»" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "куда должен быть склонирован новый подмодуль" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "имя нового подмодуля" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "url откуда должен был склонирован новый подмодуль" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "глубина для частичного клона" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] " -"[<path>...]" -msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имя>] [--url <url>][--depth <глубина>] [--] [<путь>…]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имя>] [--depth <глубина>] --url <url> --path <путь>" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "не удалось создать каталог «%s»" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "не удалось клонировать «%s» в подмодуль по пути «%s»" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "не удалось открыть файл «%s»" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "не удалось закрыть файл %s" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "не удалось получить каталог для подмодуля «%s»" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" -msgstr "критическая ошибка: подкоманда submodule--helper должна вызываться с указанием подкоманды" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "Подмодуль по пути «%s» не инициализирован" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "Возможно, вы хотели использовать «update --init»?" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "Пропуск не слитого подмодуля %s" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:660 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "критическая ошибка: «%s» не является подкомандой submodule--helper" +msgid "Skipping submodule '%s'" +msgstr "Пропуск подмодуля «%s»" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "путь в рабочем каталоге" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "путь в рабочем каталоге, в пределах границ подмодуля" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "rebase, merge, checkout или none" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "Создать частичный клон, ограниченный указанным количеством редакций" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "параллельные задачи" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "вы выводить прогресс клонирования" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<путь>] [<путь>…]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "плохое значение для параметра update" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "подкоманда submodule--helper должна вызываться с указанием подкоманды" + +#: builtin/submodule--helper.c:862 +#, c-format +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "«%s» не является подкомандой submodule--helper" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10315,27 +10706,22 @@ msgstr "git tag -l [-n[<количество>]] [--contains <коммит>] [--p msgid "git tag -v <tagname>..." msgstr "git tag -v <имя-метки>…" -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "слишком длинное имя метки: %.*s…" -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "метка «%s» не найдена." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Метка «%s» удалена (была %s)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "не удалось проверить метку «%s»" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10344,7 +10730,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут проигнорированы.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10470,21 +10856,21 @@ msgstr "опции --merged и --no-merged можно использовать msgid "only one -F or -m option is allowed." msgstr "-F и -m нельзя использовать одновременно." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "передано слишком много параметров" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "«%s» не является допустимым именем метки." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "метка «%s» уже существует" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Метка «%s» обновлена (была %s)\n" @@ -10732,7 +11118,7 @@ msgstr "git verify-commit [-v | --verbose] <коммит>…" msgid "print commit contents" msgstr "вывести содержимое коммита" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "выводить сырой вывод статуса от gpg" @@ -10752,7 +11138,7 @@ msgstr "вывести только статистику" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <метка>…" -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "вывести содержимое метки" @@ -10768,68 +11154,72 @@ msgstr "git worktree prune [<опции>]" msgid "git worktree list [<options>]" msgstr "git worktree list [<опции>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Удаление рабочих каталогов/%s: не является каталогом" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Удаление рабочих каталогов/%s: файл gitdir не существует" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Удаление рабочих каталогов/%s: не удалось прочитать файл gitdir (%s)" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Удаление рабочих каталогов/%s: недействительный файл gitdir" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Удаление рабочих каталогов/%s: gitdir указывает на несуществующее расположение" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "не удалось удалить: %s" +msgid "failed to remove '%s'" +msgstr "сбой удаления «%s»" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "«%s» уже существует" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "не удалось создать каталог «%s»" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Подготовка %s (идентификатор %s)" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" -msgstr "перейти на <ветка> даже если она уже активна в другом рабочесм каталоге" +msgstr "переключиться на <ветка> даже если она уже активна в другом рабочесм каталоге" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "создать новую ветку" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "создать или перейти на ветку" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "отсоединить HEAD на указанном коммите" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "наполнить новый рабочий каталог" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B и --detach нельзя использовать одновременно" @@ -10849,7 +11239,7 @@ msgstr "вывести объект дерева для подкаталога msgid "only useful for debugging" msgstr "используется только при отладке" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "вывод отладочных сообщений на stderr" @@ -10860,7 +11250,7 @@ msgid "" "to read about a specific subcommand or concept." msgstr "«git help -а» и «git help -g» выводит список доступных подкоманд и\nнекоторые руководства по темам. Запустите «git help <команда>» или\n«git help <термин>», чтобы прочесть о конкретных подкоманде или теме." -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Public key pinning не поддерживается с cURL < 7.44.0" @@ -10988,7 +11378,7 @@ msgstr "тихий режим" msgid "use <n> digits to display SHA-1s" msgstr "использовать <n> цифр для вывода SHA-1" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "обновить индекс с помощью переиспользования разрешения конфликта, если возможно" @@ -11180,58 +11570,54 @@ msgid "" "To check out the original branch and stop rebasing, run \"git rebase --abort\"." msgstr "Когда вы разрешите этот конфликт, запустите «git rebase --continue».\nЕсли вы хотите пропустить этот патч, то запустите «git rebase --skip».\nЧтобы перейти на оригинальную ветку и остановить перемещение, запустите «git rebase --abort»." -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "Применено автоматическое прятанье." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Не удалось сохранить $stash_sha1" -#: git-rebase.sh:169 +#: git-rebase.sh:172 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:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Перехватчик пре-перемещения отказал в перемещении." -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Похоже, git-am выполняется. Перемещение невозможно." -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "Опция --exec должна использоваться вместе с опцией --interactive" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Нет перемещения в процессе?" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении." -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Не удалось прочитать HEAD" -#: git-rebase.sh:380 +#: git-rebase.sh:378 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:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "Не удалось перейти назад на $head_name" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11244,64 +11630,64 @@ msgid "" "valuable there." msgstr "Похоже, каталог $state_dir_base уже существует и я предполагаю, что вы в процессе другого перемещения. Если это так, попробуйте\n\t$cmd_live_rebase\nЕсли нет\n\t$cmd_clear_stale_rebase\nи запустите меня снова. Я останавливаюсь, чтобы вы не потеряли что-то важное." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "недействительная вышестоящая ветка $upstream_name" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: имеется больше одной базы слияния" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: нет базы слияния" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Не указывает на действительный коммит: $onto_name" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "критическая ошибка: нет такой ветки: $branch_name" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "Не удалось выполнить автоматическое прятанье" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Изменения автоматически спрятаны: $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "Сделайте коммит или спрячьте их." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Текущая ветка $branch_name уже свежая." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Текущая ветка $branch_name уже свежая, принудительное перемещение." -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Изменения от $mb до $onto:" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши изменения поверх него…" -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Перемотана вперед $branch_name до $onto_name." @@ -11442,26 +11828,21 @@ msgstr "Не указано имя ветки" msgid "(To restore them type \"git stash apply\")" msgstr "(Чтобы восстановить их, наберите «git stash apply»)" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "не удалось отрезать один компонент адреса «$remoteurl»" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "Относительный путь можно использовать только находясь на вершине рабочего каталога" -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL репозитория: «$repo» должен быть абсолютным или начинаться с ./|../" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "«$sm_path» уже содержится в индексе" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11469,235 +11850,217 @@ msgid "" "Use -f if you really want to add it." msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n$sm_path\nИспользуйте опцию -f, если вы действительно хотите его добавить." -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Добавляю существующий репозиторий из «$sm_path» в индекс" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "«$sm_path» уже существует и не является действительным репозиторием git" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "Каталог git для «$sm_name» найден локально на внешних репозиториях:" -#: git-submodule.sh:342 +#: 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:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr ", то используйте опцию «--force». Если локальный каталог git не является действительным репозиторием" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "или если вы не поняли, что это значит, то просто используйте другое имя с помощью опции «--name»." -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Восстановление локального каталога git для подмодуля «$sm_name»." -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" -msgstr "Не удалось перейти на состояние у подмодуля «$sm_path»" +msgstr "Не удалось переключиться на состояние у подмодуля «$sm_path»" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Сбой добавления подмодуля «$sm_path»" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Не удалось зарегистрировать подмодуль «$sm_path»" -#: git-submodule.sh:417 -#, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "Заходим в «$prefix$displaypath»" - -#: git-submodule.sh:437 -#, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." -msgstr "Останавливаемся на «$prefix$displaypath»; сценарий вернул не нулевой код возврата." - -#: git-submodule.sh:483 +#: git-submodule.sh:355 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "Адрес для пути подмодуля «$displaypath» не найден в .gitmodules" +msgid "Entering '$displaypath'" +msgstr "Заходим в «$displaypath»" -#: git-submodule.sh:492 +#: git-submodule.sh:375 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "Сбой регистрации адресе для пути подмодуля «$displaypath»" +msgid "Stopping at '$displaypath'; script returned non-zero status." +msgstr "Останавливаемся на «$displaypath»; сценарий вернул не нулевой код возврата." -#: git-submodule.sh:494 +#: git-submodule.sh:448 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "Подмодуль «$name» ($url) зарегистрирован для пути «$displaypath»" +msgid "pathspec and --all are incompatible" +msgstr "спецификацию пути и --all нельзя использовать одновременно" -#: git-submodule.sh:511 +#: git-submodule.sh:453 #, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "Сбой регистрации режима обновления для пути подмодуля «$displaypath»" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "Используйте «--all», если вы действительно хотите деинициализировать все подмодули" -#: git-submodule.sh:549 -#, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "Используйте «.», если вы действительно хотите деинициализировать все подмодули" - -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "Рабочий каталог подмодуля «$displaypath» содержит каталог .git" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "(используйте «rm -rf», если вы действительно хотите удалить его, включая всю его историю)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to" " discard them" msgstr "Рабочий каталог подмодуля «$displaypath» содержит локальные изменения; используйте «-f», чтобы отменить их" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Очищен каталог «$displaypath»" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Не удалось удалить рабочий каталог подмодуля «$displaypath»" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Не удалось создать пустой каталог подмодуля «$displaypath»" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "Подмодуль «$name» ($url) был снят с регистрации по пути «$displaypath»" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "Подмодуль по пути «$displaypath» не инициализирован\nВозможно, вам нужно использовать «update --init»?" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Не удалось найти текущую редакцию для подмодуля по пути «$displaypath»" -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Не удалось выполнить извлечение для подмодуля по пути «$sm_path»" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Не удалось выполнить извлечение для подмодуля по пути «$displaypath»" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" -msgstr "Не удалось выполнить переход на состояние «$sha1» для подмодуля по пути «$displaypath»" +msgstr "Не удалось переключиться на состояние «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Подмодуль по пути «$displaypath»: забрано состояние «$sha1»" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Не удалось переместить «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Не удалось выполнить слияние с «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Подмодуль по пути «$displaypath»: слито с «$sha1»" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" -msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$prefix$sm_path»" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" +msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "Подмодуль по пути «$prefix$sm_path»: «$command $sha1»" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$displaypath»" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "Опцию --cached нельзя использовать одновременно с опцией --files" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "неизвестный режим $mod_dst" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Предупреждение: $display_name не содержит коммит $sha1_src" -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Предупреждение: $display_name не содержит коммит $sha1_dst" -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, 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:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "двоичный объект" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$sm_path»" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Синхронизация url для подмодуля «$displaypath»" + +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "Для дополнительной информации, смотрите git-${cmd}(1)." @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git 2.8.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-03-16 00:16+0800\n" -"PO-Revision-Date: 2016-03-15 22:35+0100\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-05-27 14:04+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -31,7 +31,7 @@ msgstr "" "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" "som lämpligt för att ange lösning och checka in." -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." @@ -75,7 +75,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "prefix" @@ -83,9 +83,9 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 +#: 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 msgid "file" @@ -119,7 +119,8 @@ msgstr "komprimera bättre" msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "arkiv" @@ -271,11 +272,16 @@ msgstr "Objektnamnet är tvetydigt: \"%s\"." msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: \"%s\"" -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -286,7 +292,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 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -295,10 +301,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:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: 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 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -337,21 +343,21 @@ 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:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "index-pack dog" @@ -360,8 +366,8 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -395,21 +401,21 @@ msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" @@ -428,24 +434,27 @@ msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d" msgid "%s has multiple values" msgstr "%s har flera värden" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "kunde inte ställa in \"%s\" till \"%s\"" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" -msgstr "Kunde inte ställa in \"%s\" till \"%s\"" +msgid "could not unset '%s'" +msgstr "kunde inte ta bort inställning för \"%s\"" #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "kunde inte skriva till rev-list: %s" +msgid "failed write to rev-list" +msgstr "kunde inte skriva till rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "kunde inte stänga rev-list:s standard in: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "kunde inte stänga rev-list:s standard in" #: date.c:95 msgid "in the future" @@ -520,26 +529,26 @@ msgstr[1] "%lu år sedan" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -548,16 +557,16 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -566,20 +575,20 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "Ospårad cache är inaktiverad på systemet eller platsen." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "kunde inte köra gpg." @@ -593,28 +602,28 @@ msgstr "gpg misslyckades signera data" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "kunde inte skapa temporära filen \"%s\": %s" +msgid "could not create temporary file '%s'" +msgstr "kunde inte skapa temporära filen \"%s\"" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "misslyckades skriva fristående signatur till \"%s\": %s" +msgid "failed writing detached signature to '%s'" +msgstr "misslyckades skriva fristående signatur till \"%s\"" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "\"%s\": %s" +msgid "failed to stat '%s'" +msgstr "misslyckades ta status på \"%s\"" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "\"%s\": kort läsning %s" +msgid "'%s': short read" +msgstr "\"%s\": kort läsning" #: help.c:205 #, c-format @@ -680,12 +689,37 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"Kunde inte skapa \"%s.lock\": %s.\n" +"\n" +"Det verkar som en annan git-process kör i det här arkivet, t.ex.\n" +"ett textredigeringsprogram startat av \"git commit\". Se till att\n" +"alla processer avslutats och försök sedan igen. Om det fortfarande\n" +"misslyckas kanske en git-process har kraschat i det här arkivet\n" +"tidigare:\n" +"ta bort filen manuellt för att fortsätta." + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "kunde inte skapa \"%s.lock\": %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -732,7 +766,7 @@ msgstr "kan inte läsa objektet %s: \"%s\"" msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" @@ -866,7 +900,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)" msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "undermodul" @@ -894,50 +928,50 @@ 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:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa." -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Redan à jour!" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "Obehandlad sökväg??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, 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:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -967,28 +1001,28 @@ msgstr "Felaktigt värde på %s: \"%s\"" msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "..." -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-TAL" @@ -997,7 +1031,7 @@ msgstr "-TAL" msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" @@ -1067,7 +1101,7 @@ msgstr "" "Ingenting att exkludera från med :(exkludera)-mönster.\n" "Glömde du kanske att antingen lägga till \":/\" eller \".\"?" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" @@ -1093,23 +1127,23 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" @@ -1248,93 +1282,93 @@ msgstr "format: atomen %%(end) saknas" msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: remote.c:745 +#: remote.c:746 #, 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:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "Internt fel" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1695 +#: remote.c:1696 #, 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:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:2073 +#: remote.c:2074 #, 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:2078 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:2081 #, 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:2085 #, 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:2091 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:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1344,11 +1378,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2101 +#: remote.c:2102 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:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1363,20 +1397,20 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" @@ -1427,7 +1461,7 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "Kunde inte skriva till %s" @@ -1585,12 +1619,12 @@ msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" msgid "Could not create sequencer directory %s" msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "Fel vid ombrytning av %s." -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" @@ -1602,63 +1636,72 @@ msgstr "kan inte bestämma HEAD" 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:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "kan inte öppna %s: %s" +msgid "cannot open %s" +msgstr "kan inte öppna %s" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:888 +#: sequencer.c:887 #, 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:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "Kunde inte formatera %s." -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "Kan inte ångra som första incheckning" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "Förväntade git-arkivversion <= %d, hittade %d" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "okända arkivutökningar hittades:" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, 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:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" @@ -1685,31 +1728,40 @@ 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:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 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:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, 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:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Kunde inte ta bort .gitmodules-posten för %s" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "negativa värden är inte tillåtna för submodule.fetchJobs" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "ogiltigt värde för %s" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1769,7 +1821,231 @@ msgstr "kunde inte byta nman på temporära file till %s" msgid "Could not read ref %s" msgstr "Kunde inte läsa referensen %s" -#: unpack-trees.c:203 +#: 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." +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 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" +"%%s" + +#: unpack-trees.c:69 +#, 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." +msgstr "" +"Dina lokala ändringar av följande filer skulle skrivas över av " +"sammanslagning:\n" +"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Dina lokala ändringar av följande filer skulle skrivas över av " +"sammanslagning:\n" +"%%s" + +#: unpack-trees.c:74 +#, 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." +msgstr "" +"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" +"%%sChecka in dina ändringar eller använd \"stash\" innan du kan utföra \"%s" +"\"." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\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 +#, 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." +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 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Följande ospårade filer i arbetskatalogen skulle tas bort av " +"sammanslagningen:\n" +"%%sFlytta eller ta bort dem innan du byter gren." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"Följande ospårade filer i arbetskatalogen skulle tas bort av " +"sammanslagningen:\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" +"%%sFlytta eller ta bort dem innan du kan utföra \"%s\"." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"Följande ospårade filer i arbetskatalogen skulle skrivas över av " +"utcheckningen:\n" +"%%sFlytta eller ta bort dem innan du byter gren." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"Följande ospårade filer i arbetskatalogen skulle skrivas över av " +"utcheckningen:\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Följande ospårade filer i arbetskatalogen skulle skrivas över av " +"sammanslagningen:\n" +"%%sFlytta eller ta bort dem innan du byter gren." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Följande ospårade filer i arbetskatalogen skulle skrivas över av " +"sammanslagningen:\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" +"%%sFlytta eller ta bort dem innan du kan \"%s\"." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Följande filer i arbetskatalogen skulle skrivas över av uppdatering av gles " +"utcheckning:\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Följande filer i arbetskatalogen skulle tas bort av uppdatering av gles " +"utcheckning:\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "Avbryter\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "Checkar ut filer" @@ -1807,198 +2083,194 @@ msgstr "felaktigt \"..\"-sökvägssegment" msgid "could not open '%s' for reading and writing" msgstr "kunde inte öppna \"%s\" för läsning och skrivning" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "kan inte komma åt \"%s\": %s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma åt \"%s\"" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "kunde inte öppna %s för skrivning" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "kunde inte skriva till %s" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "kunde inte stänga %s" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (använd \"git add <fil>...\" för att ange lösning)" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (använd \"git checkout -- <fil>...\" för att förkasta ändringar i " "arbetskatalogen)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "programfel: ej hanterad \"unmerged\"-status %x" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "ny fil:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "kopierad:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "borttagen:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "ändrad:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "namnbytt:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "typbyte:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "okänd:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "osammanslagen:" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "ändrat innehåll, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2006,39 +2278,39 @@ msgstr "" "Rör inte raden ovan.\n" "Allt nedan kommer tas bort." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" @@ -2185,43 +2457,43 @@ 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:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå" -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå" -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2233,32 +2505,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1513 +#: wt-status.c:1535 #, 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:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2267,52 +2539,52 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1522 +#: wt-status.c:1544 #, 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:1525 +#: wt-status.c:1547 #, 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:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, 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:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "försvunnen" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "efter " -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "före " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -2326,7 +2598,7 @@ msgstr "git add [<flaggor>] [--] <sökväg>..." msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "misslyckades uppdatera filer" @@ -2339,7 +2611,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:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" @@ -2375,14 +2647,14 @@ 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:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: 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 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: 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 "var pratsam" @@ -2390,7 +2662,7 @@ msgstr "var pratsam" msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "välj stycken interaktivt" @@ -2458,16 +2730,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" @@ -2495,16 +2767,6 @@ msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "kunde inte öppna \"%s\" för läsning: %s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "Kunde inte öppna \"%s\" för skrivning: %s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2514,76 +2776,76 @@ msgstr "kunde inte tolka patchen \"%s\"" msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "När du har löst problemet, kör \"%s --continue\"." -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället." -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"." -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "Patchen är tom. Delades den upp felaktigt?" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2591,39 +2853,39 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "kan inte vara interaktiv om standard in inte är ansluten till en terminal." -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -2631,35 +2893,35 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "En kopia av patchen som misslyckades finns i: %s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2669,7 +2931,7 @@ msgstr "" "Om det inte är något kvar att köa kan det hända att något annat redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2677,17 +2939,17 @@ msgstr "" "Du har fortfarande sökvägar som inte slagits samman i ditt index.\n" "Glömde du använda \"git add\"?" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"" -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2695,152 +2957,154 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox>|<Maildir>)...]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "åtgärd" -#: 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:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: 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 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "rot" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: 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 "sökväg" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 +#: 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/show-ref.c:175 builtin/tag.c:340 #: parse-options.h:132 parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "antal" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "format" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2340 +#: builtin/am.c:2339 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." @@ -2848,16 +3112,16 @@ msgstr "" "Flaggan -b/--binary har varit utan funktion länge, och\n" "kommer tas bort. Vi ber dig att inte använda den längre." -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs." -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2866,7 +3130,7 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." @@ -2899,37 +3163,37 @@ msgstr "regexec returnerade %d för indata: %s" msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: builtin/apply.c:940 +#: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" -#: builtin/apply.c:944 +#: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" -#: builtin/apply.c:945 +#: builtin/apply.c:943 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" -#: builtin/apply.c:952 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" -#: builtin/apply.c:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2945,77 +3209,77 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: builtin/apply.c:2896 +#: 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] "Stycke %d lyckades på %d (offset %d rad)." msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." -#: builtin/apply.c:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3024,319 +3288,329 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "misslyckades läsa %s" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg: %s" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" -#: builtin/apply.c:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: 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 misslyckades för sökvägen \"%s\"" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "internt fel" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Tillämpade patchen %%s med %d refuserad..." msgstr[1] "Tillämpade patchen %%s med %d refuserade..." -#: builtin/apply.c:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "kan inte öppna %s: %s" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Ignorerar patch \"%s\"." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "indata känns inte igen" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "kan inte öppna patchen \"%s\"" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: builtin/apply.c:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3402,99 +3676,99 @@ msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" msgid "Blaming lines" msgstr "Klandra rader" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "Tvinga förloppsrapportering" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 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:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 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:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 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:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "poäng" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" @@ -3504,31 +3778,31 @@ msgstr "Behandla endast radintervallet n,m, med början på 1" #. 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..." -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<flaggor>] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3537,7 +3811,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3546,12 +3820,12 @@ msgstr "" "tar inte bort grenen \"%s\" som inte har slagits ihop med\n" " \"%s\", trots att den har slagits ihop med HEAD." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3560,340 +3834,361 @@ msgstr "" "Grenen \"%s\" har inte slagits samman i sin helhet.\n" "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\"" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "fjärrspårande grenen \"%s\" hittades inte." -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\"" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: försvunnen]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: bakom %d] " -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[bakom %d] " -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: före %d] " -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[före %d] " -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: före %d, bakom %d] " -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[före %d, bakom %d] " -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** ogiltig ref ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "Grenen %s ombaseras på %s" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "Grenen %s är i en \"bisect\" på %s" + +#: builtin/branch.c:560 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:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, 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:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" -msgstr "kunde inte skriva grenbeskrivningsmall: %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "kunde inte skriva grenbeskrivningsmall" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:617 +#: builtin/branch.c:653 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:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "ändra uppströmsinformation" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "uppströms" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "ändra uppströmsinformationen" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "nyckel" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "fältnamn att sortera på" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: 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/tag.c:369 msgid "object" msgstr "objekt" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu" -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "för många grenar för namnbyte" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "för många grenar för att byta uppström" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, 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:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "för många grenar för att ta bort uppström" -#: builtin/branch.c:784 +#: builtin/branch.c:820 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:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:810 +#: builtin/branch.c:846 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:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3902,7 +4197,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3913,16 +4208,6 @@ msgstr "" "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" "\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -4021,7 +4306,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:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -4111,8 +4396,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:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: 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 msgid "string" msgstr "sträng" @@ -4162,79 +4448,79 @@ msgstr "sökväg \"%s\": kan inte slå ihop" msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "indexfilen är trasig" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4257,7 +4543,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4284,151 +4570,151 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 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:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: 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 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 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:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "stil" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 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:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: 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/send-pack.c:168 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4437,12 +4723,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:1263 +#: builtin/checkout.c:1262 #, 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:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4595,8 +4881,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:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: 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 msgid "pattern" msgstr "mönster" @@ -4636,104 +4922,113 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "antal undermoduler som klonas parallellt" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "namn" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "använd <namn> istället för \"origin\" för att spåra uppströms" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 -#: builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 +#: builtin/pull.c:201 msgid "depth" msgstr "djup" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "klonade undermoduler kommer vara grunda" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4741,57 +5036,52 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, 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." -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "misslyckades ta status på \"%s\"" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4801,129 +5091,129 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka checka ut igen med \"git checkout -f HEAD\"\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." # Vague original, not networking-related, but rather related to the actual # objects downloaded. -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "Kontrollerar om vi fick alla objekt..." -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -5063,66 +5353,66 @@ msgstr "" "\"git cherry-pick --continue\" kommer därefter att återuppta\n" "cherry-pick för återstående incheckningar.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "kan inte utföra en delvis incheckning under en cherry-pick." -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5130,38 +5420,38 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "kunde inte läsa MERGE_MSG" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "kunde inte läsa MERGE_MSG" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5176,7 +5466,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5191,7 +5481,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5201,7 +5491,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5212,146 +5502,146 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup." -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 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:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 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:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "läge" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 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:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "när" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5359,201 +5649,201 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "författare" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "datum" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 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:1587 +#: builtin/commit.c:1603 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:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "standard" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "förbigå pre-commit-krok" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5700,7 +5990,7 @@ msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)" msgid "unable to parse default color value" msgstr "kan inte tolka standardfärgvärde" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5715,7 +6005,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" @@ -5751,7 +6041,7 @@ msgstr "den annoterade taggen %s har inget inbäddat namn" msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" @@ -5844,7 +6134,7 @@ msgstr "överväg de <n> nyaste taggarna (standard: 10)" msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" @@ -5878,21 +6168,21 @@ msgstr "\"%s\": inte en normal fil eller symbolisk länk" msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." @@ -5965,19 +6255,19 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" @@ -5985,7 +6275,7 @@ msgstr "tvinga överskrivning av lokal gren" msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" @@ -5997,19 +6287,19 @@ msgstr "hämta inte alla taggar (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "behåll hämtade paket" @@ -6017,15 +6307,15 @@ msgstr "behåll hämtade paket" msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "kat" @@ -6037,15 +6327,15 @@ msgstr "lägg till i början av undermodulens sökvägsutdata" msgid "default mode for recursion" msgstr "standardläge för rekursion" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" @@ -6103,11 +6393,6 @@ msgstr "tvingad uppdatering" msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "kan inte öppna %s: %s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6309,57 +6594,57 @@ msgstr "Kontrollerar konnektivitet" msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 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:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "Kontrollerar objekt" @@ -6462,214 +6747,214 @@ msgstr "kunde inte läsa träd (%s)" msgid "unable to grep from object of type %s" msgstr "Kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:697 +#: builtin/grep.c:699 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:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:702 +#: builtin/grep.c:704 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:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:739 +#: builtin/grep.c:741 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:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index och --untracked kan inte användas med revisioner." -#: builtin/grep.c:907 +#: builtin/grep.c:909 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:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." @@ -6759,8 +7044,8 @@ msgstr "emacsclient version \"%d\" för gammal (< 22)." #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "exec misslyckades för \"%s\": %s" +msgid "failed to exec '%s'" +msgstr "exec misslyckades för \"%s\"" #: builtin/help.c:205 #, c-format @@ -7018,107 +7303,109 @@ msgstr "förvirrad bortom vanvett" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "slutfördes med %d lokala objekt" +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:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, 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:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, 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:1587 +#: builtin/index-pack.c:1589 #, 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:1594 +#: builtin/index-pack.c:1596 #, 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:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -7157,27 +7444,27 @@ msgstr "kan inte kopiera \"%s\" till \"%s\"" msgid "ignoring template %s" msgstr "ignorerar mallen %s" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "mallarna hittades inte %s" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\"" +msgid "not copying templates from '%s': %s" +msgstr "kopierade inte mallar från \"%s\": %s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s finns redan" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" @@ -7185,24 +7472,24 @@ msgstr "kan inte flytta %s till %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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git-arkiv i %s%s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "Ominitierade befintligt" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "Initierade tomt" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr " delat" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7210,25 +7497,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" "shared[=<behörigheter>]] [<katalog>]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "ange att git-arkivet skall delas bland flera användare" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7237,7 +7524,7 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" @@ -7283,273 +7570,320 @@ msgstr "git show [<flaggor>] <objekt>..." msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "Behandla radintervallet n,m i filen, med början på 1" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "Okänd incheckning %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 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Kunde inte slå upp \"%s\" som en giltig referens." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "Kunde inte hitta exakt sammanslagningsbas." + +#: builtin/log.c:1235 +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 "" +"Kunde inte hämta uppström, om du vill lagra basincheckningen automatiskt,\n" +"använd git branch --set-upstream-to för att spåra en fjärrgren.\n" +"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> " +"manuellt." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "Kunde inte hitta exakt sammanslagningsbas" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "basincheckningen bör vara förfader till revisionslistan" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "basincheckningen bör inte vara i revisionslistan" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "kan inte hämta patch-id" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "använd [PATCH n/m] även för en ensam patch" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "huvud" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "epost" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "Lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "Lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "ident" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "Gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "signatur" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "basincheckning" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "lägg till förhandskrävd trädinfo i patchserien" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte användas samtidigt." -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "Okänd incheckning %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" @@ -7740,173 +8074,177 @@ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 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:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 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:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:213 +#: builtin/merge.c:214 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:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "tillåt sammanslagning av orelaterade historier" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: 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 "Kunde inte skriva till \"%s\"" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "Skriver SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "Avslutar SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, 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:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7922,53 +8260,53 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, 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:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, 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:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7976,7 +8314,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7984,102 +8322,106 @@ 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:1233 +#: builtin/merge.c:1245 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:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 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:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 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:1332 +#: builtin/merge.c:1344 #, 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:1335 +#: builtin/merge.c:1347 #, 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:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, 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:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "vägrar slå samman orelaterad historik" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, 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:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8190,7 +8532,7 @@ msgstr "git mv [<flaggor>] <källa>... <mål>" msgid "Directory %s is in index and no submodule?" msgstr "Katalogen %s är i indexet och inte en undermodul?" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 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" @@ -8269,48 +8611,48 @@ msgstr "%s, källa=%s, mål=%s" msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<flaggor>] <incheckning>..." -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<flaggor>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" @@ -8458,24 +8800,16 @@ 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:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" -#: 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:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Kunde inte slå upp \"%s\" som en giltig referens." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8488,7 +8822,7 @@ msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%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:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "för många parametrar" @@ -8535,7 +8869,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" @@ -8575,15 +8909,15 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "Allmänna flaggor" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "Flaggor för sammanslagning" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -8591,51 +8925,51 @@ msgstr "" "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "" "färdigställ sammanslagning av anteckningar genom att checka in ej " "sammanslagna anteckningar" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "Avbryt lösning av sammanslagning av anteckningar" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "Sammanslagning av anteckningar till %s är redan igångsatt på %s" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "anteckningar-ref" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -8657,165 +8991,170 @@ msgstr "" msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +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:776 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 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:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 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:2614 +#: builtin/pack-objects.c:2619 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:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 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:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 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:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "tid" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 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:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "Räknar objekt" @@ -8843,15 +9182,15 @@ msgstr "Tar bort duplicerade objekt" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" @@ -8863,49 +9202,53 @@ msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "Alternativ gällande sammanslagning" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "tillåt snabbspolning" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "utför automatiskt stash/stash pop före och efter ombasering" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "Alternativ gällande hämtningar" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "Kan inte hämta med ombasering: Du har oköade ändringar." -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "Dessutom innehåller dit index ändringar som inte har checkats in." -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar." -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -8913,14 +9256,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Det finns ingen kandidat för sammanslagning bland referenserna du precis har " "hämtat." -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -8928,7 +9271,7 @@ msgstr "" "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n" "motsvarade något i fjärränden." -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -8939,38 +9282,42 @@ msgstr "" "gren. Eftersom det inte är den fjärr som är konfigurerad som\n" "standard för aktuell gren måste du ange en gren på kommandoraden." -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Du är inte på någon gren för närvarande." -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Ange vilken gren du vill ombasera mot." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Ange vilken gren du vill slå samman med." -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<fjärr>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<gren>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spårningsinformation för aktuell gren." -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" -msgstr "" -"Om du vill ange spårningsinformation för grenen kan du göra det med:\n" -"\n" -" git branch --set-upstream-to=%s/<gren> %s\n" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -8979,11 +9326,15 @@ msgstr "" "Dina inställningar anger sammanslagning med referensen \"%s\"\n" "från fjärren, men någon sådan referens togs inte emot." -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "--[no-]autostash är endast giltig med --rebase." + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet." -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -8994,7 +9345,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9011,11 +9362,11 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." @@ -9376,6 +9727,18 @@ msgstr "hoppa över att applicera filter för gles utcheckning" msgid "debug unpack-trees" msgstr "felsök unpack-trees" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <git-katalog>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "tyst" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "Du måste ange en katalog." + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9699,176 +10062,178 @@ msgstr "* fjärr %s" msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(ingen URL)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokal gren konfigurerad för \"git pull\":" msgstr[1] " Lokala grenar konfigurerade för \"git pull\":" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:" msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "fråga sänd-URL:er istället för hämta-URL:er" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ingen URL:er angivna för fjärren \"%s\"" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" @@ -10376,11 +10741,6 @@ msgstr "tillåt rekursiv borttagning" msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus även om inget träffades" -#: builtin/rm.c:317 -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/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10583,84 +10943,180 @@ 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:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "Ingen sådan referens: %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "Förväntade fullt referensnamn, fick %s" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "kan inte ta bort en komponent från url:en \"%s\"" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, 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:366 +#, 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:370 +#, 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:380 +#, 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:387 +#, 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:406 +msgid "Suppress output for initializing a submodule" +msgstr "Dölj utdata från initiering av undermodul" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<sökväg>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, 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:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference " -"<arkvi>] [--name <namn>] [--url <url>][--depth <djup>] [--] [<sökväg>...]" +"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "kan inte öppna filen \"%s\"" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "kunde inte stänga filen %s" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" -msgstr "" -"ödesdigert: underkommandot submodule--helper måste anropas med ett " -"underkommando" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "Undermodulsökvägen \"%s\" har inte initierats" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:639 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "" -"ödesdigert: \"%s\" är inte ett giltigt underkommando till submodule--helper" +msgid "Skipping unmerged submodule %s" +msgstr "Hoppar över ej sammanslagen undermodul %s" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "Hoppar över undermodulen \"%s\"" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "sökväg inuti arbetskatalogen" + +#: builtin/submodule--helper.c:771 +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:775 +msgid "rebase, merge, checkout or none" +msgstr "rebase, merge, checkout eller none" + +#: builtin/submodule--helper.c:779 +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:782 +msgid "parallel jobs" +msgstr "parallella jobb" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "skriv inte klonförlopp" + +#: builtin/submodule--helper.c:788 +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:798 +msgid "bad value for update parameter" +msgstr "felaktigt värde för parametern update" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "underkommandot submodule--helper måste anropas med ett underkommando" + +#: builtin/submodule--helper.c:862 +#, c-format +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10715,27 +11171,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <taggnamn>..." -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "taggnamnet för långt: %.*s..." -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "kunde inte bekräfta taggen \"%s\"" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10748,7 +11199,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10880,21 +11331,21 @@ msgstr "flaggorna --merged och --no-merged tillåts endast tillsammans med -l" msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -11145,7 +11596,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:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "visa råa gpg-statusdata" @@ -11165,7 +11616,7 @@ msgstr "visa endast statistik" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <tagg>..." -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "visa innehåll för tag" @@ -11181,69 +11632,73 @@ msgstr "git worktree prune [<flaggor>]" msgid "git worktree list [<options>]" msgstr "git worktree list [<flaggor>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "misslyckades ta bort: %s" +msgid "failed to remove '%s'" +msgstr "misslyckades ta bort \"%s\"" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Förbereder %s (identifieraren %s)" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "befolka den nya arbetskatalogen" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" @@ -11263,7 +11718,7 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "skriv felsökningsmeddelanden på standard fel" @@ -11277,7 +11732,7 @@ 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:321 +#: http.c:322 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" @@ -11405,7 +11860,7 @@ msgstr "var mer tyst" msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" @@ -11623,16 +12078,16 @@ 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:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "Tillämpade autostash." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kan inte spara $stash_sha1" -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11642,31 +12097,27 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: git-rebase.sh:213 +#: 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:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: git-rebase.sh:370 +#: 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:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11674,12 +12125,12 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: git-rebase.sh:398 +#: 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:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11700,65 +12151,65 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ogiltig uppström $upstream_name" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: mer än en sammanslagningsbas finns" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ödesdigert: ingen sådan gren: $branch_name" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, 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:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" -#: git-rebase.sh:613 +#: git-rebase.sh:611 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:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." @@ -11902,26 +12353,21 @@ 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:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\"" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 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:291 +#: git-submodule.sh:229 #, 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:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11932,22 +12378,22 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den" -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, 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:332 +#: git-submodule.sh:270 #, 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:340 +#: git-submodule.sh:278 #, 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:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" @@ -11955,14 +12401,14 @@ msgstr "" "För att återanvända den lokala git-katalogen istället för att på nytt klona " "från" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" "använd flaggan \"--force\". Om den lokala git-katalogen inte är riktigt arkiv" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -11971,81 +12417,61 @@ msgstr "" "eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--name" "\"." -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, 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:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:417 +#: git-submodule.sh:355 #, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "Går in i \"$prefix$displaypath\"" +msgid "Entering '$displaypath'" +msgstr "Går in i \"$displaypath\"" -#: git-submodule.sh:437 +#: git-submodule.sh:375 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" -"Stoppar på \"$prefix$displaypath\"; skriptet returnerade en status skild " -"från noll." +"Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll." -#: git-submodule.sh:483 +#: git-submodule.sh:448 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "" -"Hittade ingen url för undermodulsökvägen \"$displaypath\" i .gitmodules" +msgid "pathspec and --all are incompatible" +msgstr "sökvägsangivelse och --all är inkompatibla" -#: git-submodule.sh:492 +#: git-submodule.sh:453 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "Misslyckades registrera url för undermodulsökväg \"$displaypath\"" +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:494 -#, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "" -"Undermodulen \"$name\" ($url) registrerad för sökvägen \"$displaypath\"" - -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" -"Misslyckades registrera uppdateringsläge för undermodulsökväg \"$displaypath" -"\"" - -#: git-submodule.sh:549 -#, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "Använd \".\" om du verkligen vill avinitiera alla undermoduler" - -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" "Undermodulens arbetskatalog \"$displaypath\" innehåller katalogen \".git\"" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -12054,138 +12480,174 @@ msgstr "" "Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" " "kastar bort dem" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Rensade katalogen \"$displaypath\"" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\"" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\"" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\"" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"Undermodulen \"$displaypath\" har inte initierats\n" -"Kanske du vill köra \"update --init\"?" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, 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:745 +#: git-submodule.sh:644 #, 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:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, 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:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, 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:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$prefix$sm_path\"" +"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "Undermodulsökvägen \"$prefix$sm_path\": \"$command $sha1\"" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, 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:1019 +#: git-submodule.sh:912 #, 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:1022 +#: git-submodule.sh:915 #, 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:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "blob" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "Se git-${cmd}(1) för detaljer." + +#~ msgid "'%s': %s" +#~ msgstr "\"%s\": %s" + +#~ 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" + +#~ msgid " git branch --set-upstream-to %s\n" +#~ msgstr " git branch --set-upstream-to %s\n" + +#~ msgid "cannot open %s: %s\n" +#~ msgstr "kan inte öppna %s: %s\n" + +#~ 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" + +#~ msgid "could not verify the tag '%s'" +#~ msgstr "kunde inte bekräfta taggen \"%s\"" + +#~ msgid "failed to remove: %s" +#~ msgstr "misslyckades ta bort: %s" + +#~ msgid "The --exec option must be used with the --interactive option" +#~ msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive" + +#~ msgid "" +#~ "Submodule path '$displaypath' not initialized\n" +#~ "Maybe you want to use 'update --init'?" +#~ msgstr "" +#~ "Undermodulen \"$displaypath\" har inte initierats\n" +#~ "Kanske du vill köra \"update --init\"?" + #~ msgid "Forward-port local commits to the updated upstream head" #~ msgstr "Framåtanpassa lokala kommandon på uppdaterat uppströmshuvud" @@ -12253,9 +12715,6 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\"" #~ msgid "Could not append '%s'" #~ msgstr "Kunde inte lägga till på \"%s\"" -#~ msgid "Could not set '%s'" -#~ msgstr "Kunde inte sätta \"%s\"" - #~ msgid "Missing author: %s" #~ msgstr "Författare saknas: %s" @@ -12384,13 +12843,6 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\"" #~ msgstr "" #~ "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in." -#~ msgid "" -#~ "You have not concluded your merge (MERGE_HEAD exists).\n" -#~ "Please, commit your changes before you can merge." -#~ msgstr "" -#~ "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" -#~ "Checka in dina ändringar innan du kan slå ihop." - #~ msgid "no branch specified" #~ msgstr "inget grennamn angavs" @@ -12593,13 +13045,6 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\"" #~ msgstr "sökvägar avdelas med null-tecken" #~ msgid "" -#~ "The following untracked files would NOT be saved but need to be removed " -#~ "by stash save:" -#~ msgstr "" -#~ "Följande ospårade ändringar skulle INTE sparas utan måste tas bort med " -#~ "\"stash save\":" - -#~ msgid "" #~ "Aborting. Consider using either the --force or --include-untracked option." #~ msgstr "" #~ "Avbryter. Överväg att använda antingen flaggan --force eller --include-" @@ -6,12 +6,12 @@ # msgid "" msgstr "" -"Project-Id-Version: git v2.8.0-rc0\n" +"Project-Id-Version: git v2.9.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-03-16 00:16+0800\n" -"PO-Revision-Date: 2016-03-21 07:14+0700\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-05-25 07:39+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" -"Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n" +"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +36,7 @@ msgstr "" "và sau đó dùng lệnh “git add/rm <tập-tin>”\n" "dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao." -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 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)." @@ -80,7 +80,7 @@ msgstr "định_dạng" msgid "archive format" msgstr "định dạng lưu trữ" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "tiền_tố" @@ -88,9 +88,9 @@ 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:2547 builtin/blame.c:2548 +#: 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:720 builtin/hash-object.c:100 builtin/ls-files.c:459 +#: 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 msgid "file" @@ -124,7 +124,8 @@ msgstr "nén nhỏ hơn" 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:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "kho" @@ -277,11 +278,16 @@ msgstr "Tên đối tượng chưa rõ ràng: “%s”." msgid "Not a valid branch point: '%s'." msgstr "Nhánh không hợp lệ: “%s”." -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "“%s” đã sẵn được lấy ra tại “%s”" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD của cây làm việc %s chưa được cập nhật" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -292,7 +298,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 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "không thể mở “%s”" @@ -301,10 +307,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:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: 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 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" @@ -341,21 +347,21 @@ 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:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "đối số không được thừa nhận: %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "Từ chối tạo một bó dữ liệu trống rỗng." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "không thể tạo “%s”" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "mục lục gói đã chết" @@ -364,8 +370,8 @@ msgstr "mục lục gói đã chết" msgid "invalid color value: %.*s" msgstr "giá trị màu không hợp lệ: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "không thể phân tích cú pháp %s" @@ -399,21 +405,21 @@ msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s”: %s" 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:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "mức nén zlib %d là sai" -#: config.c:891 +#: config.c:890 #, 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:1220 +#: config.c:1228 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:1281 +#: config.c:1284 msgid "unknown error occured 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" @@ -432,24 +438,27 @@ msgstr "sai biến cấu hình “%s” trong tập tin “%s” tại dòng %d" msgid "%s has multiple values" msgstr "%s có đa giá trị" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "không thể đặt “%s” thành “%s”" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" -msgstr "Không thể đặt “%s” thành “%s”" +msgid "could not unset '%s'" +msgstr "không thể thôi đặt “%s”" #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Không thể chạy “git rev-list”" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "gặp lỗi khi ghi vào rev-list: %s" +msgid "failed write to rev-list" +msgstr "gặp lỗi khi ghi vào rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list" #: date.c:95 msgid "in the future" @@ -515,26 +524,26 @@ msgstr[0] "%lu năm trước" msgid "failed to read orderfile '%s'" msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "Đang thực hiện dò tìm đổi tên không chính xác" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Gặp lỗi khi phân tích dirstat cắt bỏ phần trăm “%s”\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Không hiểu đối số dirstat “%s”\n" -#: diff.c:215 +#: diff.c:225 #, 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:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -543,16 +552,16 @@ msgstr "" "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n" "%s" -#: diff.c:2997 +#: diff.c:3007 #, 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:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow cần chính xác một đặc tả đường dẫn" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -561,20 +570,20 @@ msgstr "" "Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, 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”" -#: dir.c:2004 +#: dir.c:1823 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:2123 +#: dir.c:1942 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." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "không thể chạy gpg." @@ -588,28 +597,28 @@ msgstr "gpg gặp lỗi khi ký dữ liệu" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "không thể tạo tập tin tạm thời “%s”: %s" +msgid "could not create temporary file '%s'" +msgstr "không thể tạo tập tin tạm thời “%s”" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”: %s" +msgid "failed writing detached signature to '%s'" +msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "“%s”: không thể đọc %s" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "“%s”: %s" +msgid "failed to stat '%s'" +msgstr "gặp lỗi khi lấy thống kê về “%s”" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "“%s”: đọc ngắn %s" +msgid "'%s': short read" +msgstr "“%s”: đọc ngắn" #: help.c:205 #, c-format @@ -672,12 +681,36 @@ msgstr[0] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"Không thể tạo “%s.lock”: %s.\n" +"\n" +"Tiến trình git khác có lẽ đang chạy ở kho này, ví dụ\n" +"một trình soạn thảo được mở bởi “git commit”. Vui lòng chắc chắn\n" +"rằng mọi tiến trình đã chấm dứt và sau đó thử lại. Nếu vẫn lỗi,\n" +"một tiến trình git có lẽ đã đổ vỡ khi thực hiện ở kho này trước đó:\n" +"gõ bỏ tập tin một cách thủ công để tiếp tục." + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "Không thể tạo “%s.lock”: %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "gặp lỗi khi đọc bộ nhớ đệm" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 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" @@ -724,7 +757,7 @@ msgstr "không thể đọc đối tượng %s “%s”" msgid "blob expected for %s '%s'" msgstr "đối tượng blob được mong đợi cho %s “%s”" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "gặp lỗi khi mở “%s”" @@ -859,7 +892,7 @@ msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)" msgid "Auto-merging %s" msgstr "Tự-động-hòa-trộn %s" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "mô-đun-con" @@ -888,49 +921,49 @@ 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:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Thêm \"%s\"" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Việc hòa trộn hỏng nghiêm trọng, không nên để xảy ra." -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Đã cập nhật rồi!" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, 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:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "Đường dẫn chưa được xử lý??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "Đang trộn:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, 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:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "hòa trộn không trả về lần chuyển giao nào" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "Không thể phân tích đối tượng “%s”" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục" @@ -962,28 +995,28 @@ msgstr "Giá trị %s sai: “%s”" msgid "unable to parse object: %s" msgstr "không thể phân tích đối tượng: “%s”" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "…" -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "cách dùng: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " hoặc: %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-SỐ" @@ -992,7 +1025,7 @@ msgstr "-SỐ" msgid "malformed object name '%s'" msgstr "tên đối tượng dị hình “%s”" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "Không thể làm %s được ghi bởi nhóm" @@ -1062,7 +1095,7 @@ 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:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "không thể phân tích định dạng --pretty" @@ -1088,23 +1121,23 @@ 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:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "Không thể mở “%s” để ghi" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "không thể xóa bỏ tham chiếu %s: %s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "không thể xóa bỏ tham chiếu: %s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "không thể gỡ bỏ tham chiếu: %s" @@ -1243,94 +1276,94 @@ msgstr "định dạng: thiếu nguyên tử %%(end)" msgid "malformed object name %s" msgstr "tên đối tượng dị hình %s" -#: remote.c:745 +#: remote.c:746 #, 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:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s thường theo dõi %s, không phải %s" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s theo dõi cả %s và %s" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "Lỗi nội bộ" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 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:1687 #, c-format msgid "no such branch: '%s'" msgstr "không có nhánh nào như thế: “%s”" -#: remote.c:1689 +#: remote.c:1690 #, 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:1696 #, 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:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "đẩy lên đích “%s” trên máy chủ “%s” không có nhánh theo dõi nội bộ" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "nhánh “%s” không có máy chủ để đẩy lên" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "đẩy refspecs cho “%s” không bao gồm “%s”" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "đẩy lên mà không có đích (push.default là “nothing”)" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "không thể phân giải đẩy “đơn giản” đến một đích đơn" -#: remote.c:2073 +#: remote.c:2074 #, 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:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n" -#: remote.c:2080 +#: remote.c:2081 #, 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:2085 #, 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:2091 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:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1339,11 +1372,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:2102 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:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1356,22 +1389,22 @@ 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:2115 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 " "bạn)\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "nhánh hiện tại của bạn có vẻ như bị hỏng" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "nhánh hiện tại của bạn “%s” không có một lần chuyển giao nào cả" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent xung khắc với --bisect" @@ -1422,7 +1455,7 @@ 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:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "Không thể ghi vào %s" @@ -1582,12 +1615,12 @@ msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\"" msgid "Could not create sequencer directory %s" msgstr "Không thể tạo thư mục xếp dãy %s" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "Lỗi bao bọc %s." -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "không cherry-pick hay hoàn nguyên trong tiến trình" @@ -1599,63 +1632,72 @@ msgstr "không thể phân giải HEAD" 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:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "không thể mở %s: %s" +msgid "cannot open %s" +msgstr "không mở được “%s”" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "không thể đọc %s: %s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "gặp kết thúc tập tin đột xuất" -#: sequencer.c:888 +#: sequencer.c:887 #, 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:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "Không thể định dạng “%s”." -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: không thể cherry-pick một %s" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s: điểm xét duyệt sai" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "Không thể hoàn nguyên một lần chuyển giao khởi tạo" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "gặp lỗi khi đọc %s" +#: setup.c:468 +#, 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 +msgid "unknown repository extensions found:" +msgstr "tìm thấy phần mở rộng kho chưa biết:" + #: sha1_file.c:1080 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:2459 +#: sha1_file.c:2458 #, 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:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -1685,31 +1727,40 @@ msgstr "" "này\n" "bằng cách chạy lệnh \"git config advice.objectNameWarning false\"" -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 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:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, 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:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Không thể cập nhật mục .gitmodules %s" -#: submodule.c:107 +#: submodule.c:109 #, 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:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "không cho phép giá trị âm ở submodule.fetchJobs" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "giá trị cho %s không hợp lệ" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1769,7 +1820,241 @@ msgstr "không thể đổi tên tập tin tạm thời thành %s" msgid "Could not read ref %s" msgstr "Không thể đọc tham chiếu %s" -#: unpack-trees.c:203 +#: 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." +msgstr "" +"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh " +"checkout:\n" +"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn có " +"thể chuyển nhánh." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh " +"checkout:\n" +"%%s" + +#: unpack-trees.c:69 +#, 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." +msgstr "" +"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh " +"hòa trộn:\n" +"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn có " +"thể hòa trộn." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh " +"hòa trộn:\n" +"%%s" + +#: unpack-trees.c:74 +#, 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." +msgstr "" +"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh " +"%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 có " +"thể %s." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh " +"%s:\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\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" +"%s" + +#: unpack-trees.c:85 +#, 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." +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 lệnh " +"checkout:\n" +"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn có thể chuyển nhánh." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +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 lệnh " +"checkout:\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +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 lệnh hòa " +"trộn:\n" +"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn có thể hòa trộn." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +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 lệnh hòa " +"trộn:\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +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 có thể %s." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +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 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh " +"checkout:\n" +"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn có thể chuyển nhánh." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh " +"checkout:\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh " +"hòa trộn:\n" +"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn có thể hòa trộn." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh " +"hòa trộn:\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh " +"%s:\n" +"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn có thể %s." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh " +"%s:\n" +"%%s" + +#: unpack-trees.c:121 +#, 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 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"Không thể cập nhật checkout rải rác: các mục tin sau đây chưa cập nhật:\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi cập " +"nhật checkout rải rác:\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị xóa bỏ bởi cập " +"nhật checkout rải rác:\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "Bãi bỏ\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "Đang lấy ra các tập tin" @@ -1807,200 +2092,196 @@ msgstr "đoạn đường dẫn “..” không hợp lệ" msgid "could not open '%s' for reading and writing" msgstr "không thể mở “%s” để đọc và ghi" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "không thể mở “%s” để ghi" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở “%s” để đọc" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "không thể truy cập “%s”: %s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "không thể truy cập “%s”" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "Không thể lấy thư mục làm việc hiện hành" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "không thể mở %s để ghi" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "không thể ghi vào %s" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "không thể đóng %s" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Những đường dẫn chưa được hòa trộn:" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (dùng \"git reset %s <tập-tin>…\" để bỏ ra khỏi bệ phóng)" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (dùng \"git rm --cached <tập-tin>…\" để bỏ ra khỏi bệ phóng)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (dùng \"git add <tập-tin>…\" để đánh dấu là cần giải quyết)" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (dùng \"git add/rm <tập-tin>…\" như là một cách thích hợp để đánh dấu là " "cần được giải quyết)" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "Những thay đổi sẽ được chuyển giao:" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (dùng \"git add <tập-tin>…\" để cập nhật những gì sẽ chuyển giao)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (dùng \"git add/rm <tập-tin>…\" để cập nhật những gì sẽ được chuyển giao)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (dùng \"git checkout -- <tập-tin>…\" để loại bỏ các thay đổi trong thư mục " "làm việc)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (chuyển giao hoặc là loại bỏ các nội dung chưa được theo dõi hay đã sửa " "chữa trong mô-đun-con)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (dùng \"git %s <tập-tin>…\" để thêm vào những gì cần được chuyển giao)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "bị xóa bởi cả hai:" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "được thêm vào bởi chúng ta:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "bị xóa đi bởi họ:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "được thêm vào bởi họ:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "bị xóa bởi chúng ta:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "được thêm vào bởi cả hai:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "bị sửa bởi cả hai:" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "lỗi: không thể tiếp nhận trạng thái chưa hòa trộn %x" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "tập tin mới:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "đã chép:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "đã xóa:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "đã sửa:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "đã đổi tên:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "đổi-kiểu:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "không hiểu:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "chưa hòa trộn:" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "lần chuyển giao mới, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "nội dung bị sửa đổi, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "nội dung chưa được theo dõi, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "lỗi: không thể tiếp nhận trạng thái lệnh diff %c" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Những mô-đun-con thay đổi đã được chuyển giao:" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2008,39 +2289,39 @@ msgstr "" "Không động đến đường ở trên.\n" "Mọi thứ phía dưới sẽ được xóa bỏ." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Bạn có những đường dẫn chưa được hòa trộn." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (sửa các xung đột rồi chạy \"git commit\")" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn." -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "Bạn đang ở giữa của một phiên “am”." -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "Miếng vá hiện tại bị trống rỗng." -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)" -#: wt-status.c:978 +#: wt-status.c:980 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)" @@ -2197,43 +2478,43 @@ msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa 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:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "Trên nhánh " -#: wt-status.c:1444 +#: wt-status.c:1466 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:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "rebase đang được thực hiện: lên trên " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEAD được tách rời tại " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEAD được tách rời từ " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "Hiện tại chẳng ở nhánh nào cả." -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "Lần chuyển giao khởi tạo" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "Những tập tin chưa được theo dõi" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "Những tập tin bị lờ đi" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2245,32 +2526,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:1500 +#: wt-status.c:1522 #, 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:1502 +#: wt-status.c:1524 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:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "Không có thay đổi nào" -#: wt-status.c:1513 +#: wt-status.c:1535 #, 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:1516 +#: wt-status.c:1538 #, 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:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2279,57 +2560,57 @@ 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:1522 +#: wt-status.c:1544 #, 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:1525 +#: wt-status.c:1547 #, 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:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "không có gì để chuyển giao\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, 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:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "Lần chuyển giao khởi tạo trên " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (không nhánh)" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "đã ra đi" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "đằng sau " -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "phía trước " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”" @@ -2343,7 +2624,7 @@ msgstr "git add [<các-tùy-chọn>] [--] <pathspec>…" msgid "unexpected diff status %c" msgstr "trạng thái lệnh diff không như mong đợi %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "Cập nhật tập tin gặp lỗi" @@ -2357,7 +2638,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:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "Không thể đọc bảng mục lục" @@ -2395,14 +2676,14 @@ msgstr "" "của bạn:\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:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: 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 msgid "dry run" msgstr "chạy thử" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: 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 "chi tiết" @@ -2410,7 +2691,7 @@ msgstr "chi tiết" msgid "interactive picking" msgstr "sửa bằng cách tương tác" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "chọn “hunks” theo kiểu tương tác" @@ -2482,16 +2763,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Có lẽ ý bạn là “git add .” phải không?\n" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 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" -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "Không thể đọc “%s”." @@ -2519,16 +2800,6 @@ msgstr "Gặp lỗi khi sao chép ghi chú (note) từ “%s” tới “%s”" msgid "fseek failed" msgstr "fseek gặp lỗi" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "không thể mở “%s” để đọc: %s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "Không thể mở “%s” để ghi: %s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2538,75 +2809,75 @@ msgstr "không thể phân tích cú pháp “%s”" msgid "Only one StGIT patch series can be applied at once" msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "dấu thời gian không hợp lệ" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "dòng Ngày tháng không hợp lệ" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "độ lệch múi giờ không hợp lệ" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "Dò tìm định dạng miếng vá gặp lỗi." -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "tạo thư mục \"%s\" gặp lỗi" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "Gặp lỗi khi chia nhỏ các miếng vá." -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "không thể ghi tập tin lưu mục lục" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Khi bạn đã phân giải xong trục trặc này, hãy chạy \"%s --continue\"." -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Nếu bạn muốn bỏ qua miếng vá này, hãy chạy lệnh \"%s --skip\" để thay thế." -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Để phục hồi lại nhánh gốc và dừng vá, hãy chạy \"%s --abort\"." -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "Miếng vá trống rỗng. Quá trình chia nhỏ miếng vá có lỗi?" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "dòng thụt lề không hợp lệ: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "không thể phân tích lần chuyển giao “%s”" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”." -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "" "Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở…" -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2614,38 +2885,38 @@ msgstr "" "Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n" "Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó." -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "Đang trở lại để vá cơ sở và “hòa trộn 3-đường”…" -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "Gặp lỗi khi trộn vào các thay đổi." -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "lệnh git write-tree gặp lỗi khi ghi một cây" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "áp dụng vào một lịch sử trống rỗng" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "gặp lỗi khi ghi đối tượng chuyển giao" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "không thể phục hồi: %s không tồn tại." -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "không thể được tương tác mà không có stdin kết nối với một thiết bị cuối" -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "Thân của lần chuyển giao là:" @@ -2653,37 +2924,37 @@ msgstr "Thân của lần chuyển giao là:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Áp dụng? đồng ý [y]/khô[n]g/chỉnh sửa [e]/hiển thị miếng [v]á/chấp nhận tất " "cả [a]: " -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "Áp dụng: %.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi." -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "Gặp lỗi khi vá tại %s %.*s" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong: %s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2694,7 +2965,7 @@ msgstr "" "đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng " "vá này." -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2702,17 +2973,17 @@ msgstr "" "Bạn vẫn có những đường dẫn chưa được hòa trộn trong bảng mục lục của mình.\n" "Bạn đã quên sử dụng lệnh “git add” à?" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "không thể phân tích đối tượng “%s”." -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "gặp lỗi khi dọn bảng mục lục" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2720,153 +2991,155 @@ msgstr "" "Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am” thất bại cuối cùng.\n" "Không thể chuyển tới ORIG_HEAD" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Giá trị không hợp lệ cho --patch-format: %s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<các-tùy-chọn>] [(<mbox>|<Maildir>)…]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<các-tùy-chọn>] (--continue | --skip | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "chạy kiểu tương tác" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "tùy chọn lịch sử -- không-toán-tử" -#: builtin/am.c:2250 +#: builtin/am.c:2249 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:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "im lặng" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "Thêm dòng Signed-off-by cho ghi chú của lần chuyển giao" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "chuyển mã thành utf8 (mặc định)" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "chuyển cờ -k cho git-mailinfo" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "chuyển cờ -b cho git-mailinfo" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "chuyển cờ -m cho git-mailinfo" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "chuyển cờ --keep-cr cho git-mailsplit với định dạng mbox" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "đừng chuyển cờ --keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "cắt mọi thứ trước dòng scissors" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "hành động" -#: 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:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: 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 msgid "pass it through git-apply" msgstr "chuyển nó qua git-apply" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "gốc" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: 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 "đường-dẫn" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185 +#: 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/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 #: parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "số" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "định dạng" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "định dạng (các) miếng vá theo" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "đè lên các lời nhắn lỗi khi xảy ra lỗi vá nghiêm trọng" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "đồng nghĩa với --continue" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "bỏ qua miếng vá hiện hành" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "phục hồi lại nhánh gốc và loại bỏ thao tác vá." -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "nói dối về ngày chuyển giao" -#: builtin/am.c:2319 +#: builtin/am.c:2318 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:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "mã-số-khóa" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "lần chuyển giao ký-GPG" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(dùng nội bộ cho git-rebase)" -#: builtin/am.c:2340 +#: builtin/am.c:2339 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." @@ -2874,16 +3147,16 @@ msgstr "" "Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n" "nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa." -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "gặp lỗi đọc bảng mục lục" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra." -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2892,7 +3165,7 @@ msgstr "" "Tìm thấy thư mục lạc %s.\n" "Dùng \"git am --abort\" để loại bỏ nó đi." -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại." @@ -2927,38 +3200,38 @@ msgstr "thi hành biểu thức chính quy trả về %d cho đầu vào: %s" msgid "unable to find filename in patch at line %d" msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d" -#: builtin/apply.c:940 +#: 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 sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d" -#: builtin/apply.c:944 +#: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d" -#: builtin/apply.c:945 +#: builtin/apply.c:943 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d" -#: builtin/apply.c:952 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff sai - cần “/dev/null” trên dòng %d" -#: builtin/apply.c:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "chi tiết: dòng không cần: %.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2970,76 +3243,76 @@ msgstr[0] "" "phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong " "thành phần dẫn đầu tên của đường dẫn (dòng %d)" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "tập tin mới phụ thuộc vào nội dung cũ" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "tập tin đã xóa vẫn còn nội dung" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "miếng vá hỏng tại dòng %d" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "tập tin mới %s phụ thuộc vào nội dung cũ" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "tập tin đã xóa %s vẫn còn nội dung" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "miếng vá định dạng nhị phân sai hỏng tại dòng %d: %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "vá chỉ với “rác” tại dòng %d" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "không thể đọc liên kết mềm %s" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "không thể mở hay đọc %s" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "sai khởi đầu dòng: “%c”" -#: builtin/apply.c:2896 +#: 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] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)." -#: builtin/apply.c:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3048,324 +3321,334 @@ msgstr "" "trong khi đang tìm kiếm cho:\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s”" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%s”" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "vá nhị phân cho “%s” tạo ra kết quả không chính xác (mong chờ %s, lại nhận " "%s)" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "gặp lỗi khi vá: %s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "không thể lấy ra %s" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "đọc %s gặp lỗi" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "đọc từ “%s” vượt ra ngoài liên kết mềm" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "đường dẫn %s đã bị xóa hoặc đổi tên" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s: không tồn tại trong bảng mục lục" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s: không khớp trong mục lục" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "loại bỏ miếng vá để lại nội dung tập tin" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiểu" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s có kiểu %o, cần %o" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "đường dẫn không hợp lệ “%s”" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s: đã có từ trước trong bảng mục lục" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s: đã sẵn có trong thư mục đang làm việc" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s" -#: builtin/apply.c:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "tập tin chịu tác động “%s” vượt ra ngoài liên kết mềm" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s: miếng vá không được áp dụng" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "Đang kiểm tra miếng vá %s…" -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: 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 gặp lỗi đối với đường dẫn “%s”" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "không thể gỡ bỏ %s từ mục lục" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "miếng vá sai hỏng cho mô-đun-con %s" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "không thể lấy thống kề về tập tin %s mới hơn đã được tạo" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "không thể tạo “kho lưu đằng sau” cho tập tin được tạo mới hơn %s" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "không thể thêm mục nhớ đệm cho %s" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "đang đóng tập tin “%s”" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "không thể ghi vào tập tin “%s” chế độ %o" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ." -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "lỗi nội bộ" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối…" -#: builtin/apply.c:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej" -#: builtin/apply.c:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "không thể mở %s: %s" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khối nhớ #%d được áp dụng gọn gàng." -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "đoạn dữ liệu #%d bị từ chối." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "bỏ qua đường dẫn “%s”." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "không thừa nhận đầu vào" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "không thể đọc tập tin lưu bảng mục lục" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "gỡ bỏ <số> dấu gạch chéo dẫn đầu từ đường dẫn diff cổ điển" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "" "hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "" "xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi quét nội dung" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "áp dụng miếng vá theo chiều ngược" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "đừng hy vọng có ít nhất một dòng nội dung" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhớ" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "treo thêm <root> vào tất cả các tên tập tin" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "--3way ở ngoài một kho chứa" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "--index ở ngoài một kho chứa" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "--cached ở ngoài một kho chứa" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "không thể mở miếng vá “%s”" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "đã chấm dứt %d lỗi khoảng trắng" -#: builtin/apply.c:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3431,101 +3714,101 @@ msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)" msgid "Blaming lines" msgstr "Các dòng blame" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 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:2531 +#: builtin/blame.c:2532 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:2532 +#: builtin/blame.c:2533 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:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "Hiển thị thống kê công sức làm việc" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "Ép buộc báo cáo tiến triển công việc" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 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:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "Hiển thị số dòng gốc (Mặc định: off)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 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:2539 +#: builtin/blame.c:2540 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:2540 +#: builtin/blame.c:2541 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:2541 +#: builtin/blame.c:2542 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:2542 +#: builtin/blame.c:2543 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:2543 +#: builtin/blame.c:2544 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:2544 +#: builtin/blame.c:2545 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:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 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:2547 +#: builtin/blame.c:2548 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:2548 +#: builtin/blame.c:2549 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:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "điểm số" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 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:2550 +#: builtin/blame.c:2551 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:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1" @@ -3535,31 +3818,31 @@ msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1" #. 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "4 năm, 11 tháng trước" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<các-tùy-chọn>] [-l] [-f] <tên-nhánh> [<điểm-đầu>]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<các-tùy-chọn>] [-r] (-d | -D) <tên-nhánh> …" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<các-tùy-chọn>] (-m | -M) [<nhánh-cũ>] <nhánh-mới>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3568,7 +3851,7 @@ msgstr "" "đang xóa nhánh “%s” mà nó lại đã được hòa trộn vào\n" " “%s”, nhưng vẫn chưa được hòa trộn vào HEAD." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3577,12 +3860,12 @@ msgstr "" "không xóa nhánh “%s” cái mà chưa được hòa trộn vào\n" " “%s”, cho dù là nó đã được hòa trộn vào HEAD." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Không thể tìm kiếm đối tượng chuyển giao cho “%s”" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3591,298 +3874,319 @@ msgstr "" "Nhánh “%s” không được trộn một cách đầy đủ.\n" "Nếu bạn thực sự muốn xóa nó, thì chạy lệnh “git branch -D %s”." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "Cập nhật tập tin cấu hình gặp lỗi" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "không thể dùng tùy chọn -a với -d" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "Không thể tìm kiếm đối tượng chuyển giao cho HEAD" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "Không thể xóa nhánh “%s” cái mà bạn hiện nay đang ở." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "Không thể xóa nhánh “%s” đã được lấy ra tại “%s”" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "không tìm thấy nhánh theo dõi máy chủ “%s”." -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "không tìm thấy nhánh “%s”." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Gặp lỗi khi đang xóa nhánh theo dõi máy chủ “%s”" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "Gặp lỗi khi xóa bỏ nhánh “%s”" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Đã xóa nhánh theo dõi máy chủ \"%s\" (từng là %s).\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: đã ra đi]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: đứng sau %d]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[đằng sau %d]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: phía trước %d]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[phía trước %d]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: trước %d, sau %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[trước %d, sau %d]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** tham chiếu không hợp lệ ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(không nhánh, đang cải tổ %s)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD được tách rời tại %s)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD được tách rời từ %s)" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(không nhánh)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, 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:545 +#, 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:560 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:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "Tên nhánh không hợp lệ: “%s”" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "Gặp lỗi khi đổi tên nhánh" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Đã đổi tên nhánh khuyết danh “%s” đi" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, 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:564 +#: builtin/branch.c:601 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:586 -#, c-format -msgid "could not write branch description template: %s" -msgstr "không thể ghi vào mẫu mô tả nhánh: %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "không thể ghi mẫu mô tả nhánh" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "Tùy chọn chung" -#: builtin/branch.c:617 +#: builtin/branch.c:653 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:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "không xuất các thông tin" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "cài đặt chế độ theo dõi (xem git-pull(1))" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "thay đổi thông tin thượng nguồn" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "thượng nguồn" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "thay đổi thông tin thượng nguồn" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "tô màu kết xuất" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "thao tác trên nhánh “remote-tracking”" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 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:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "Hành động git-branch:" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "xóa một toàn bộ nhánh đã hòa trộn" -#: builtin/branch.c:636 +#: builtin/branch.c:672 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:637 +#: builtin/branch.c:673 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:638 +#: builtin/branch.c:674 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:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "liệt kê các tên nhánh" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "tạo reflog của nhánh" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "sửa mô tả cho nhánh" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "buộc tạo, di chuyển/đổi tên, xóa" -#: builtin/branch.c:644 +#: builtin/branch.c:680 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:645 +#: builtin/branch.c:681 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:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "liệt kê các nhánh trong các cột" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "khóa" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "tên trường cần sắp xếp" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: 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/tag.c:369 msgid "object" msgstr "đối tượng" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "chỉ hiển thị các nhánh của đối tượng" -#: builtin/branch.c:669 +#: builtin/branch.c:705 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:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "không tìm thấy HEAD ở dưới refs/heads!" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "tùy chọn --column và --verbose xung khắc nhau" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "cần chỉ ra tên nhánh" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "Không thể đưa ra mô tả HEAD đã tách rời" -#: builtin/branch.c:727 +#: builtin/branch.c:763 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:734 +#: builtin/branch.c:770 #, 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:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "Không có nhánh nào có tên “%s”." -#: builtin/branch.c:752 +#: builtin/branch.c:788 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:757 +#: builtin/branch.c:793 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:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3890,40 +4194,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:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "không có nhánh nào như thế “%s”" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "chưa có nhánh “%s”" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "quá nhiều nhánh để bỏ đặt thượng nguồn" -#: builtin/branch.c:784 +#: builtin/branch.c:820 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:790 +#: builtin/branch.c:826 #, 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:804 +#: builtin/branch.c:840 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:810 +#: builtin/branch.c:846 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:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3932,7 +4236,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:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3943,16 +4247,6 @@ msgstr "" "Nếu bạn muốn “%s” theo dõi “%s”, thực hiện lệnh sau:\n" "\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -4051,7 +4345,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:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "chặn các báo cáo tiến trình hoạt động" @@ -4142,8 +4436,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:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: 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 msgid "string" msgstr "chuỗi" @@ -4193,80 +4488,80 @@ msgstr "đường dẫn “%s”: không thể hòa trộn" msgid "Unable to add merge result for '%s'" msgstr "Không thể thêm kết quả hòa trộn cho “%s”" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "không được dùng “%s” với các đường dẫn cập nhật" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "không được dùng “%s” với %s" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Không thể cập nhật các đường dẫn và chuyển đến nhánh “%s” cùng một lúc." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "đường dẫn “%s” không được hòa trộn" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 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:623 +#: builtin/checkout.c:622 #, 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:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD hiện giờ tại" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "không thể cập nhật HEAD" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "Đặt lại nhánh “%s”\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "Đã sẵn sàng trên “%s”\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, 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:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Đã chuyển đến nhánh mới “%s”\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "Đã chuyển đến nhánh “%s”\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " … và nhiều hơn %d.\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4285,7 +4580,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4306,152 +4601,152 @@ msgstr[0] "" " git branch <tên_nhánh_mới> %s\n" "\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 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:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "Vị trí trước kia của HEAD là" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 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:969 +#: builtin/checkout.c:968 #, 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:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "tham chiếu không hợp lệ: %s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, 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:1077 +#: builtin/checkout.c:1076 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:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, 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:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "“%s” không thể được dùng với “%s”" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, 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:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: 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 msgid "branch" msgstr "nhánh" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "tạo và checkout một nhánh mới" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "tạo/đặt_lại và checkout một nhánh" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "tạo reflog cho nhánh mới" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "rời bỏ HEAD tại lần chuyển giao danh nghĩa" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "đặt thông tin thượng nguồn cho nhánh mới" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "nhánh-mới" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "nhánh không cha mới" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 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:1148 +#: builtin/checkout.c:1147 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:1150 +#: builtin/checkout.c:1149 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:1151 +#: builtin/checkout.c:1150 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:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "cập nhật các tập tin bị bỏ qua (mặc định)" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "kiểu" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "xung đột kiểu (hòa trộn hoặc diff3)" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 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:1159 +#: builtin/checkout.c:1158 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:1161 +#: builtin/checkout.c:1160 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:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: 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/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:1193 +#: builtin/checkout.c:1192 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:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track cần tên một nhánh" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "Thiếu tên nhánh; hãy thử -b" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "đường dẫn đã cho không hợp lệ" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4461,12 +4756,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:1263 +#: builtin/checkout.c:1262 #, 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:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4617,8 +4912,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:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: 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 msgid "pattern" msgstr "mẫu" @@ -4658,103 +4953,112 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<các-tùy-chọn>] [--] <kho> [<t.mục>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "không tạo một checkout" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "tạo kho thuần" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "tạo kho bản sao (ý là kho thuần)" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "để nhân bản từ kho nội bộ" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "cài đặt đây là kho chia sẻ" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "khởi tạo mô-đun-con trong bản sao" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "số lượng mô-đun-con được nhân bản đồng thời" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "thư-mục-mẫu" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 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:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "kho tham chiếu" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "chỉ dùng --reference khi nhân bản" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "tên" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "dùng <tên> thay cho “origin” để theo dõi thượng nguồn" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ" -#: builtin/clone.c:87 +#: builtin/clone.c:91 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:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201 msgid "depth" msgstr "độ-sâu" -#: builtin/clone.c:89 +#: builtin/clone.c:93 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:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "mọi mô-đun-con nhân bản sẽ là shallow (nông)" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "khóa=giá_trị" -#: builtin/clone.c:95 +#: builtin/clone.c:101 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:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "chỉ dùng địa chỉ IPv4" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "chỉ dùng địa chỉ IPv6" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4762,57 +5066,52 @@ msgstr "" "Không đoán được thư mục tên là gì.\n" "Vui lòng chỉ định tên một thư mục trên dòng lệnh" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, 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ợ." -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, 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ộ." -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "kho tham chiếu “%s” là nông" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "kho tham chiếu “%s” bị cấy ghép" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "gặp lỗi khi lấy thống kê về “%s”" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s có tồn tại nhưng lại không phải là một thư mục" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "gặp lỗi khi lấy thông tin thống kê về %s\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "gặp lỗi khi tạo được liên kết mềm %s" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "gặp lỗi khi sao chép tập tin và “%s”" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "hoàn tất.\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4822,126 +5121,126 @@ msgstr "" "Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n" "và thử lấy ra với lệnh “git checkout -f HEAD”\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)." -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "Đang kiểm tra kết nối… " -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "không thể cập nhật %s" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể lấy ra.\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "không thể lấy ra (checkout) cây làm việc" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "không thể ghi các tham số vào tập tin cấu hình" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "không thể đóng gói để dọn dẹp" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "không thể bỏ liên kết tập tin thay thế tạm thời" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "Có quá nhiều đối số." -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)." -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "tùy chọn --bare và --origin %s xung khắc nhau." -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau." -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "kho chứa “%s” chưa tồn tại" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "độ sâu %s không phải là một số nguyên dương" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "đường dẫn đích “%s” đã có từ trước và không phải là một thư mục rỗng." -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "cây làm việc “%s” đã sẵn tồn tại rồi." -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "không thể tạo các thư mục dẫn đầu của “%s”" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "không thể tạo cây thư mục làm việc dir “%s”" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Đang nhân bản thành kho chứa bare “%s”…\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "Đang nhân bản thành “%s”…\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế." -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "kho nguồn là nông, nên bỏ qua --local" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local bị lờ đi" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "Không biết làm cách nào để nhân bản (clone) %s" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "Bạn hình như là đã nhân bản một kho trống rỗng." @@ -5092,68 +5391,68 @@ msgstr "" "Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n" "những lần chuyển giao còn lại.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "không thể tạo bảng mục lục tạm thời" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "gặp lỗi khi thêm bằng cách tương" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "không thể cập nhật bảng mục lục tạm thời" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "Gặp lỗi khi cập nhật cây bộ nhớ đệm" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "" "không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn." -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick." -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "không đọc được bảng mục lục" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "không thể ghi tập tin lưu bảng mục lục tạm thời" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "lần chuyển giao “%s” thiếu phần tác giả ở đầu" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "lần chuyển giao “%s” có phần tác giả ở đầu dị dạng" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "đối số cho --author bị dị hình" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "ngày tháng không hợp lệ: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5161,38 +5460,38 @@ msgstr "" "không thể chọn một ký tự ghi chú cái mà không được dùng\n" "trong phần ghi chú hiện tại" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "không thể tìm kiếm commit (lần chuyển giao) %s" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "không thể đọc nhật ký từ đầu vào tiêu chuẩn" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "không đọc được tệp nhật ký “%s”" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "không thể đọc MERGE_MSG" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "không thể đọc SQUASH_MSG" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "không thể đọc MERGE_MSG" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "không thể ghi mẫu chuyển giao" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5207,7 +5506,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5222,7 +5521,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5233,7 +5532,7 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần " "chuyển giao.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5245,157 +5544,157 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n" "Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sTác giả: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sNgày tháng: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sNgười chuyển giao: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "Không đọc được bảng mục lục" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "Gặp lỗi khi xây dựng cây" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Xin hãy cung cấp lời chú giải hoặc là dùng tùy chọn -m hoặc là -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author “%s” không phải là “Họ và tên <thư điện tửl>” và không khớp bất kỳ " "tác giả nào sẵn có" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Chế độ cho các tập tin chưa được theo dõi không hợp lệ “%s”" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "hai tùy chọn -long và -z không tương thích với nhau" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý" -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "Không có gì để mà “tu bổ” cả." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “tu bổ”." -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu " "bổ”." -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" "Chỉ được dùng một trong số tùy chọn trong số các tùy chọn -c/-C/-F/--fixup" -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F/--fixup." -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "--reset-author chỉ có thể được sử dụng với tùy chọn -C, -c hay --amend." -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được " "sử dụng." -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 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:1195 +#: builtin/commit.c:1206 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:1197 +#: builtin/commit.c:1208 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:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Chế độ dọn dẹp không hợp lệ %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 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:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "hiển thị trạng thái ở dạng súc tích" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "hiển thị thông tin nhánh" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "kết xuất dạng máy-có-thể-đọc" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 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:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "chấm dứt các mục bằng NUL" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "chế độ" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 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:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "hiển thị các tập tin ẩn" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "khi" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5403,205 +5702,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:1344 +#: builtin/commit.c:1355 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:1430 +#: builtin/commit.c:1441 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:1432 +#: builtin/commit.c:1443 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:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "đã rời khỏi HEAD" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (root-commit)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 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:1576 +#: builtin/commit.c:1592 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:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "Các tùy chọn ghi chú commit" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "đọc chú thích từ tập tin" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "tác giả" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "ghi đè tác giả cho commit" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "ngày tháng" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "ghi đè ngày tháng cho lần chuyển giao" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "chú thích" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "chú thích của lần chuyển giao" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "lần_chuyển_giao" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 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:1584 +#: builtin/commit.c:1600 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:1585 +#: builtin/commit.c:1601 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:1586 +#: builtin/commit.c:1602 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:1587 +#: builtin/commit.c:1603 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:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "(nên dùng) thêm dòng Signed-off-by:" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "sử dụng tập tin mẫu đã cho" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "ép buộc sửa lần commit" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "mặc định" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 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:1592 +#: builtin/commit.c:1608 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:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "ký lần chuyển giao dùng GPG" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "Các tùy nội dung ghi chú commit" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "chuyển giao tất cả các tập tin có thay đổi" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 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:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "thêm các tập-tin bằng tương tác" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "thêm các thay đổi bằng tương tác" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "chỉ chuyển giao các tập tin đã chỉ ra" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "vòng qua móc (hook) pre-commit" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "hiển thị xem cái gì có thể được chuyển giao" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "“tu bổ” (amend) lần commit trước" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "vòng qua móc (hook) post-rewrite" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "ok để ghi lại một thay đổi trống rỗng" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 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:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, 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" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, 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:1740 +#: builtin/commit.c:1760 #, 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:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5750,7 +6049,7 @@ msgstr "" msgid "unable to parse default color value" msgstr "không thể phân tích giá trị màu mặc định" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5765,7 +6064,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "không thể tạo tập tin cấu hình “%s”" @@ -5801,7 +6100,7 @@ msgstr "thẻ được chú giải %s không có tên nhúng" msgid "tag '%s' is really '%s' here" msgstr "thẻ “%s” đã thực sự ở đây “%s” rồi" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "Không phải tên đối tượng %s hợp lệ" @@ -5894,7 +6193,7 @@ msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)" msgid "only consider tags matching <pattern>" msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback" @@ -5928,21 +6227,21 @@ msgstr "“%s”: không phải tập tin bình thường hay liên kết mềm" msgid "invalid option: %s" msgstr "tùy chọn không hợp lệ: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "Không phải là kho git" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "đối tượng đã cho “%s” không hợp lệ." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "đã cho nhiều hơn hai đối tượng blob: “%s”" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "đã cho đối tượng không thể nắm giữ “%s”." @@ -6015,19 +6314,19 @@ msgstr "git fetch --multiple [<các-tùy-chọn>] [(<kho> | <nhóm>)…]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<các-tùy-chọn>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "lấy về từ tất cả các máy chủ" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "đường dẫn đến gói tải lên trên máy chủ cuối" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "ép buộc ghi đè lên nhánh nội bộ" @@ -6035,7 +6334,7 @@ msgstr "ép buộc ghi đè lên nhánh nội bộ" msgid "fetch from multiple remotes" msgstr "lấy từ nhiều máy chủ cùng lúc" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "lấy tất cả các thẻ cùng với các đối tượng liên quan đến nó" @@ -6047,21 +6346,21 @@ msgstr "không lấy tất cả các thẻ (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "số lượng mô-đun-con được lấy đồng thời" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "" "cắt cụt (prune) các nhánh “remote-tracking” không còn tồn tại trên máy chủ " "nữa" -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "khi-cần" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "điều khiển việc lấy về đệ quy trong các mô-đun-con" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "giữ lại gói đã tải về" @@ -6069,15 +6368,15 @@ msgstr "giữ lại gói đã tải về" msgid "allow updating of HEAD ref" msgstr "cho phép cập nhật th.chiếu HEAD" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "làm sâu hơn lịch sử của bản sao" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "chuyển đổi hoàn toàn sang kho git" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "tmục" @@ -6089,15 +6388,15 @@ msgstr "soạn sẵn cái này cho kết xuất đường dẫn mô-đun-con" msgid "default mode for recursion" msgstr "chế độ mặc định cho đệ qui" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "chấp nhận tham chiếu cập nhật .git/shallow" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "chỉ ra refmap cần lấy về" @@ -6155,11 +6454,6 @@ msgstr "cưỡng bức cập nhật" msgid "(non-fast-forward)" msgstr "(không-chuyển-tiếp-nhanh)" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "không thể mở %s: %s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6362,55 +6656,55 @@ msgstr "Đang kiểm tra kết nối" msgid "Checking object directories" msgstr "Đang kiểm tra các thư mục đối tượng" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<các-tùy-chọn>] [<đối-tượng>…]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "hiển thị các đối tượng không thể đọc được" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "hiển thị các đối tượng không được quản lý" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "báo cáo các thẻ" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "báo cáo node gốc" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "tạo “index objects head nodes”" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "tạo “reflogs head nodes” (mặc định)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 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:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "chỉ kiểm tra kết nối" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "cho phép kiểm tra hạn chế hơn" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 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:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "hiển thị quá trình" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "Đang kiểm tra các đối tượng" @@ -6515,217 +6809,217 @@ msgstr "không thể đọc cây (%s)" 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:558 +#: builtin/grep.c:560 #, 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:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "không mở được “%s”" -#: builtin/grep.c:644 +#: builtin/grep.c:646 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:646 +#: builtin/grep.c:648 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:648 +#: builtin/grep.c:650 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:650 +#: builtin/grep.c:652 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:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "hiển thị những dòng không khớp với mẫu" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "phân biệt HOA/thường" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "chỉ khớp mẫu tại đường ranh giới từ" -#: builtin/grep.c:659 +#: builtin/grep.c:661 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:661 +#: builtin/grep.c:663 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:664 +#: builtin/grep.c:666 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:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "hạ xuống ít nhất là mức <sâu>" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "dùng biểu thức chính qui POSIX có mở rộng" -#: builtin/grep.c:673 +#: builtin/grep.c:675 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:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "diễn dịch các mẫu như là chuỗi cố định" -#: builtin/grep.c:679 +#: builtin/grep.c:681 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:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "hiển thị số của dòng" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "không hiển thị tên tập tin" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "hiển thị các tên tập tin" -#: builtin/grep.c:686 +#: builtin/grep.c:688 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:688 +#: builtin/grep.c:690 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:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "đồng nghĩa với --files-with-matches" -#: builtin/grep.c:693 +#: builtin/grep.c:695 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:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "thêm NUL vào sau tên tập tin" -#: builtin/grep.c:697 +#: builtin/grep.c:699 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:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "tô sáng phần khớp mẫu" -#: builtin/grep.c:700 +#: builtin/grep.c:702 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:702 +#: builtin/grep.c:704 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:705 +#: builtin/grep.c:707 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:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "hiển thị <n> dòng nội dung trước khớp" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "hiển thị <n> dòng nội dung sau khớp" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "dùng <n> tuyến trình làm việc" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "dạng viết tắt của -C SỐ" -#: builtin/grep.c:716 +#: builtin/grep.c:718 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:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "hiển thị hàm bao quanh" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "đọc mẫu từ tập-tin" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "match <mẫu>" -#: builtin/grep.c:725 +#: builtin/grep.c:727 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:737 +#: builtin/grep.c:739 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:739 +#: builtin/grep.c:741 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:741 +#: builtin/grep.c:743 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:745 +#: builtin/grep.c:747 msgid "pager" msgstr "dàn trang" -#: builtin/grep.c:745 +#: builtin/grep.c:747 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:748 +#: builtin/grep.c:750 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:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "chưa chỉ ra mẫu." -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "số tuyến chỉ ra không hợp lệ (%d)" -#: builtin/grep.c:873 +#: builtin/grep.c:875 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:899 +#: builtin/grep.c:901 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:904 +#: builtin/grep.c:906 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:907 +#: builtin/grep.c:909 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:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "cả hai --cached và các cây phải được chỉ ra." @@ -6814,8 +7108,8 @@ msgstr "phiên bản của emacsclient “%d” quá cũ (< 22)." #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "gặp lỗi khi thực thi “%s”: %s" +msgid "failed to exec '%s'" +msgstr "gặp lỗi khi thực thi “%s”" #: builtin/help.c:205 #, c-format @@ -7071,104 +7365,105 @@ msgstr "lộn xộn hơn cả điên rồ" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "đầy đủ với %d đối tượng nội bộ" +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:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" -msgstr "Tổng kiểm tra tail không như mong đợi cho %s (đĩa hỏng?)" +msgstr "Gặp tổng kiểm tra tail không cần cho %s (đĩa hỏng?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, 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:1291 +#: builtin/index-pack.c:1293 #, 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:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "đối tượng nội bộ %s bị hỏng" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "gặp lỗi trong khi đóng tập tin gói" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "không thể ghi tập tin giữ lại “%s”" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, 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:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "không thể lưu tập tin gói" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "không thể lưu trữ tập tin ghi mục lục" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "sai pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "không hỗ trợ đa tuyến, bỏ qua %s" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, 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:1540 +#: builtin/index-pack.c:1542 #, 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:1587 +#: builtin/index-pack.c:1589 #, 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:1594 +#: builtin/index-pack.c:1596 #, 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:1624 +#: builtin/index-pack.c:1609 +#, 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:1638 msgid "Cannot come back to cwd" msgstr "Không thể quay lại cwd" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 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:1713 builtin/index-pack.c:1722 -#, 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:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" @@ -7207,27 +7502,27 @@ msgstr "không thể sao chép “%s” sang “%s”" msgid "ignoring template %s" msgstr "đang lờ đi mẫu “%s”" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "các mẫu không được tìm thấy %s" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "không sao chép các mẫu của phiên bản sai định dạng %d từ “%s”" +msgid "not copying templates from '%s': %s" +msgstr "không sao chép các mẫu từ “%s”: %s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s đã có từ trước rồi" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "không thể xử lý (handle) tập tin kiểu %d" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "không di chuyển được %s vào %s" @@ -7235,24 +7530,24 @@ msgstr "không di chuyển được %s vào %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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s kho Git trong %s%s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "Khởi tạo lại đã sẵn có rồi" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "Khởi tạo trống rỗng" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr " đã chia sẻ" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7260,25 +7555,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-" "quyền>]] [thư-mục]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "các quyền" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhiều người dùng" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "không thể mkdir (tạo thư mục): %s" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "không thể chdir (chuyển đổi thư mục) sang %s" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7287,7 +7582,7 @@ msgstr "" "%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-" "dir=<thư-mục>)" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "không thể truy cập cây (tree) làm việc “%s”" @@ -7333,264 +7628,316 @@ msgstr "git show [<các-tùy-chọn>] <đối-tượng>…" msgid "invalid --decorate option: %s" msgstr "tùy chọn--decorate không hợp lệ: %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "chặn mọi kết xuất từ diff" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "hiển thị mã nguồn" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "Sử dụng tập tin ánh xạ thư" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "các tùy chọn trang trí" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "Xử lý chỉ dòng vùng n,m trong tập tin, tính từ 1" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "Kết xuất cuối cùng: %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: sai tập tin" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "Không thể đọc đối tượng %s" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "Không nhận ra kiểu: %d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers không có giá trị cụ thể" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "tên của thư mục kết xuất quá dài" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "Không thể mở tập tin miếng vá: %s" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "Cần chính xác một vùng." -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "Không phải là một vùng." -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "“Cover letter” cần cho định dạng thư" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to điên rồ: %s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<các-tùy-chọn>] [<kể-từ> | <vùng-xem-xét>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "Hai thư mục kết xuất?" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "Không hiểu lần chuyển giao %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 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "Không tìm thấy nền hòa trộn chính xác." + +#: builtin/log.c:1235 +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 "" +"Gặp lỗi khi lấy thượng nguồn, nếu bạn muốn ghi lại lần chuyển giao nền một\n" +"cách tự động, vui lòng dùng \"git branch --set-upstream-to\" để theo dõi\n" +"nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao nền bằng\n" +"\"--base=<base-commit-id>\" một cách thủ công." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "Gặp lỗi khi tìm nền hòa trộn chính xác." + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "lần chuyển giao nền không là tổ tiên của danh sách điểm xét duyệt" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "lần chuyển giao nền không được trong danh sách điểm xét duyệt" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "không thể lấy mã miếng vá" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "hiển thị miếng vá ra đầu ra chuẩn" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "tạo bì thư" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "sử dụng <sfx> thay cho “.patch”" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Dùng [<tiền-tố>] thay cho [VÁ]" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "lưu các tập tin kết quả trong <t.mục>" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "không strip/add [VÁ]" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "không kết xuất diff (những khác biệt) nhị phân" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "xuất mọi mã băm all-zero trong phần đầu From" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "Lời nhắn" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "đầu đề thư" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "thêm đầu đề thư" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "thư điện tử" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "thêm To: đầu đề thư" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "thêm Cc: đầu đề thư" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "thụt lề" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "đặt “Địa chỉ gửi” thành <thụ lề> (hoặc thụt lề người commit nếu bỏ quên)" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "dùng thư đầu tiên để trả lời <message-id>" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "ranh giới" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "đính kèm miếng vá" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "dùng miếng vá làm nội dung" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "chữ ký" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "thêm chữ ký" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "lần_chuyển_giao_nền" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "add trước hết đòi hỏi thông tin cây tới sê-ri miếng vá" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "thêm chữ ký từ một tập tin" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "không hiển thị các tên tập tin của miếng vá" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n và -k loại từ lẫn nhau." -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix và -k xung khắc nhau." -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "--name-only không hợp lý" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "--name-status không hợp lý" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "--check không hợp lý" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "Không thể tạo thư mục “%s”" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "không thể đọc tập tin chữ ký “%s”" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "Gặp lỗi khi tạo các tập tin kết xuất" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -7598,11 +7945,6 @@ msgstr "" "Không tìm thấy nhánh mạng được theo dõi, hãy chỉ định <thượng-nguồn> một " "cách thủ công.\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "Không hiểu lần chuyển giao %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<các-tùy-chọn>] [<tập-tin>…]" @@ -7796,174 +8138,178 @@ 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:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "switch “m” yêu cầu một giá trị" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, 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:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "Các chiến lược sẵn sàng là:" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, 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:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 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:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 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:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(đồng nghĩa với --stat)" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 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:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 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:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 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:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "sửa chú thích trước khi chuyển giao" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "cho phép chuyển-tiếp-nhanh (mặc định)" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 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:213 +#: builtin/merge.c:214 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:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "chiến lược" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "chiến lược hòa trộn sẽ dùng" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "tùy_chọn=giá_trị" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 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:219 +#: builtin/merge.c:220 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:223 +#: builtin/merge.c:224 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:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "cho phép hòa trộn lịch sử không liên quan" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "không thể chạy stash." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "lệnh tạm cất gặp lỗi" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, 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:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "read-tree gặp lỗi" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (không có gì để squash)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Squash commit -- không cập nhật HEAD\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: 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 "Không thể ghi vào “%s”" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "Đang ghi SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "Hoàn thành SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, 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:448 +#: builtin/merge.c:451 #, 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:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Chuỗi branch.%s.mergeoptions sai: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "Không cầm nắm gì ngoài hai head hòa trộn" -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, 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:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "không thể ghi %s" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "Không thể đọc từ “%s”" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, 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:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7981,55 +8327,55 @@ msgstr "" "rỗng\n" "sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng." -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "Tuyệt vời.\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, 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:895 +#: builtin/merge.c:906 #, 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:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "không phải nhánh hiện hành" -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "Không có máy chủ cho nhánh hiện hành." -#: builtin/merge.c:940 +#: builtin/merge.c:951 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:945 +#: builtin/merge.c:956 #, 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:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "không thể đóng “%s”" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 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:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8037,7 +8383,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:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8045,103 +8391,107 @@ 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:1233 +#: builtin/merge.c:1245 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:1242 +#: builtin/merge.c:1254 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:1250 +#: builtin/merge.c:1262 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:1267 +#: builtin/merge.c:1279 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:1269 +#: builtin/merge.c:1281 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:1275 +#: builtin/merge.c:1286 #, 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:1277 +#: builtin/merge.c:1288 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:1332 +#: builtin/merge.c:1344 #, 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:1335 +#: builtin/merge.c:1347 #, 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:1338 +#: builtin/merge.c:1350 #, 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:1341 +#: builtin/merge.c:1353 #, 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:1424 +#: builtin/merge.c:1415 +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:1439 #, c-format msgid "Updating %s..%s\n" msgstr "Đang cập nhật %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, 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:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "Không.\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 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:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, 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:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Đang thử chiến lược hòa trộn %s…\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, 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:1595 +#: builtin/merge.c:1610 #, 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:1604 +#: builtin/merge.c:1619 #, 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:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8253,7 +8603,7 @@ msgstr "git mv [<các-tùy-chọn>] <nguồn>… <đích>" msgid "Directory %s is in index and no submodule?" msgstr "Thư mục “%s” có ở trong chỉ mục mà không có mô-đun con?" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 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ý" @@ -8332,49 +8682,49 @@ msgstr "%s, nguồn=%s, đích=%s" msgid "Renaming %s to %s\n" msgstr "Đổi tên %s thành %s\n" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "gặp lỗi khi đổi tên “%s”" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<các-tùy-chọn>] <commit>…" -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<các-tùy-chọn>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<các-tùy-chọn>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "chỉ hiển thị tên (không SHA-1)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "chỉ sử dụng các tham chiếu khớp với <mẫu>" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" "liệt kê tất cả các lần chuyển giao có thể đọc được từ tất cả các tham chiếu" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "đọc từ đầu vào tiêu chuẩn" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "cho phép in các tên “chưa định nghĩa” (mặc định)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "bãi bỏ tham chiếu các thẻ trong đầu vào (dùng nội bộ)" @@ -8521,24 +8871,16 @@ 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:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "không thể đọc “%s”" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "không thể mở hay đọc “%s”" -#: 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:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8551,7 +8893,7 @@ msgstr "không thể đọc dữ liệu ghi chú từ đối tượng không-blo #: 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:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "quá nhiều đối số" @@ -8598,7 +8940,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "Đang ghi đè lên ghi chú cũ cho đối tượng %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "Đang gỡ bỏ ghi chú (note) cho đối tượng %s\n" @@ -8638,15 +8980,15 @@ msgstr "" "Các tùy chọn -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “edit”.\n" "Xin hãy sử dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-C”.\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "Tùy chọn chung" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "Tùy chọn về hòa trộn" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -8654,51 +8996,51 @@ msgstr "" "phân giải các xung đột “notes” sử dụng chiến lược đã đưa ra (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "Chuyển giao các note chưa được hòa trộn" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "" "các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển " "giao" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "bỏ qua hòa trộn các ghi chú (note)" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "Các ghi chú hòa trộn vào %s đã sẵn trong quá trình xử lý tại %s" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "Đối tượng %s không có ghi chú (note)\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "cố gắng gỡ bỏ một note chưa từng tồn tại không phải là một lỗi" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "notes-ref" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "dùng “notes” từ <notes-ref>" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "Không hiểu câu lệnh con: %s" @@ -8722,166 +9064,170 @@ msgstr "" msgid "deflate error (%d)" msgstr "lỗi giải nén (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +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:776 msgid "Writing objects" msgstr "Đang ghi lại các đối tượng" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 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:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "Đang nén các đối tượng" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, 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:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "phiên bản mục lục sai “%s”" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "không hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 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:2599 +#: builtin/pack-objects.c:2604 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:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "phiên bản[,offset]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 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:2604 +#: builtin/pack-objects.c:2609 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:2606 +#: builtin/pack-objects.c:2611 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:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "bỏ qua các đối tượng đóng gói" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 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:2612 +#: builtin/pack-objects.c:2617 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:2614 +#: builtin/pack-objects.c:2619 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:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "dùng lại các delta sẵn có" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "dùng lại các đối tượng sẵn có" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "dùng các đối tượng OFS_DELTA" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 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:2624 +#: builtin/pack-objects.c:2629 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:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr " đọc tham số “revision” từ thiết bị nhập chuẩn" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 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:2631 +#: builtin/pack-objects.c:2636 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:2634 +#: builtin/pack-objects.c:2639 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:2637 +#: builtin/pack-objects.c:2642 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:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "xuất gói ra đầu ra tiêu chuẩn" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 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:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "giữ lại các đối tượng không thể đọc được" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "thời-gian" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 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:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "tạo gói nhẹ" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 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:2653 +#: builtin/pack-objects.c:2658 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:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "mức nén gói" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 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:2659 +#: builtin/pack-objects.c:2664 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:2661 +#: builtin/pack-objects.c:2666 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:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "Đang đếm các đối tượng" @@ -8909,15 +9255,15 @@ msgstr "Đang gỡ các đối tượng trùng lặp" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <thời-gian>] [--] [<head>…]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "không gỡ bỏ, chỉ hiển thị" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "báo cáo các đối tượng đã prune" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "các đối tượng hết hạn cũ hơn khoảng <thời gian>" @@ -8929,50 +9275,54 @@ msgstr "không thể tỉa bớt trong một kho đối_tượng_vĩ_đại" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "Các tùy chọn liên quan đến hòa trộn" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "các thay đổi hợp nhất bằng cải tổ thay vì hòa trộn" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "cho phép chuyển-tiếp-nhanh" -#: builtin/pull.c:150 +#: builtin/pull.c:153 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/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "tự động stash/stash pop tước và sau tu bổ (rebase)" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "Các tùy chọn liên quan đến lệnh lấy về" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "số lượng mô-đun-con được đẩy lên đồng thời" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Giá trị không hợp lệ cho pull.ff: %s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" "Không thể pull với cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng." -#: builtin/pull.c:365 +#: builtin/pull.c:385 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." -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "Không thể pull với cải tổ: Bạn có các thay đổi chưa được chuyển giao." -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -8980,14 +9330,14 @@ msgstr "" "Ở đây không có ứng cử nào để cải tổ lại trong số các tham chiếu mà bạn vừa " "lấy về." -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Ở đây không có ứng cử nào để hòa trộn trong số các tham chiếu mà bạn vừa lấy " "về." -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -8996,7 +9346,7 @@ msgstr "" "tự\n" "đại diện mà nó lại không khớp trên điểm cuối máy phục vụ." -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9008,40 +9358,43 @@ msgstr "" "theo mặc định cho nhánh hiện tại của bạn, bạn phải chỉ định\n" "một nhánh trên dòng lệnh." -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Hiện tại bạn chẳng ở nhánh nào cả." -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Vui lòng chỉ định nhánh nào bạn muốn cải tổ lại." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Vui lòng chỉ định nhánh nào bạn muốn hòa trộn vào." -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "Xem git-pull(1) để biết thêm chi tiết." -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<máy chủ>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<nhánh>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Ở đây không có thông tin theo dõi cho nhánh hiện hành." -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" msgstr "" -"Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng " -"lệnh:\n" -"\n" -" git branch --set-upstream-to=%s/<nhánh> %s\n" -"\n" +"Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng lệnh:" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9050,13 +9403,17 @@ msgstr "" "Các đặc tả cấu hình của bạn để hòa trộn với tham chiếu “%s”\n" "từ máy dịch vụ, nhưng không có nhánh nào như thế được lấy về." -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "tùy chọn --[no-]autostash chỉ hợp lệ khi dùng với --rebase." + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Đang cập nhật một nhánh chưa được sinh ra với các thay đổi được thêm vào " "bảng mục lục." -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9067,7 +9424,7 @@ msgstr "" "đang chuyển-tiếp-nhanh cây làm việc của bạn từ\n" "lần chuyển giaot %s." -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9085,11 +9442,11 @@ msgstr "" "$ git reset --hard\n" "để khôi phục lại." -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "Không thể hòa trộn nhiều nhánh vào trong một head trống rỗng." -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "Không thể thực hiện lệnh rebase (cải tổ) trên nhiều nhánh." @@ -9459,6 +9816,18 @@ msgstr "bỏ qua áp dụng bộ lọc lấy ra (checkout) thưa thớt" msgid "debug unpack-trees" msgstr "gỡ lỗi “unpack-trees”" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <thư-mục-git>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "im lặng" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "Bạn phải chỉ định thư mục." + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9780,173 +10149,175 @@ msgstr "* máy chủ %s" msgid " Fetch URL: %s" msgstr " URL để lấy về: %s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(không có URL)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " URL để đẩy lên: %s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " Nhánh HEAD: %s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " nhánh HEAD (HEAD máy chủ chưa rõ ràng, có lẽ là một trong số sau):\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Những nhánh trên máy chủ:%s" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (trạng thái không được yêu cầu)" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Những nhánh nội bộ đã được cấu hình cho lệnh “git pull”:" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " refs nội bộ sẽ được phản chiếu bởi lệnh “git push”" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Những tham chiếu nội bộ được cấu hình cho lệnh “git push”%s:" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "xóa refs/remotes/<tên>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "Không thể xác định được HEAD máy chủ" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Nhiều nhánh HEAD máy chủ. Hãy chọn rõ ràng một:" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "Không thể xóa bỏ %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "Không phải là tham chiếu hợp lệ: %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "Không thể cài đặt %s" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s sẽ trở thành không đầu (không được quản lý)!" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s đã trở thành không đầu (không được quản lý)!" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "Đang xén bớt %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [nên xén bớt] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [đã bị xén] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "cắt máy chủ sau khi lấy về" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Không có máy chủ nào có tên “%s”" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "thêm nhánh" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "chưa chỉ ra máy chủ nào" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "truy vấn đẩy URL thay vì lấy" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "trả về mọi URL" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "không có URL nào được cấu hình cho nhánh “%s”" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "đẩy các “URL” bằng tay" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "thêm URL" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "xóa URLs" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete không hợp lý" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Kiểu mẫu URL cũ không hợp lệ: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "Không tìm thấy URL như vậy: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "Sẽ không xóa những địa chỉ URL không-push" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "chi tiết; phải được đặt trước một lệnh-con" @@ -10450,12 +10821,6 @@ msgstr "cho phép gỡ bỏ đệ qui" msgid "exit with a zero status even if nothing matched" msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"Vui lòng đưa các thay đổi của bạn vào “.gitmodules” hay tạm cất chúng đi để " -"xử lý" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10662,84 +11027,184 @@ 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:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "Không có tham chiếu nào như thế: %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận được %s" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "không thể cắt bỏ một thành phần ra khỏi “%s” url" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "điểm neo thay thế cho các đường dẫn tương đối" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=<đường/dẫn>] [<đường/dẫn>…]" +msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, 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:366 +#, 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:370 +#, 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:380 +#, 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:387 +#, 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:406 +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:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [</đường/dẫn>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <đường/dẫn>" +msgstr "git submodule--helper name </đường/dẫn>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, 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:164 +#: builtin/submodule--helper.c:489 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:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "tên của mô-đun-con mới" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 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:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "chiều sâu lịch sử khi tạo bản sao" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" -"git submodule--helper clone [--prefix=<đường/dẫn>] [--quiet] [--reference " -"<kho>] [--name <tên>] [--url <url>][--depth <đường/dẫn>] [--] [<đường/dẫn>…]" +"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:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "không thể tạo thư mục “%s”" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, 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:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "không thể mở tập tin “%s”" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "không thể đóng tập tin %s" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, 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:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" +#: builtin/submodule--helper.c:609 +#, 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:613 +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:639 +#, 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:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "Bỏ qua mô-đun-con “%s”" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "đường dẫn đến cây làm việc" + +#: builtin/submodule--helper.c:771 +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:775 +msgid "rebase, merge, checkout or none" +msgstr "rebase, merge, checkout hoặc không làm gì cả" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -"lỗi nghiêm trọng: lệnh con submodule--helper phải được gói với một lệnh con" +"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:782 +msgid "parallel jobs" +msgstr "công việc đồng thời" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "đừng in tiến trình nhân bản" + +#: builtin/submodule--helper.c:788 +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:798 +msgid "bad value for update parameter" +msgstr "giá trị cho tham số cập nhật bị sai" + +#: builtin/submodule--helper.c:855 +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:274 +#: builtin/submodule--helper.c:862 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "lỗi nghiêm trọng: “%s” không phải là lệnh con submodule--helper hợp lệ" +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "“%s” không phải là lệnh con submodule--helper hợp lệ" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10794,27 +11259,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <tên-thẻ>…" -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "tên thẻ quá dài: %.*s…" -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "không tìm thấy tìm thấy thẻ “%s”." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Thẻ đã bị xóa “%s” (từng là %s)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "không thể thẩm tra thẻ “%s”" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10827,7 +11287,7 @@ msgstr "" " %s\n" "Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10959,21 +11419,21 @@ msgstr "tùy chọn --merged và --no-merged chỉ cho phép dùng với -l." 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:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "quá nhiều đối số" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "“%s” không phải thẻ hợp lệ." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "Thẻ “%s” đã tồn tại rồi" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n" @@ -11227,7 +11687,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:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "in kết xuất trạng thái gpg dạng thô" @@ -11247,7 +11707,7 @@ msgstr "chỉ hiển thị thống kê" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <thẻ>…" -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "hiển thị nội dung của thẻ" @@ -11263,68 +11723,72 @@ msgstr "git worktree prune [<các-tùy-chọn>]" msgid "git worktree list [<options>]" msgstr "git worktree list [<các-tùy-chọn>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Gỡ bỏ cây làm việc/%s: không phải là thư mục hợp lệ" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Gỡ bỏ cây làm việc/%s: không có tập tin gitdir" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Gỡ bỏ cây làm việc/%s: không thể đọc tập tin gitdir (%s)" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir không hợp lệ" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir chỉ đến vị trí không tồn tại" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "gặp lỗi khi gỡ bỏ: %s" +msgid "failed to remove '%s'" +msgstr "gặp lỗi khi gỡ bỏ “%s”" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "“%s” đã có từ trước rồi" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "không thể tạo thư mục của “%s”" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Đang chuẩn bị %s (định danh %s)" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "lấy ra <nhánh> ngay cả khi nó đã được lấy ra ở cây làm việc khác" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "tạo nhánh mới" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "tạo hay đặt lại một nhánh" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "rời bỏ HEAD tại lần chuyển giao theo tên" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "di chuyển cây làm việc mới" + +#: builtin/worktree.c:336 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" @@ -11344,7 +11808,7 @@ msgstr "ghi đối tượng cây (tree) cho <tiền tố> thư mục con" msgid "only useful for debugging" msgstr "chỉ hữu ích khi cần gỡ lỗi" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn" @@ -11358,7 +11822,7 @@ 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:321 +#: http.c:322 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" @@ -11488,7 +11952,7 @@ msgstr "im lặng hơn nữa" msgid "use <n> digits to display SHA-1s" msgstr "sử dụng <n> chữ số để hiển thị SHA-1s" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "cập nhật bảng mục lục với phân giải xung đột dùng lại nếu được" @@ -11704,16 +12168,16 @@ 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:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "Đã áp dụng autostash." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Không thể lưu $stash_sha1" -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11724,35 +12188,31 @@ msgstr "" "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:208 +#: 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:213 +#: 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:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "Tùy chọn --exec phải được sử dụng cùng với tùy chọn --interactive" - -#: git-rebase.sh:359 +#: 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:370 +#: 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:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Không thể đọc HEAD" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11760,12 +12220,12 @@ 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:398 +#: 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:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11786,64 +12246,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:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "thượng nguồn không hợp lệ $upstream_name" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, 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:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, 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:504 +#: git-rebase.sh:502 #, 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:527 +#: git-rebase.sh:525 #, 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:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "Không thể autostash" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Đã tạo autostash: $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 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:589 +#: git-rebase.sh:587 #, 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:593 +#: git-rebase.sh:591 #, 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:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Thay đổi từ $mb thành $onto:" -#: git-rebase.sh:613 +#: git-rebase.sh:611 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:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name." @@ -11989,29 +12449,24 @@ 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:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "không thể tháo bỏ một thành phần ra khỏi “$remoteurl” url" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 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:291 +#: git-submodule.sh:229 #, 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:308 +#: git-submodule.sh:246 #, 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:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12023,36 +12478,36 @@ 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:330 +#: git-submodule.sh:268 #, 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:332 +#: git-submodule.sh:270 #, 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:340 +#: git-submodule.sh:278 #, 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:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "Nếu bạn muốn dùng lại thư mục git nội bộ này thay vì nhân bản từ nó" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" "dùng tùy chọn “--force”. Nếu thư mục git nội bộ không phải là repo (kho) đúng" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -12061,71 +12516,53 @@ msgstr "" "hay bạn không chắc chắn điều đó có nghĩa gì chọn tên khác với tùy chọn “--" "name”." -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, 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:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Không thể lấy ra mô-đun-con “$sm_path”" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, 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:373 +#: git-submodule.sh:311 #, 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:417 -#, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "Đang vào “$prefix$displaypath”" - -#: git-submodule.sh:437 -#, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." -msgstr "" -"Dừng lại tại “$prefix$displaypath”; script trả về trạng thái khác không." - -#: git-submodule.sh:483 +#: git-submodule.sh:355 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "" -"Không tìm thấy url cho đường dẫn mô-đun-con “$displaypath” trong .gitmodules" +msgid "Entering '$displaypath'" +msgstr "Đang vào “$displaypath”" -#: git-submodule.sh:492 +#: git-submodule.sh:375 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “$displaypath”" +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:494 +#: git-submodule.sh:448 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "Mô-đun-con “$name” ($url) được đăng ký cho đường dẫn “$displaypath”" - -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" -"Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “$displaypath”" +msgid "pathspec and --all are incompatible" +msgstr "đặc tả đường dẫn và --all xung khắc nhau" -#: git-submodule.sh:549 +#: git-submodule.sh:453 #, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "Dùng “.” nếu bạn thực sự muốn gỡ bỏ mọi mô-đun-con" +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:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "Cây làm việc mô-đun-con “$displaypath” có chứa thư mục .git" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" @@ -12133,7 +12570,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:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -12142,141 +12579,178 @@ 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:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Đã tạo thư mục “$displaypath”" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, 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:580 +#: git-submodule.sh:484 #, 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:589 +#: git-submodule.sh:493 #, 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:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"Đường dẫn mô-đun-con “$displaypath” chưa được khởi tạo.\n" -"Có lẽ bạn muốn sử dụng lệnh “update --init”?" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, 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:745 +#: git-submodule.sh:644 #, 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:768 +#: git-submodule.sh:667 #, 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:788 +#: git-submodule.sh:680 #, 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:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, 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:794 +#: git-submodule.sh:686 #, 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:799 +#: git-submodule.sh:691 #, 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:800 +#: git-submodule.sh:692 #, 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:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +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 " -"“$prefix$sm_path”" +"“$displaypath”" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "Đường dẫn mô-đun-con “$prefix$sm_path”: “$command $sha1”" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "Đường dẫn mô-đun-con “$displaypath”: “$command $sha1”" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, 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:944 +#: git-submodule.sh:837 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:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "chế độ không như mong chờ $mod_dst" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, 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:1019 +#: git-submodule.sh:912 #, 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:1022 +#: git-submodule.sh:915 #, 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:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "blob" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, 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:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”" +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "Xem git-${cmd}(1) để biết thêm chi tiết." + +#~ msgid "'%s': %s" +#~ msgstr "“%s”: %s" + +#~ 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" + +#~ msgid " git branch --set-upstream-to %s\n" +#~ msgstr " git branch --set-upstream-to %s\n" + +#~ msgid "cannot open %s: %s\n" +#~ msgstr "không thể mở %s: %s\n" + +#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed" +#~ msgstr "" +#~ "Vui lòng đưa các thay đổi của bạn vào “.gitmodules” hay tạm cất chúng đi " +#~ "để xử lý" + +#~ msgid "could not verify the tag '%s'" +#~ msgstr "không thể thẩm tra thẻ “%s”" + +#~ msgid "failed to remove: %s" +#~ msgstr "gặp lỗi khi gỡ bỏ: %s" + +#~ msgid "The --exec option must be used with the --interactive option" +#~ msgstr "Tùy chọn --exec phải được sử dụng cùng với tùy chọn --interactive" + +#~ msgid "" +#~ "Submodule path '$displaypath' not initialized\n" +#~ "Maybe you want to use 'update --init'?" +#~ msgstr "" +#~ "Đường dẫn mô-đun-con “$displaypath” chưa được khởi tạo.\n" +#~ "Có lẽ bạn muốn sử dụng lệnh “update --init”?" + #~ msgid "Forward-port local commits to the updated upstream head" #~ msgstr "" #~ "Chuyển tiếp những lần chuyển giao nội bộ tới head thượng nguồn đã cập nhật" @@ -12339,9 +12813,6 @@ msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”" #~ msgid "Could not append '%s'" #~ msgstr "Không thể nối thêm “%s”" -#~ msgid "Could not set '%s'" -#~ msgstr "Không thể đặt “%s”" - #~ msgid "unable to look up current user in the passwd file: %s" #~ msgstr "không tìm thấy người dùng hiện tại trong tập tin passwd: %s" @@ -12689,13 +13160,6 @@ msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”" #~ msgstr "các đường dẫn được ngăn cách bởi ký tự null" #~ msgid "" -#~ "The following untracked files would NOT be saved but need to be removed " -#~ "by stash save:" -#~ msgstr "" -#~ "Các tập tin chưa được theo dõi sau đây KHÔNG được ghi lại nhưng cần được " -#~ "gỡ bỏ bởi việc ghi lại stash:" - -#~ msgid "" #~ "Aborting. Consider using either the --force or --include-untracked option." #~ msgstr "" #~ "Bãi bỏ. Cân nhắc dùng một trong hai tùy chọn --force và --include-" diff --git a/po/zh_CN.po b/po/zh_CN.po index a6b06f9d39..36db9fe017 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -135,8 +135,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-03-16 00:16+0800\n" -"PO-Revision-Date: 2016-03-16 00:18+0800\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-06-06 23:05+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -158,7 +158,7 @@ msgstr "" "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n" "解决方案并提交。" -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" @@ -201,7 +201,7 @@ msgstr "格式" msgid "archive format" msgstr "归档格式" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "前缀" @@ -209,9 +209,9 @@ msgstr "前缀" msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 +#: 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 msgid "file" @@ -245,7 +245,8 @@ msgstr "压缩效果更好" msgid "list supported archive formats" msgstr "列出支持的归档格式" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "仓库" @@ -392,11 +393,16 @@ msgstr "歧义的对象名：'%s'。" msgid "Not a valid branch point: '%s'." msgstr "无效的分支点：'%s'。" -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' 已经检出到 '%s'" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "工作区 %s 的 HEAD 指向没有被更新" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -407,7 +413,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" @@ -416,10 +422,10 @@ msgstr "不能打开 '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "仓库中缺少这些必备的提交：" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: 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 msgid "revision walk setup failed" msgstr "版本遍历设置失败" @@ -458,21 +464,21 @@ msgstr "rev-list 终止" msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "不能创建空包。" -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "index-pack 终止" @@ -481,8 +487,8 @@ msgstr "index-pack 终止" msgid "invalid color value: %.*s" msgstr "无效的颜色值：%.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" @@ -516,21 +522,21 @@ msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s" msgid "failed to expand user dir in: '%s'" msgstr "无法扩展 '%s' 中的用户目录" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "无效的对象创建模式：%s" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" @@ -549,24 +555,27 @@ msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" msgid "%s has multiple values" msgstr "%s 有多个取值" -#: config.c:2226 +#: config.c:2224 #, c-format -msgid "Could not set '%s' to '%s'" +msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" +#: config.c:2226 +#, c-format +msgid "could not unset '%s'" +msgstr "不能取消设置 '%s'" + #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "不能执行 'git rev-list'" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "无法写入 rev-list：%s" +msgid "failed write to rev-list" +msgstr "无法写入 rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "无法关闭 rev-list 的标准输入：%s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "无法关闭 rev-list 的标准输入" #: date.c:95 msgid "in the future" @@ -641,28 +650,28 @@ msgstr[1] "%lu 年前" msgid "failed to read orderfile '%s'" msgstr "无法读取排序文件 '%s'" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名检测" # 译者：注意保持前导空格 -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n" # 译者：注意保持前导空格 -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat 参数 '%s'\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -671,16 +680,16 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow 参数后只跟一个 pathspec" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -689,20 +698,20 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "缓存未跟踪文件在本系统或位置中被禁用。" -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "不能执行 gpg。" @@ -716,28 +725,28 @@ msgstr "gpg 无法为数据签名" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "不能创建临时文件 '%s'：%s" +msgid "could not create temporary file '%s'" +msgstr "不能创建临时文件 '%s'" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "无法将分离式签名写入 '%s'：%s" +msgid "failed writing detached signature to '%s'" +msgstr "无法将分离式签名写入 '%s'" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "'%s'：%s" +msgid "failed to stat '%s'" +msgstr "无法枚举 '%s' 状态" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "'%s'：读取不完整 %s" +msgid "'%s': short read" +msgstr "'%s'：读取不完整" #: help.c:205 #, c-format @@ -803,12 +812,35 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s：%s - %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"无法创建 '%s.lock'：%s。\n" +"\n" +"似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n" +"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n" +"可能之前有一个 git 进程在这个仓库中异常退出：\n" +"手动删除这个文件再继续。" + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "不能创建 '%s.lock'：%s" + #: merge.c:41 msgid "failed to read the cache" msgstr "无法读取缓存" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "无法写新的索引文件" @@ -855,7 +887,7 @@ msgstr "不能读取对象 %s '%s'" msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据对象" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "无法打开 '%s'" @@ -990,7 +1022,7 @@ msgstr "略过 %s（已经做过相同合并）" msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "子模组" @@ -1017,50 +1049,50 @@ msgstr "目录/文件" msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" -#: merge-recursive.c:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "严重的合并错误，不应发生。" -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "已经是最新的！" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "未处理的路径??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "不能写入索引。" @@ -1090,29 +1122,29 @@ msgstr "坏的 %s 值：'%s'" msgid "unable to parse object: %s" msgstr "不能解析对象：%s" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "..." -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-数字" @@ -1121,7 +1153,7 @@ msgstr "-数字" msgid "malformed object name '%s'" msgstr "非法的对象名 '%s'" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "不能设置 %s 为组可写" @@ -1188,7 +1220,7 @@ msgstr "" "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" "添加 ':/' 或 '.' ？" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" @@ -1214,23 +1246,23 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "无法删除引用 %s：%s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "无法删除引用：%s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "无法删除引用 %s" @@ -1369,93 +1401,93 @@ msgstr "格式：缺少 %%(end) 元素" msgid "malformed object name %s" msgstr "非法的对象名 %s" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同时获取 %s 和 %s 至 %s" -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %s，而非 %s" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同时跟踪 %s 和 %s" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "内部错误" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "没有此分支：'%s'" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "分支 '%s' 没有设置要推送的远程服务器" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "向 '%s' 推送引用规格未包含 '%s'" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "推送无目标（push.default 是 'nothing'）" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "无法解析 'simple' 推送至一个单独的目标" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" -#: remote.c:2084 +#: remote.c:2085 #, 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" msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" -#: remote.c:2090 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 来发布您的本地提交）\n" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1464,11 +1496,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" # 译者：注意保持前导空格 -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1484,20 +1516,20 @@ msgstr[1] "" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者：注意保持前导空格 -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "您的当前分支好像被损坏" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当前分支 '%s' 尚无任何提交" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 与 --bisect 不兼容" @@ -1545,7 +1577,7 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "不能写入 %s" @@ -1703,12 +1735,12 @@ msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" msgid "Could not create sequencer directory %s" msgstr "不能创建序列目录 %s" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" @@ -1720,63 +1752,72 @@ msgstr "不能解析 HEAD" msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "不能打开 %s：%s" +msgid "cannot open %s" +msgstr "不能打开 %s" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "不能读取 %s：%s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:888 +#: sequencer.c:887 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "不能格式化 %s。" -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "不能作为初始提交还原" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "期望 git 仓库版本 <= %d，却得到 %d" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "发现未知的仓库扩展：" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前（损坏的 .idx？）" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" @@ -1802,29 +1843,38 @@ msgstr "" "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" "命令关闭本消息通知。" -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "无法修改未合并的 .gitmodules，先解决合并冲突" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "无法在 .gitmodules 中找到 path=%s 的小节" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "不能更新 .gitmodules 条目 %s" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "无法移除 %s 的 .gitmodules 条目" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "将更新后 .gitmodules 添加暂存区失败" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "submodule.fetchJobs 不允许为负值" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "%s 的值无效" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1884,7 +1934,219 @@ msgstr "不能重命名临时文件为 %s" msgid "Could not read ref %s" msgstr "不能读取引用 %s" -#: unpack-trees.c:203 +#: 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." +msgstr "" +"您对下列文件的本地修改将被检出操作覆盖：\n" +"%%s请在切换分支前提交您的修改或者保存进度。" + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"您对下列文件的本地修改将被检出操作覆盖：\n" +"%%s" + +#: unpack-trees.c:69 +#, 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." +msgstr "" +"您对下列文件的本地修改将被合并操作覆盖：\n" +"%%s请在合并前提交您的修改或者保存进度。" + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"您对下列文件的本地修改将被合并操作覆盖：\n" +"%%s" + +#: unpack-trees.c:74 +#, 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." +msgstr "" +"您对下列文件的本地修改将被 %s 覆盖：\n" +"%%s请在 %s 之前提交您的修改或者保存进度。" + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"您对下列文件的本地修改将被 %s 覆盖：\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"更新如下目录将会丢失其中未跟踪的文件：\n" +"%s" + +#: unpack-trees.c:85 +#, 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." +msgstr "" +"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" +"%%s请在切换分支之前移动或删除。" + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" +"%%s请在合并前移动或删除。" + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" +"%%s请在 %s 前移动或删除。" + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" +"%%s请在切换分支前移动或删除。" + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" +"%%s请在合并前移动或删除。" + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" +"%%s请在 %s 前移动或删除。" + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"无法更新稀疏检出：如下条目不是最新：\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"工作区中下列文件将会因为稀疏检出而被覆盖：\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"工作区中下列文件将会因为稀疏检出而被删除：\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "终止中\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "正在检出文件" @@ -1922,205 +2184,201 @@ msgstr "无效的 '..' 路径片段" msgid "could not open '%s' for reading and writing" msgstr "无法打开 '%s' 进行读写" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "不能访问 '%s'：%s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "不能访问 '%s'" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "不能获取当前工作目录" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "不能写入 %s" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "不能写入 %s" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "不能关闭 %s" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "未合并的路径：" # 译者：注意保持前导空格 -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）" # 译者：注意保持前导空格 -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）" # 译者：注意保持前导空格 -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " （使用 \"git add <文件>...\" 标记解决方案）" # 译者：注意保持前导空格 -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）" # 译者：注意保持前导空格 -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <文件>...\" 标记解决方案）" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" # 译者：注意保持前导空格 -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）" # 译者：注意保持前导空格 -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" # 译者：注意保持前导空格 -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "双方删除：" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "由我们添加：" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "由他们删除：" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "由他们添加：" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "由我们删除：" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "双方添加：" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "双方修改：" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "bug：无法处理的未合并状态 %x" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "新文件：" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "拷贝：" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "删除：" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "修改：" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "重命名：" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "类型变更：" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "未知：" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "未合并：" # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "新提交, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "修改的内容, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "未跟踪的内容, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "bug：无法处理的差异状态 %c" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2128,44 +2386,44 @@ msgstr "" "不要改动上面的一行。\n" "下面的所有内容均将被删除。" -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" @@ -2319,43 +2577,43 @@ msgstr "您在执行二分查找操作。" msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "交互式变基操作正在进行中；至 " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2365,88 +2623,88 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1513 +#: wt-status.c:1535 #, 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:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1522 +#: wt-status.c:1544 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1525 +#: wt-status.c:1547 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1531 +#: wt-status.c:1553 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "无文件要提交，干净的工作区\n" # 译者：注意保持句尾空格 -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "初始提交于 " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "丢失" # 译者：注意保持句尾空格 -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "落后 " -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "领先 " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" @@ -2460,7 +2718,7 @@ msgstr "git add [<选项>] [--] <路径规格>..." msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "更新文件失败" @@ -2473,7 +2731,7 @@ msgstr "删除 '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "不能读取索引" @@ -2509,14 +2767,14 @@ 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:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: 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 msgid "dry run" msgstr "演习" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: 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 "冗长输出" @@ -2524,7 +2782,7 @@ msgstr "冗长输出" msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "交互式挑选数据块" @@ -2592,16 +2850,16 @@ 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:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: 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:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" @@ -2629,16 +2887,6 @@ msgstr "从 '%s' 拷贝注解到 '%s' 时失败" msgid "fseek failed" msgstr "fseek 失败" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "无法打开 '%s' 进行读取：%s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "无法打开 '%s' 进行写入：%s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2648,73 +2896,73 @@ msgstr "无法解析补丁 '%s'" msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "无效的时间戳" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "无效的日期行" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "无效的时区偏移值" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "补丁格式检测失败。" -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "无法创建目录 '%s'" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "无法拆分补丁。" -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "无法写入索引文件" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题，执行 \"%s --continue\"。" -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "补丁为空。是不是切分错误？" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三方合并的）基础目录树..." -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2722,37 +2970,37 @@ msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据对象上。" -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基础版本上打补丁及进行三方合并..." -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "无法合并变更。" -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入一树对象" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "无法继续：%s 不存在。" -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "标准输入没有和终端关联，不能进行交互式操作。" -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "提交内容为：" @@ -2761,35 +3009,35 @@ msgstr "提交内容为：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]：" -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引：不能应用补丁（脏文件：%s）" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "失败的补丁文件副本位于：%s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2799,7 +3047,7 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2807,168 +3055,170 @@ msgstr "" "您的索引中仍有未合并的路径。\n" "您是否忘了执行 'git add'？" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "无法清空索引" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "无效的 --patch-format 值：%s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "以交互式方式运行" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允许使用三方合并。" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "静默模式" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "在提交说明中添加一个 Signed-off-by 签名" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集（默认）" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "动作" -#: 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:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: 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 msgid "pass it through git-apply" msgstr "传递给 git-apply" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "根目录" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: 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:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 +#: 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/show-ref.c:175 builtin/tag.c:340 #: parse-options.h:132 parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "数字" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "格式" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "补丁的格式" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "和 --continue 同义" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "跳过当前补丁" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "恢复原始分支并终止打补丁操作。" -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "将作者日期作为提交日期" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" -#: builtin/am.c:2340 +#: builtin/am.c:2339 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." @@ -2976,16 +3226,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" "请不要再使用它了。" -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "无法读取索引" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2994,7 +3244,7 @@ msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" @@ -3027,37 +3277,37 @@ msgstr "regexec 返回 %d，输入为：%s" msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" -#: builtin/apply.c:940 +#: 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 - 应为 /dev/null，但在第 %2$d 行得到 %1$s" -#: builtin/apply.c:944 +#: 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:945 +#: 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:952 +#: 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:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -3068,77 +3318,77 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: builtin/apply.c:2896 +#: 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:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3147,319 +3397,329 @@ msgstr "" "当查询：\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "读取 %s 失败" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配" -#: builtin/apply.c:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能枚举新建文件 '%s' 的状态" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "内部错误" -#: builtin/apply.c:4269 +#: 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:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: builtin/apply.c:4300 +#: 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:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "略过补丁 '%s'。" + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "未能识别的输入" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "无法读取索引文件" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三方合并" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: 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:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "--3way 在一个仓库之外" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "--index 在一个仓库之外" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "--cached 在一个仓库之外" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "不能打开补丁 '%s'" -#: builtin/apply.c:4635 +#: 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:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3525,99 +3785,99 @@ msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" msgid "Blaming lines" msgstr "追踪代码行" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "增量式地显示发现的 blame 条目" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界提交显示空的 SHA-1（默认：关闭）" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作为边界（默认：关闭）" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "显示命令消耗统计" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "强制进度显示" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "显示判断 blame 条目位移的得分诊断信息" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "显示原始文件名（默认：自动）" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行号（默认：关闭）" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适合机器读取的格式" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "为每一行显示机器适用的提交信息" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" -#: builtin/blame.c:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关闭）" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的 SHA1 提交号（默认：关闭）" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "隐藏作者名字和时间戳（默认：关闭）" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而不是名字（默认：关闭）" -#: builtin/blame.c:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "花费额外的循环来找到更好的匹配" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" -#: builtin/blame.c:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "使用 <文件> 的内容作为最终的图片" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "得分" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "找到文件内及跨文件的行拷贝" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "找到文件内及跨文件的行移动" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" @@ -3627,32 +3887,32 @@ msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" #. 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<选项>] [-r | -a] [--points-at]" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3662,7 +3922,7 @@ msgstr "" " '%s'，但未合并到 HEAD。" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3671,12 +3931,12 @@ msgstr "" "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" " 然而却尚未被合并到分支 '%s' 。" -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "无法查询 '%s' 指向的提交对象" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3685,335 +3945,356 @@ msgstr "" "分支 '%s' 没有完全合并。\n" "如果您确认要删除它，执行 'git branch -D %s'。" -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "无法更新 config 文件" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "无法查询 HEAD 指向的提交对象" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "无法删除您当前所在的分支 '%s'。" +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "未能找到远程跟踪分支 '%s'。" -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未发现。" -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "无法删除远程跟踪分支 '%s'" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "无法删除分支 '%s'" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s（曾为 %s）。\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: 丢失]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s：落后 %d]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[落后 %d]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s：领先 %d]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[领先 %d]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s：领先 %d，落后 %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[领先 %d，落后 %d]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** 无效引用 ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "（非分支，正变基 %s）" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "（非分支，二分查找开始于 %s）" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "（头指针分离于 %s）" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "（头指针分离自 %s）" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "（非分支）" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "分支 %s 正被变基到 %s" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "分支 %s 正被二分查找于 %s" + +#: builtin/branch.c:560 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" -#: builtin/branch.c:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "重命名掉一个错误命名的旧分支 '%s'" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: builtin/branch.c:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新 config 文件失败" -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" -msgstr "不能写分支描述模版：%s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "不能写分支描述模版" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "通用选项" -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "不显示信息" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模式（参见 git-pull(1)）" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "改变上游信息" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "上游" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "改变上游信息" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "使用彩色输出" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "只打印包含该提交的分支" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作：" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪及本地分支" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "删除完全合并的分支" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "删除分支（即使没有合并）" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "移动/重命名一个分支，以及它的引用日志" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支，即使目标已存在" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "创建分支的引用日志" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "标记分支的描述" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "强制创建、移动/重命名、删除" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "只打印已经合并的分支" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "只打印尚未合并的分支" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "以列的方式显示分支" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "key" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "排序的字段名" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: 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/tag.c:369 msgid "object" msgstr "对象" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "只打印指向该对象的分支" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "必须提供分支名" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚无提交。" -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "为重命名操作提供了太多的分支名" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "为设置新上游提供了太多的分支名" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。" -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "没有此分支 '%s'" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "为取消上游设置操作提供了太多的分支名" -#: builtin/branch.c:784 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" -#: builtin/branch.c:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "手工创建 'HEAD' 没有意义" -#: builtin/branch.c:810 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" -#: builtin/branch.c:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -4021,7 +4302,7 @@ msgid "" msgstr "" "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" -#: builtin/branch.c:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -4032,16 +4313,6 @@ msgstr "" "如果你想用 '%s' 跟踪 '%s', 这么做：\n" "\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -4139,7 +4410,7 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -4229,8 +4500,9 @@ msgid "write the content to temporary files" msgstr "将内容写入临时文件" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: 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 msgid "string" msgstr "字符串" @@ -4280,80 +4552,80 @@ msgstr "path '%s'：无法合并" msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路径时使用" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同时使用" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "损坏的索引文件" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能对 '%s' 执行 reflog 操作：%s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4374,7 +4646,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4401,150 +4673,150 @@ msgstr[1] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "只要一个引用，却给出了 %d 个" -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: 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 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "成为指向该提交的分离头指针" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方合并" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "风格" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "二次猜测'git checkout <无此分支>'" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "不检查指定的引用是否被其他工作区所占用" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: 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/send-pack.c:168 msgid "force progress reporting" msgstr "强制显示进度报告" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b、-B 和 --orphan 是互斥的" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "缺少分支名；尝试 -b" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4553,12 +4825,12 @@ msgstr "" "不能同时更新路径并切换到分支'%s'。\n" "您是想要检出 '%s' 但其未能解析为提交么？" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4709,8 +4981,8 @@ msgstr "交互式清除" msgid "remove whole directories" msgstr "删除整个目录" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: 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 msgid "pattern" msgstr "模式" @@ -4748,104 +5020,113 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<选项>] [--] <仓库> [<路径>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "不创建一个检出" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "创建一个纯仓库" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "创建一个镜像仓库（也是纯仓库）" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "从本地仓库克隆" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "不使用本地硬链接，始终复制" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "设置为共享仓库" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "在克隆时初始化子模组" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "并发克隆的子模组的数量" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "模板目录" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "模板目录将被使用" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "参考仓库" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "仅在克隆时参考 --reference 指向的本地仓库" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "名称" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "检出 <分支> 而不是远程 HEAD" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 -#: builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 +#: builtin/pull.c:201 msgid "depth" msgstr "深度" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "子模组将以浅下载模式克隆" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "key=value" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "在新仓库中设置配置信息" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 地址" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 地址" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4853,57 +5134,52 @@ msgstr "" "无法猜到目录名。\n" "请在命令行指定一个目录" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "参考仓库 '%s' 不是一个本地仓库。" -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "参考仓库 '%s' 是一个浅克隆" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "参考仓库 '%s' 已被嫁接" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "无法枚举 '%s' 状态" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "无法枚举 %s 状态\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "无法创建链接 '%s'" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "无法拷贝文件至 '%s'" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4913,126 +5189,126 @@ msgstr "" "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" "'git checkout -f HEAD' 重试\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "检查连接... " -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必须的对象" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "不能更新 %s" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "不能检出工作区" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "无法将参数写入配置文件" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "无法执行 repack 来清理" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 选项不兼容。" -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能创建工作区目录 '%s'" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯仓库 '%s'...\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "源仓库是浅克隆，忽略 --local" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" @@ -5166,103 +5442,103 @@ msgstr "" "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" "操作。\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "无法更新临时索引" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "不能更新树的主缓存" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者信息" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有非法的作者信息" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "非法的 --author 参数" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "无效的日期格式：%s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "不能读取 MERGE_MSG" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "不能读取 MERGE_MSG" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5276,7 +5552,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5290,7 +5566,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5299,7 +5575,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5310,346 +5586,346 @@ msgstr "" "也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 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:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "聪明... 用脏索引修补最后一个提交。" -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..." -#: builtin/commit.c:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项同时使用没有意义。" -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "模式" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "显示忽略的文件" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "何时" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr "（根提交）" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "作者" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "日期" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "说明" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "提交说明" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "提交" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "添加 Signed-off-by: 签名" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "强制编辑提交" # 译者：可选值，不能翻译（或是原文中笔误，应为 mode） -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "default" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "设置如何删除提交说明里的空格和#注释" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG 提交签名" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "绕过 pre-commit 钩子" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5794,7 +6070,7 @@ msgstr "显示配置的来源（文件、标准输入、数据对象，或命令 msgid "unable to parse default color value" msgstr "不能解析默认颜色值" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5809,7 +6085,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "不能创建配置文件 %s" @@ -5845,7 +6121,7 @@ msgstr "附注标签 %s 没有嵌入名称" msgid "tag '%s' is really '%s' here" msgstr "标签 '%s' 的确是在 '%s'" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" @@ -5938,7 +6214,7 @@ msgstr "考虑最近 <n> 个标签（默认：10）" msgid "only consider tags matching <pattern>" msgstr "只考虑匹配 <模式> 的标签" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" @@ -5972,21 +6248,21 @@ msgstr "'%s'：不是一个正规文件或符号链接" msgid "invalid option: %s" msgstr "无效选项：%s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "不是一个 git 仓库" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个数据对象：'%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "无法处理的对象 '%s'。" @@ -6059,19 +6335,19 @@ msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "从所有的远程抓取" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" @@ -6079,7 +6355,7 @@ msgstr "强制覆盖本地分支" msgid "fetch from multiple remotes" msgstr "从多个远程抓取" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "抓取所有的标签和关联对象" @@ -6091,20 +6367,20 @@ msgstr "不抓取任何标签(--no-tags)" msgid "number of submodules fetched in parallel" msgstr "子模组获取的并发数" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" # 译者：可选值，不能翻译 -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "保持下载包" @@ -6112,15 +6388,15 @@ msgstr "保持下载包" msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "转换为一个完整的仓库" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "目录" @@ -6132,15 +6408,15 @@ msgstr "在子模组路径输出的前面加上此目录" msgid "default mode for recursion" msgstr "递归的默认模式" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "指定获取操作的引用映射" @@ -6199,11 +6475,6 @@ msgstr "强制更新" msgid "(non-fast-forward)" msgstr "（非快进式）" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "无法打开 %s：%s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6402,55 +6673,55 @@ msgstr "检查连接中" msgid "Checking object directories" msgstr "检查对象目录中" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<选项>] [<对象>...]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "显示不可达的对象" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "显示摇摆的对象" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "报告标签" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "报告根节点" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点（默认）" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "仅检查连通性" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "启用更严格的检查" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "将摇摆对象写入 .git/lost-found 中" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "显示进度" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "检查对象中" @@ -6549,215 +6820,215 @@ msgstr "无法读取树（%s）" msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的文件" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "显示未匹配的行" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "不区分大小写匹配" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "把二进制文件当做文本处理" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处理二进制文件" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下寻找" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "显示行号" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "不显示文件名" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "显示文件名" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "高亮显示匹配项" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "显示匹配项前后的 <n> 行上下文" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "显示匹配项前 <n> 行上下文" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "显示匹配项后 <n> 行上下文" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "使用 <n> 个工作线程" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "显示所在函数的前后内容" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "从文件读取模式" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "匹配 <模式>" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "显示 grep 表达式的解析树" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "分页" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "分页显示匹配的文件" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "未提供模式匹配。" -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 或 --untracked 不能和版本同时使用。" -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" @@ -6846,8 +7117,8 @@ msgstr "emacsclient 版本 '%d' 太老（< 22）。" #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "无法执行 '%s'：%s" +msgid "failed to exec '%s'" +msgstr "无法执行 '%s'" #: builtin/help.c:205 #, c-format @@ -7105,107 +7376,109 @@ msgstr "不可理喻" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "完成 %d 个本地对象" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "完成 %d 个本地对象" +msgstr[1] "完成 %d 个本地对象" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "无法写保留文件 '%s'" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "无法关闭保留文件 '%s'" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1587 +#: builtin/index-pack.c:1589 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 个对象" msgstr[1] "非 delta：%d 个对象" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1596 #, 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:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "包文件名 '%s' 没有以 '.pack' 结尾" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "包文件名 '%s' 没有以 '.pack' 结尾" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" @@ -7244,27 +7517,27 @@ msgstr "不能拷贝 '%s' 至 '%s'" msgid "ignoring template %s" msgstr "忽略模版 %s" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "模版未找到 %s" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" +msgid "not copying templates from '%s': %s" +msgstr "没有从 '%s' 复制模版：%s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s 已经存在" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" @@ -7272,25 +7545,25 @@ 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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git 仓库于 %s%s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "重新初始化现存的" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "初始化空的" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr "共享" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7298,32 +7571,32 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " "[<目录>]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "权限" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" @@ -7369,273 +7642,319 @@ msgstr "git show [<选项>] <对象>..." msgid "invalid --decorate option: %s" msgstr "无效的 --decorate 选项：%s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "不显示差异输出" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "显示源" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "使用邮件映射文件" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "修饰选项" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "处理文件中第 n 到 m 之间的行，从 1 开始" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 损坏的文件" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "只需要一个范围。" -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "不是一个范围。" -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "信封需要邮件地址格式" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, 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 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "无法解析 '%s' 为一个有效引用。" + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "不能找到准确的合并基线。" + +#: builtin/log.c:1235 +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" +"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" +"参数 --base=<base-commit-id> 手动指定一个基线提交。" + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "无法找到准确的合并基线" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "基线提交应该是版本列表的祖先" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "基线提交不应该出现在版本列表中" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "无法得到补丁 id" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "生成一封附信" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "后缀" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "补丁以 <n> 开始编号，而不是1" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "把结果文件存储在 <目录>" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "在 From 头信息中输出全为零的哈希值" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "header" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "添加邮件头" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "邮件地址" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "添加收件人" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "添加抄送" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "标识" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "邮件标识" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "使第一封邮件作为对 <邮件标识> 的回复" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "边界" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "附件方式添加补丁" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "内联显示补丁" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "签名" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "添加一个签名" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "基线提交" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "为补丁列表添加前置树信息" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "从文件添加一个签名" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n 和 -k 互斥。" -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix 和 -k 互斥。" -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "未知提交 %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<选项>] [<文件>...]" @@ -7826,171 +8145,175 @@ msgstr "git merge [<选项>] <说明> HEAD <提交>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合并策略 '%s'。\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "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:132 msgid "(synonym to --stat)" msgstr "（和 --stat 同义）" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "在提交前编辑提交说明" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "允许快进（默认）" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "策略" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "放弃当前正在进行的合并" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "允许合并不相关的历史" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "不能进行进度保存。" -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "进度保存失败" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象：%s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "读取树失败" # 译者：注意保持前导空格 -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " （无可压缩）" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩提交 -- 未更新 HEAD\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: 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:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "写入 SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "完成 SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -8004,52 +8327,52 @@ msgstr "" "\n" "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "'%s' 不是一个提交" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程仓库。" -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8057,7 +8380,7 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8065,100 +8388,104 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 与 --no-ff 同时使用。" -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有一个 GPG 签名。" -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "拒绝合并无关的历史" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" @@ -8268,7 +8595,7 @@ msgstr "git mv [<选项>] <源>... <目标>" msgid "Directory %s is in index and no submodule?" msgstr "目录 %s 在索引中并且不是子模组？" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续" @@ -8346,48 +8673,48 @@ msgstr "%s，源=%s，目标=%s" msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<选项>] <提交>..." -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<选项>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<选项>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "只打印名称（无 SHA-1）" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "只使用标签来命名提交" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "只使用和 <模式> 相匹配的引用" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "列出可以从所有引用访问的提交" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "从标准输入读取" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "允许打印 `未定义` 的名称（默认）" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "反向解析输入中的标签（内部使用）" @@ -8532,24 +8859,16 @@ msgstr "不能写注解对象" msgid "The note contents have been left in %s" msgstr "注解内容被留在 %s 中" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" -#: 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:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "无法解析 '%s' 为一个有效引用。" - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8562,7 +8881,7 @@ 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:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "参数太多" @@ -8607,7 +8926,7 @@ msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆 msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" @@ -8645,63 +8964,63 @@ msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "通用选项" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "合并选项" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "提交未合并的注解" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "通过提交未合并的注解来完成注解合并" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "中止注解合并的方案" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "中止注解合并" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "一个到 %s 的注解合并已经在 %s 执行中" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "尝试删除不存在的注解不是一个错误" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "注解引用" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" @@ -8721,165 +9040,169 @@ msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象 msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" -#: builtin/pack-objects.c:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "显示进度表" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "版本[,偏移]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象存储里借用对象" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2619 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包对象的标签对象" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "时间" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "创建适合浅克隆仓库获取的包" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "显示被嫁接隐藏的提交" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同时创建 bitmap 索引" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "对象计数中" @@ -8907,15 +9230,15 @@ msgstr "正在删除重复对象" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "不删除，只显示" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "报告清除的对象" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "使早于给定时间的对象过期" @@ -8927,65 +9250,69 @@ msgstr "不能在珍品仓库中执行清理操作" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "和合并相关的选项" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "使用变基操作取代合并操作以合入修改" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "允许快进式" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "自动在变基操作前后执行 stash/stash pop" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "和获取相关的参数" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "并发拉取的子模组的数量" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff 的取值无效：%s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "无法通过变基方式拉取：您有未暂存的变更。" -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "而且您的索引中包含未提交的变更。" -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。" -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "在您刚刚获取到的引用中没有变基操作的候选。" -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "在您刚刚获取到的引用中没有合并操作的候选。" -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -8995,38 +9322,42 @@ msgstr "" "您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n" "分支默认的远程仓库，您必须在命令行中指定一个分支名。" -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "您当前不在一个分支上。" -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "请指定您要变基到哪一个分支。" -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "请指定您要合并哪一个分支。" -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "详见 git-pull(1)。" -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<远程>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<分支>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "当前分支没有跟踪信息。" -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" -msgstr "" -"如果您想要为此分支创建跟踪信息，您可以执行：\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "如果您想要为此分支创建跟踪信息，您可以执行：" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9035,11 +9366,15 @@ msgstr "" "您的配置中指定要合并远程的引用 '%s'，\n" "但是没有获取到这个引用。" -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未诞生的分支，变更添加至索引。" -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9049,7 +9384,7 @@ msgstr "" "fetch 更新了当前的分支。快进您的工作区\n" "至提交 %s。" -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9066,11 +9401,11 @@ msgstr "" "$ git reset --hard\n" "恢复之前的状态。" -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "无法将多个分支合并到空分支。" -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "无法变基到多个分支。" @@ -9420,6 +9755,18 @@ msgstr "跳过应用稀疏检出过滤器" msgid "debug unpack-trees" msgstr "调试 unpack-trees" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <git-dir>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "静默模式" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "您必须指定一个目录。" + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9738,27 +10085,29 @@ msgstr "* 远程 %s" msgid " Fetch URL: %s" msgstr " 获取地址：%s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(无 URL)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " 推送地址：%s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支：%s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -9766,151 +10115,151 @@ msgstr[0] " 远程分支：%s" msgstr[1] " 远程分支：%s" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr "（状态未查询）" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 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:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " 本地引用将在 'git push' 时被镜像" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, 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:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "根据远程设置 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "删除 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "无法确定远程 HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多个远程 HEAD 分支。请明确地选择一个用命令：" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "无法删除 %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "不是一个有效引用：%s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "不能设置 %s" # 译者：注意保持前导空格 -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s 将成为摇摆状态！" # 译者：注意保持前导空格 -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s 已成为摇摆状态！" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "修剪 %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [将删除] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [已删除] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "抓取后清除远程" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "没有此远程 '%s'" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "添加分支" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "未指定远程" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "查询推送 URL 地址，而非获取 URL 地址" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "返回所有 URL 地址" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "没有给远程仓库 '%s' 设定 URL" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "操作推送 URLS" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "添加 URL" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "删除 URLS" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete 无意义" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "无效的旧 URL 匹配模版：%s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "未找到此 URL：%s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "将不会删除所有非推送 URL 地址" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于子命令之前" @@ -10410,10 +10759,6 @@ msgstr "允许递归删除" msgid "exit with a zero status even if nothing matched" msgstr "即使没有匹配，也以零状态退出" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10615,81 +10960,179 @@ msgstr "跳过和移除所有的注释行" msgid "prepend comment character and space to each line" msgstr "为每一行的行首添加注释符和空格" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "没有这样的引用：%s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "期望一个完整的引用名称，却得到 %s" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "无法从 url '%s' 剥离一个组件" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "相对路径的替代锚记（anchor）" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "无法为子模组 '%s' 注册 url" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n" + +# +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "警告：建议子模组 '%s' 使用命令更新模式\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "无法为子模组 '%s' 注册更新模式" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "初始化子模组时抑制输出" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<路径>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路径>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "新的子模组将要克隆的路径" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "新子模组的名称" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "克隆子模组的 url 地址" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "浅克隆的深度" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" -msgstr "" -"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " -"[--name <名字>] [--url <地址>][--depth <深度>] [--] [<路径>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +msgstr "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] [--name <名字>] [--depth <深度>] --url <url> --path <路径>" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "无法克隆 '%s' 到子模组路径 '%s'" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "无法打开文件 '%s'" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "无法关闭文件 %s" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "无法得到 '%s' 的子模组目录" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" -msgstr "严重错误：submodule-helper 子命令必须由另外的子命令调用" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "子模组 '%s' 尚未初始化" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "也许您想要执行 'update --init'？" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "略过未合并的子模组 %s" + +#: builtin/submodule--helper.c:660 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "严重错误：'%s' 不是一个有效的 submodule--helper 子命令" +msgid "Skipping submodule '%s'" +msgstr "略过子模组 '%s'" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "到工作区的路径" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "工作区中的路径，递归嵌套子模组" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "rebase、merge、checkout 或 none" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "创建一个指定深度的浅克隆" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "并发任务" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "不要输出克隆进度" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "update 参数取值错误" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "submodule-helper 子命令必须由另外的子命令调用" + +#: builtin/submodule--helper.c:862 +#, c-format +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "'%s' 不是一个有效的 submodule--helper 子命令" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10742,27 +11185,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <标签名>..." -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "标签名称太长：%.*s..." -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "未发现标签 '%s'。" -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "已删除标签 '%s'（曾为 %s）\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "不能校验该标签 '%s'" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10775,7 +11213,7 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被忽略。\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10906,21 +11344,21 @@ msgstr "选项 --merged 和 --no-merged 只能和 -l 共用" msgid "only one -F or -m option is allowed." msgstr "只允许一个 -F 或 -m 选项。" -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "太多参数" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一个有效的标签名称。" -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "标签 '%s' 已存在" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新标签 '%s'（曾为 %s）\n" @@ -11168,7 +11606,7 @@ msgstr "git verify-commit [-v | --verbose] <提交>..." msgid "print commit contents" msgstr "打印提交内容" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "打印原始 gpg 状态输出" @@ -11188,7 +11626,7 @@ msgstr "只显示统计" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <标签>..." -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "打印标签内容" @@ -11204,68 +11642,72 @@ msgstr "git worktree prune [<选项>]" msgid "git worktree list [<options>]" msgstr "git worktree list [<选项>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "删除工作区/%s：不是一个有效的目录" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "删除 worktrees/%s：gitdir 文件不存在" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "删除 worktrees/%s：无效的 gitdir 文件" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "删除 worktrees/%s：gitdir 文件的指向不存在" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "无法删除：%s" +msgid "failed to remove '%s'" +msgstr "无法删除 '%s'" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "'%s' 已经存在" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "不能创建目录 '%s'" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "准备 %s （标识符 %s）" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "检出分支 <branch> 即使已经被检出到其它工作区" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "创建一个新分支" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "创建或重置一个分支" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "生成新的工作区" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b、-B 和 --detach 是互斥的" @@ -11285,7 +11727,7 @@ msgstr "将 <前缀> 子目录内容写到一个树对象" msgid "only useful for debugging" msgstr "只对调试有用" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "调试信息输出到标准错误" @@ -11299,7 +11741,7 @@ msgstr "" "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" "帮助。" -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0" @@ -11427,7 +11869,7 @@ msgstr "更加安静" msgid "use <n> digits to display SHA-1s" msgstr "用 <n> 位数字显示 SHA-1 哈希值" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "如果可能，重用冲突解决更新索引" @@ -11638,16 +12080,16 @@ msgstr "" "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n" "要恢复原分支并停止变基，执行 \"git rebase --abort\"。" -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "成功应用 autostash。" -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "无法保存 $stash_sha1" -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11657,31 +12099,27 @@ msgstr "" "您的修改安全地保存在 stash 中。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "钩子 pre-rebase 拒绝变基操作。" -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "选项 --exec 必须和选项 --interactive 同时使用" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "没有正在进行的变基？" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11689,12 +12127,12 @@ msgstr "" "您必须编辑所有的合并冲突，然后通过 git add\n" "命令将它们标记为已解决" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "无法移回 $head_name" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11713,64 +12151,64 @@ msgstr "" "\t$cmd_clear_stale_rebase\n" "然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。" -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "无效的上游 $upstream_name" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 有一个以上的合并基准" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 没有合并基准" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "没有指向一个有效的提交：$onto_name" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "严重错误：无此分支：$branch_name" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "无法 autostash" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "创建了 autostash: $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "请提交或为它们保存进度。" -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "当前分支 $branch_name 是最新的。" -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "当前分支 $branch_name 是最新的，强制变基。" -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "变更从 $mb 到 $onto：" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "首先，回退分支以便在上面重放您的工作..." -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "快进 $branch_name 至 $onto_name。" @@ -11914,26 +12352,21 @@ msgstr "未指定分支名" msgid "(To restore them type \"git stash apply\")" msgstr "（为恢复数据输入 \"git stash apply\"）" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "无法从 url '$remoteurl' 剥离一个组件" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "只能在工作区的顶级目录中使用相对路径" -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11944,428 +12377,220 @@ msgstr "" "$sm_path\n" "如果您确实想添加它，使用 -f 参数。" -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存仓库到索引" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库：" -#: git-submodule.sh:342 +#: 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:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。" -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "激活本地 git 目录到子模组 '$sm_name'。" -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:417 +#: git-submodule.sh:355 #, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "正在进入 '$prefix$displaypath'" +msgid "Entering '$displaypath'" +msgstr "正在进入 '$displaypath'" -#: git-submodule.sh:437 +#: git-submodule.sh:375 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." -msgstr "停止于 '$prefix$displaypath'，脚本返回非零值。" +msgid "Stopping at '$displaypath'; script returned non-zero status." +msgstr "停止于 '$displaypath'；脚本返回非零值。" -#: git-submodule.sh:483 +#: git-submodule.sh:448 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url" +msgid "pathspec and --all are incompatible" +msgstr "pathspec 和 --all 不兼容" -#: git-submodule.sh:492 +#: git-submodule.sh:453 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "无法为子模组路径 '$displaypath' 注册 url" - -#: git-submodule.sh:494 -#, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'" -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "无法为子模组路径 '$displaypath' 注册更新模式" - -#: git-submodule.sh:549 -#, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化" - -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "已清除目录 '$displaypath'" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "无法移除子模组工作区 '$displaypath'" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "不能创建空的子模组目录 '$displaypath'" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"子模组路径 '$displaypath' 没有初始化\n" -"也许您想用 'update --init'？" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中获取" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "子模组路径 '$displaypath'：检出 '$sha1'" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模组路径 '$displaypath'：变基至 '$sha1'" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" -msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" +msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "子模组 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "无法递归进子模组路径 '$displaypath'" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached 不能和选项 --files 同时使用" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 警告：$display_name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, 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:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "数据对象" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "无法递归进子模组路径 '$sm_path'" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "为 '$displaypath' 同步子模组 url" -#~ msgid "Forward-port local commits to the updated upstream head" -#~ msgstr "本地提交转移至更新后的上游分支中" - -#~ msgid "unable to parse format" -#~ msgstr "不能解析格式" - -#~ msgid "improper format entered align:%s" -#~ msgstr "输入了不正确的格式 align:%s" - -#~ msgid "Could not set core.worktree in %s" -#~ msgstr "不能在 %s 中设置 core.worktree" - -# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短 -#~ msgid "" -#~ "push.default is unset; its implicit value has changed in\n" -#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" -#~ "and maintain the traditional behavior, use:\n" -#~ "\n" -#~ " git config --global push.default matching\n" -#~ "\n" -#~ "To squelch this message and adopt the new behavior now, use:\n" -#~ "\n" -#~ " git config --global push.default simple\n" -#~ "\n" -#~ "When push.default is set to 'matching', git will push local branches\n" -#~ "to the remote branches that already exist with the same name.\n" -#~ "\n" -#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n" -#~ "behavior, which only pushes the current branch to the corresponding\n" -#~ "remote branch that 'git pull' uses to update the current branch.\n" -#~ "\n" -#~ "See 'git help config' and search for 'push.default' for further " -#~ "information.\n" -#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" -#~ "'current' instead of 'simple' if you sometimes use older versions of Git)" -#~ msgstr "" -#~ "push.default 尚未设置，它的默认值在 Git 2.0 已从 'matching'\n" -#~ "变更为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n" -#~ "\n" -#~ " git config --global push.default matching\n" -#~ "\n" -#~ "若要不再显示本信息并从现在开始采用新的使用习惯，设置：\n" -#~ "\n" -#~ " git config --global push.default simple\n" -#~ "\n" -#~ "当 push.default 设置为 'matching' 后，git 将推送和远程同名的所有\n" -#~ "本地分支。\n" -#~ "\n" -#~ "从 Git 2.0 开始，Git 默认采用更为保守的 'simple' 模式，只推送当前\n" -#~ "分支到远程关联的同名分支，即 'git push' 推送当前分支。\n" -#~ "\n" -#~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n" -#~ "（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n" -#~ "为保持兼容，请用 'current' 代替 'simple'）" - -#~ msgid "Could not append '%s'" -#~ msgstr "不能追加 '%s'" - -#~ msgid "Could not set '%s'" -#~ msgstr "不能设置 '%s'" - -# 译者：可选值，不能翻译 -#~ msgid "check|on-demand|no" -#~ msgstr "check|on-demand|no" - -#~ msgid "Missing author: %s" -#~ msgstr "缺少作者：%s" - -#~ msgid "Testing " -#~ msgstr "正在测试 " - -#~ msgid "unable to look up current user in the passwd file: %s" -#~ msgstr "无法在口令文件中查询到当前用户：%s" - -#~ msgid "no such user" -#~ msgstr "无此用户" - -#~ msgid "show usage" -#~ msgstr "显示用法" - -#~ msgid "branch '%s' does not point at a commit" -#~ msgstr "分支 '%s' 未指向一个提交" - -#~ msgid "object '%s' does not point to a commit" -#~ msgstr "对象 '%s' 没有指向一个提交" - -#~ msgid "print only merged branches" -#~ msgstr "只打印合并的分支" - -#~ msgid "--dissociate given, but there is no --reference" -#~ msgstr "提供了参数 --dissociate，但未提供 --reference" - -#~ msgid "insanely long template name %s" -#~ msgstr "太长的模版名 %s" - -#~ msgid "insanely long symlink %s" -#~ msgstr "太长的符号链接 %s" - -#~ msgid "insanely long template path %s" -#~ msgstr "太长的模版路径 %s" - -#~ msgid "insane git directory %s" -#~ msgstr "不正常的 git 目录 %s" - -#~ msgid "unsupported sort specification '%s'" -#~ msgstr "不支持的排序规格 '%s'" - -#~ msgid "unsupported sort specification '%s' in variable '%s'" -#~ msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'" - -#~ msgid "switch 'points-at' requires an object" -#~ msgstr "开关 'points-at' 需要一个对象" - -#~ msgid "sort tags" -#~ msgstr "排序标签" - -#~ msgid "--sort and -n are incompatible" -#~ msgstr "--sort 和 -n 不兼容" - -#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" -#~ msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反" - -#~ msgid "false|true|preserve" -#~ msgstr "false|true|preserve" - -#~ msgid "BUG: reopen a lockfile that is still open" -#~ msgstr "BUG: 重新打开一个仍打开着的锁文件" - -#~ msgid "BUG: reopen a lockfile that has been committed" -#~ msgstr "BUG: 重新打开一个已提交的锁文件" - -#~ msgid "option %s does not accept negative form" -#~ msgstr "选项 %s 不接受否定格式" - -#~ msgid "unable to parse value '%s' for option %s" -#~ msgstr "不能解析选项 %1$s 的值 '%2$s'" - -#~ msgid "-b and -B are mutually exclusive" -#~ msgstr "-b 和 -B 互斥" - -#~ msgid "You need to set your committer info first" -#~ msgstr "您需要先设置你的提交者信息" - -#~ msgid "" -#~ "When you have resolved this problem, run \"$cmdline --continue\".\n" -#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" -#~ "To restore the original branch and stop patching, run \"$cmdline --abort" -#~ "\"." -#~ msgstr "" -#~ "当您解决了此问题后，执行 \"$cmdline --continue\"。\n" -#~ "如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n" -#~ "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" - -#~ msgid "Patch format $patch_format is not supported." -#~ msgstr "不支持 $patch_format 补丁格式。" - -#~ msgid "Please make up your mind. --skip or --abort?" -#~ msgstr "请下决心。--skip 或是 --abort ？" - -#~ msgid "" -#~ "Patch is empty. Was it split wrong?\n" -#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" -#~ "To restore the original branch and stop patching run \"$cmdline --abort\"." -#~ msgstr "" -#~ "补丁为空。是不是切分错误？\n" -#~ "如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n" -#~ "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" - -#~ msgid "Patch does not have a valid e-mail address." -#~ msgstr "补丁中没有一个有效的邮件地址。" - -#~ msgid "Applying: $FIRSTLINE" -#~ msgstr "正应用：$FIRSTLINE" - -#~ msgid "Patch failed at $msgnum $FIRSTLINE" -#~ msgstr "补丁失败于 $msgnum $FIRSTLINE" - -#~ msgid "" -#~ "Pull is not possible because you have unmerged files.\n" -#~ "Please, 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 "" -#~ "Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件，\n" -#~ "然后酌情使用 'git add/rm <文件>' 标记解决方案，再做提交。" - -#~ msgid "Pull is not possible because you have unmerged files." -#~ msgstr "Pull 不可用，因为您尚有未合并的文件。" +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "详见 git-${cmd}(1)。" |