diff options
| -rw-r--r-- | po/bg.po | 2559 | ||||
| -rw-r--r-- | po/ca.po | 2509 | ||||
| -rw-r--r-- | po/de.po | 2653 | ||||
| -rw-r--r-- | po/fr.po | 2510 | ||||
| -rw-r--r-- | po/git.pot | 2452 | ||||
| -rw-r--r-- | po/sv.po | 2516 | ||||
| -rw-r--r-- | po/vi.po | 2514 | ||||
| -rw-r--r-- | po/zh_CN.po | 2503 |
8 files changed, 11110 insertions, 9106 deletions
@@ -1,7 +1,7 @@ # Bulgarian translation of git po-file. -# Copyright (C) 2014 Alexander Shopov <ash@kambanaria.org>. +# Copyright (C) 2014, 2015 Alexander Shopov <ash@kambanaria.org>. # This file is distributed under the same license as the git package. -# Alexander Shopov <ash@kambanaria.org>, 2014. +# Alexander Shopov <ash@kambanaria.org>, 2014, 2015. # # ======================== # DICTIONARY TO MERGE IN GIT GUI @@ -21,7 +21,7 @@ # git bundle пратка на git # bisect двоично търсене # am прилагам поредица от кръпки -# working directory/tree — винаги работно дърво, git следи цялото дърво, а не директории +# working directory/tree — винаги работно дърво, git следи цялото дърво, а не директории, работна директория за cwd # switch to branch прехвърлям се/преминавам към клон # sparse entry частично изтеглена директория/път # revision range диапазон на версиите @@ -56,6 +56,9 @@ # mainline базово подаване - при cherry-pick на merge - към коя версия да се изчислява разликата # token лексема # trailer епилог/завършек на съобщение +# cwd текуща работна директория +# untracked cache кеш за неследените файлове +# broken/corrupt повреден # ---- # FAILED to parse неуспешен анализ на... -> неразпозната стойност на # blob обект BLOB @@ -91,11 +94,6 @@ # grep ^#: new.po | cut -c4- |tr ' ' '\n'| sed -e 's/:[0-9][0-9]*//' -e 's%.*/%%' -e 's/[.][^.]*$//' | sort -u # # ======================== -# STRINGS statistics -# ------------------------ -# 2228t -# -# ======================== # MOST IMPORTANT name asc ordering # ------------------------ # add, blame, branch, checkout, clone, commit, common-cmds, config, diff, fetch, fsck, gc, git-rebase, git-stash, grep, log, mv, parse-options, push, reflog, remote, reset, revert, rm, wt-status @@ -105,33 +103,12 @@ # ------------------------ # apply, archive, check-ignore, clean, date, describe, git-am, git-bisect, git-submodule, hash-object, init-db, ls-tree, merge, merge-base, merge-file, merge-recursive, name-rev, pathspec, show-ref, tag # -# ======================== -# WHOLE STATISTICS strings desc, name asc ordering -# ------------------------ -# 144 [remote] 47 [push] 26 [revert] 12 [checkout-index] 6 [prune] 2 [verify-tag] -# 137 [commit] 46 [pack-objects] 24 [mv] 11 [date] 6 [gpg-interface] 2 [update-server-info] -# 114 [branch] 41 [help] 23 [repack] 11 [column] 6 [check-attr] 2 [run-command] -# 111 [apply] 39 [init-db] 21 [rm] 10 [urlmatch] 5 [write-tree] 2 [rerere] -# 101 [notes] 36 [add] 21 [common-cmds] 10 [shortlog] 5 [sha1_name] 2 [read-cache] -# 100 [wt-status] 35 [reset] 19 [show-branch] 10 [merge-file] 5 [rev-parse] 2 [obstack] -# 97 [merge] 35 [archive] 19 [read-tree] 10 [merge-base] 4 [wrapper] 2 [advice] -# 78 [checkout] 34 [config] 19 [bundle] 10 [ls-tree] 4 [prune-packed] 1 [unpack-trees] -# 77 [log] 32 [clean] 16 [parse-options] 10 [hash-object] 4 [notes-utils] 1 [unpack-objects] -# 69 [clone] 30 [git-am] 15 [fsck] 10 [for-each-ref] 4 [mktree] 1 [progress] -# 68 [index-pack] 30 [describe] 14 [show-ref] 10 [cat-file] 4 [check-mailmap] 1 [precompose_utf8] -# 68 [fetch] 29 [git-stash] 14 [gc] 9 [update-ref] 3 [verify-pack] 1 [object] -# 64 [tag] 29 [git-bisect] 14 [fast-export] 9 [submodule] 3 [reflog] 1 [git] -# 64 [grep] 28 [update-index] 13 [diff] 8 [replace] 3 [pack-refs] 1 [diffcore-rename] -# 56 [sequencer] 28 [blame] 13 [check-ignore] 8 [git-pull] 3 [count-objects] 1 [diffcore-order] -# 55 [merge-recursive] 27 [ls-files] 12 [pathspec] 8 [fmt-merge-msg] 3 [connected] 1 [attr] -# 54 [git-submodule] 27 [git-rebase] 12 [name-rev] 7 [symbolic-ref] 3 [bisect--helper] -# msgid "" msgstr "" "Project-Id-Version: git master\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-04-03 08:13+0800\n" -"PO-Revision-Date: 2015-04-07 11:21+0300\n" +"POT-Creation-Date: 2015-06-27 19:17+0800\n" +"PO-Revision-Date: 2015-06-28 22:46+0300\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -173,7 +150,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list" -#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "пътят „%s“ не съвпада с никой файл" @@ -196,9 +173,9 @@ msgstr "добавяне на този префикс към всеки път #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150 msgid "file" msgstr "файл" @@ -230,7 +207,7 @@ msgstr "добро компресиране" msgid "list supported archive formats" msgstr "извеждане на списъка с поддържаните формати" -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77 msgid "repo" msgstr "хранилище" @@ -246,7 +223,7 @@ msgstr "команда" msgid "path to the remote git-upload-archive command" msgstr "път към отдалечената команда „git-upload-archive“" -#: attr.c:264 +#: attr.c:265 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -386,8 +363,8 @@ msgid "Repository lacks these prerequisite commits:" msgstr "В хранилището липсват следните необходими подавания:" #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 -#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 +#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330 +#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "неуспешно настройване на обхождането на версиите" @@ -639,17 +616,17 @@ msgstr "" "Грешки в настройката „diff.dirstat“:\n" "%s" -#: diff.c:2956 +#: diff.c:2997 #, c-format msgid "external diff died, stopping at %s" msgstr "" "външната програма за разлики завърши неуспешно. Спиране на работата при „%s“" -#: diff.c:3351 +#: diff.c:3393 msgid "--follow requires exactly one pathspec" msgstr "Опцията „--follow“ изисква точно един път" -#: diff.c:3514 +#: diff.c:3556 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -658,11 +635,19 @@ msgstr "" "Неразпознат параметър към опцията „--dirstat/-X“:\n" "%s" -#: diff.c:3528 +#: diff.c:3570 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Неразпознат параметър към опцията „--submodule“: „%s“" +#: dir.c:1852 +msgid "failed to get kernel name and information" +msgstr "името и версията на ядрото не бяха получени" + +#: dir.c:1945 +msgid "Untracked cache is disabled on this system." +msgstr "Кеша за неследените файлове е изключен на тази система" + #: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "Програмата „gpg“ не може да бъде стартирана." @@ -709,11 +694,11 @@ msgstr "налични команди на git от „%s“" msgid "git commands available from elsewhere on your $PATH" msgstr "команди на git от други директории от „$PATH“" -#: help.c:230 -msgid "The most commonly used git commands are:" -msgstr "Най-често употребяваните команди на git са:" +#: help.c:246 +msgid "These are common Git commands used in various situations:" +msgstr "Това са най-често използваните команди на Git:" -#: help.c:289 +#: help.c:311 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -723,11 +708,11 @@ msgstr "" "бъде изпълнена. Вероятно пакетът „git-%s“ е повреден." # FIXME bad message -#: help.c:346 +#: help.c:368 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Странно, изглежда, че на системата ви няма нито една команда на git." -#: help.c:368 +#: help.c:390 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -738,17 +723,17 @@ msgstr "" "съществува. Изпълнението автоматично продължава, като се счита, че имате " "предвид „%s“" -#: help.c:373 +#: help.c:395 #, c-format msgid "in %0.1f seconds automatically..." msgstr "след %0.1f секунди…" -#: help.c:380 +#: help.c:402 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git: „%s“ не е команда на git. Вижте изхода от „git --help“." +msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“." -#: help.c:384 help.c:444 +#: help.c:406 help.c:466 msgid "" "\n" "Did you mean this?" @@ -762,16 +747,16 @@ msgstr[1] "" "\n" "Команди с подобно име са:" -#: help.c:440 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s: %s — %s" -#: lockfile.c:283 +#: lockfile.c:345 msgid "BUG: reopen a lockfile that is still open" msgstr "ГРЕШКА В GIT: преотваряне на файл-ключалка" -#: lockfile.c:285 +#: lockfile.c:347 msgid "BUG: reopen a lockfile that has been committed" msgstr "ГРЕШКА В GIT: преотваряне на файл-ключалка, който е подаден" @@ -779,8 +764,8 @@ msgstr "ГРЕШКА В GIT: преотваряне на файл-ключалк msgid "failed to read the cache" msgstr "кешът не може да бъде прочетен" -#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580 -#: builtin/clone.c:662 +#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594 +#: builtin/clone.c:654 msgid "unable to write new index file" msgstr "неуспешно записване на новия индекс" @@ -798,67 +783,67 @@ msgstr "неуспешно изпълнение на „addinfo_cache“ за п msgid "error building trees" msgstr "грешка при изграждане на дърветата" -#: merge-recursive.c:688 +#: merge-recursive.c:687 #, c-format msgid "failed to create path '%s'%s" msgstr "грешка при създаването на пътя „%s“%s" -#: merge-recursive.c:699 +#: merge-recursive.c:698 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n" # FIXME better message -#: merge-recursive.c:713 merge-recursive.c:734 +#: merge-recursive.c:712 merge-recursive.c:733 msgid ": perhaps a D/F conflict?" msgstr ": възможно е да има конфликт директория/файл." -#: merge-recursive.c:724 +#: merge-recursive.c:723 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" "преустановяване на действието, за да не се изтрие неследеният файл „%s“" -#: merge-recursive.c:764 +#: merge-recursive.c:763 #, c-format msgid "cannot read object %s '%s'" msgstr "обектът „%s“ (%s) не може да бъде прочетен" -#: merge-recursive.c:766 +#: merge-recursive.c:765 #, c-format msgid "blob expected for %s '%s'" msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е" -#: merge-recursive.c:789 builtin/clone.c:321 +#: merge-recursive.c:788 builtin/clone.c:313 #, c-format msgid "failed to open '%s'" msgstr "директорията „%s“ не може да бъде отворена" -#: merge-recursive.c:797 +#: merge-recursive.c:796 #, c-format msgid "failed to symlink '%s'" msgstr "неуспешно създаване на символната връзка „%s“" -#: merge-recursive.c:800 +#: merge-recursive.c:799 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" "не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“" -#: merge-recursive.c:938 +#: merge-recursive.c:937 msgid "Failed to execute internal merge" msgstr "Неуспешно вътрешно сливане" -#: merge-recursive.c:942 +#: merge-recursive.c:941 #, c-format msgid "Unable to add %s to database" msgstr "„%s“ не може да се добави в базата с данни" -#: merge-recursive.c:958 +#: merge-recursive.c:957 msgid "unsupported object type in the tree" msgstr "в дървото има неподдържан вид обект" -#: merge-recursive.c:1033 merge-recursive.c:1047 +#: merge-recursive.c:1032 merge-recursive.c:1046 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -867,7 +852,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото." -#: merge-recursive.c:1039 merge-recursive.c:1052 +#: merge-recursive.c:1038 merge-recursive.c:1051 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -876,20 +861,20 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото: %s." -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "rename" msgstr "преименуване" -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "renamed" msgstr "преименуван" -#: merge-recursive.c:1149 +#: merge-recursive.c:1148 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“" -#: merge-recursive.c:1171 +#: merge-recursive.c:1170 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -898,151 +883,151 @@ msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s." -#: merge-recursive.c:1176 +#: merge-recursive.c:1175 msgid " (left unresolved)" msgstr " (некоригиран конфликт)" -#: merge-recursive.c:1230 +#: merge-recursive.c:1229 #, 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:1260 +#: merge-recursive.c:1259 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“" -#: merge-recursive.c:1459 +#: merge-recursive.c:1458 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а " "„%s“ е добавен в „%s“" -#: merge-recursive.c:1469 +#: merge-recursive.c:1468 #, c-format msgid "Adding merged %s" msgstr "Добавяне на слетия „%s“" -#: merge-recursive.c:1474 merge-recursive.c:1672 +#: merge-recursive.c:1473 merge-recursive.c:1671 #, c-format msgid "Adding as %s instead" msgstr "Добавяне като „%s“" -#: merge-recursive.c:1525 +#: merge-recursive.c:1524 #, c-format msgid "cannot read object %s" msgstr "обектът „%s“ не може да се прочете" -#: merge-recursive.c:1528 +#: merge-recursive.c:1527 #, c-format msgid "object %s is not a blob" msgstr "обектът „%s“ не е BLOB" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modify" msgstr "промяна" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modified" msgstr "променен" -#: merge-recursive.c:1586 +#: merge-recursive.c:1585 msgid "content" msgstr "съдържание" -#: merge-recursive.c:1593 +#: merge-recursive.c:1592 msgid "add/add" msgstr "добавяне/добавяне" -#: merge-recursive.c:1627 +#: merge-recursive.c:1626 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)" -#: merge-recursive.c:1641 +#: merge-recursive.c:1640 #, c-format msgid "Auto-merging %s" msgstr "Автоматично сливане на „%s“" -#: merge-recursive.c:1645 git-submodule.sh:1150 +#: merge-recursive.c:1644 git-submodule.sh:1150 msgid "submodule" msgstr "ПОДМОДУЛ" -#: merge-recursive.c:1646 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“" -#: merge-recursive.c:1732 +#: merge-recursive.c:1731 #, c-format msgid "Removing %s" msgstr "Изтриване на „%s“" -#: merge-recursive.c:1757 +#: merge-recursive.c:1756 msgid "file/directory" msgstr "файл/директория" -#: merge-recursive.c:1763 +#: merge-recursive.c:1762 msgid "directory/file" msgstr "директория/файл" -#: merge-recursive.c:1768 +#: merge-recursive.c:1767 #, 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:1778 +#: merge-recursive.c:1777 #, c-format msgid "Adding %s" msgstr "Добавяне на „%s“" -#: merge-recursive.c:1795 +#: merge-recursive.c:1794 msgid "Fatal merge failure, shouldn't happen." msgstr "Фатална грешка при сливане, а такава не трябва да възниква!" -#: merge-recursive.c:1814 +#: merge-recursive.c:1813 msgid "Already up-to-date!" msgstr "Вече е обновено!" -#: merge-recursive.c:1823 +#: merge-recursive.c:1822 #, c-format msgid "merging of trees %s and %s failed" msgstr "неуспешно сливане на дърветата „%s“ и „%s“" # FIXME message -#: merge-recursive.c:1853 +#: merge-recursive.c:1852 #, c-format msgid "Unprocessed path??? %s" msgstr "" "Пътят „%s“ не е обработен, това е грешка в Git, докладвайте я на " "разработчиците, като пратите е-писмо на адрес: „git@vger.kernel.org“." -#: merge-recursive.c:1901 +#: merge-recursive.c:1900 msgid "Merging:" msgstr "Сливане:" -#: merge-recursive.c:1914 +#: merge-recursive.c:1913 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "открит е %u общ предшественик:" msgstr[1] "открити са %u общи предшественици:" -#: merge-recursive.c:1951 +#: merge-recursive.c:1950 msgid "merge returned no commit" msgstr "сливането не върна подаване" -#: merge-recursive.c:2008 +#: merge-recursive.c:2007 #, c-format msgid "Could not parse object '%s'" msgstr "Неуспешен анализ на обекта „%s“" -#: merge-recursive.c:2019 builtin/merge.c:667 +#: merge-recursive.c:2018 builtin/merge.c:645 msgid "Unable to write index." msgstr "Индексът не може да бъде прочетен" @@ -1069,7 +1054,7 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "Зададена е лоша стойност на променливата „%s“: „%s“" -#: object.c:241 +#: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "обектът „%s“ не може да бъде анализиран" @@ -1167,11 +1152,11 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "аргументът към опцията „--pretty“ не може да се анализира" -#: progress.c:225 +#: progress.c:236 msgid "done" msgstr "действието завърши" -#: read-cache.c:1275 +#: read-cache.c:1295 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1180,7 +1165,7 @@ msgstr "" "Зададена е неправилна стойност на настройката „index.version“.\n" "Ще се ползва версия %i" -#: read-cache.c:1285 +#: read-cache.c:1305 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1190,65 +1175,109 @@ msgstr "" "„GIT_INDEX_VERSION“.\n" "Ще се ползва версия %i" -#: remote.c:782 +#: remote.c:792 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“" -#: remote.c:786 +#: remote.c:796 #, c-format msgid "%s usually tracks %s, not %s" msgstr "„%s“ обикновено следи „%s“, а не „%s“" -#: remote.c:790 +#: remote.c:800 #, c-format msgid "%s tracks both %s and %s" msgstr "„%s“ следи както „%s“, така и „%s“" -#: remote.c:798 +#: remote.c:808 msgid "Internal error" msgstr "Вътрешна грешка" -#: remote.c:1980 +#: remote.c:1723 remote.c:1766 +msgid "HEAD does not point to a branch" +msgstr "Указателят „HEAD“ не сочи към клон" + +#: remote.c:1732 +#, c-format +msgid "no such branch: '%s'" +msgstr "няма клон на име „%s“" + +#: remote.c:1735 +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "не е зададен клон-източник за клона „%s“" + +#: remote.c:1741 +#, c-format +msgid "upstream branch '%s' not stored as a remote-tracking branch" +msgstr "клонът-източник „%s“ не е съхранен като следящ клон" + +#: remote.c:1756 +#, c-format +msgid "push destination '%s' on remote '%s' has no local tracking branch" +msgstr "" +"липсва локален следящ клон за местоположението за изтласкване „%s“ в " +"хранилището „%s“" + +#: remote.c:1771 +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "няма информация клонът „%s“ да следи някой друг" + +#: remote.c:1782 +#, c-format +msgid "push refspecs for '%s' do not include '%s'" +msgstr "указателят за изтласкване на „%s“ не включва „%s“" + +#: remote.c:1795 +msgid "push has no destination (push.default is 'nothing')" +msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)" + +#: remote.c:1817 +msgid "cannot resolve 'simple' push to a single destination" +msgstr "простото (simple) изтласкване не съответства на една цел" + +#: remote.c:2124 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n" -#: remote.c:1984 +#: remote.c:2128 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n" -#: remote.c:1987 +#: remote.c:2131 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Клонът е актуализиран към „%s“.\n" -#: remote.c:1991 +#: remote.c:2135 #, 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:1997 +#: remote.c:2141 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (публикувайте локалните си промени чрез „git push“)\n" -#: remote.c:2000 +#: remote.c:2144 #, 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] "" -"Клонът ви е с %2$d подаване след „%1$s“ и може да бъде тривиално слят.\n" +"Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде тривиално слят.\n" msgstr[1] "" -"Клонът ви е с %2$d подавания след „%1$s“ и може да бъде тривиално слят.\n" +"Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде тривиално слят.\n" -#: remote.c:2008 +#: remote.c:2152 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (обновете локалния си клон чрез „git pull“)\n" -#: remote.c:2011 +#: remote.c:2155 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1263,11 +1292,11 @@ msgstr[1] "" "Текущият клон се е отделил от „%s“,\n" "двата имат съответно по %d и %d несъвпадащи подавания.\n" -#: remote.c:2021 +#: remote.c:2165 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n" -#: revision.c:2348 +#: revision.c:2366 msgid "--first-parent is incompatible with --bisect" msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими" @@ -1284,22 +1313,22 @@ msgstr "неуспешно изпълнение на dup2(%d,%d)" msgid "failed to sign the push certificate" msgstr "сертификатът за изтласкване не може да бъде подписан" -#: send-pack.c:356 +#: send-pack.c:378 msgid "the receiving end does not support --signed push" msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“" -#: send-pack.c:366 +#: send-pack.c:389 msgid "the receiving end does not support --atomic push" msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“" -#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 -#: builtin/merge.c:1005 +#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запис" -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 -#: builtin/merge.c:1010 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 +#: builtin/merge.c:988 #, c-format msgid "Could not write to '%s'" msgstr "„%s“ не може да бъде записан" @@ -1505,7 +1534,7 @@ msgstr "" "действието не може да бъде преустановено, когато сте на клон, който тепърва " "предстои да бъде създаден" -#: sequencer.c:908 builtin/apply.c:4288 +#: sequencer.c:908 builtin/apply.c:4291 #, c-format msgid "cannot open %s: %s" msgstr "файлът „%s“ не може да бъде отворен: %s" @@ -1549,7 +1578,12 @@ msgstr "Първоначалното подаване не може да бъд msgid "Can't cherry-pick into empty head" msgstr "При празен връх не могат да се отбират подавания" -#: sha1_name.c:440 +#: setup.c:243 +#, c-format +msgid "failed to read %s" +msgstr "файлът „%s“ не може да бъде прочетен" + +#: sha1_name.c:453 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" @@ -1573,25 +1607,6 @@ msgstr "" "спрете това съобщение като изпълните командата:\n" "„git config advice.objectNameWarning false“" -#: sha1_name.c:1068 -msgid "HEAD does not point to a branch" -msgstr "Указателят „HEAD“ не сочи към клон" - -#: sha1_name.c:1071 -#, c-format -msgid "No such branch: '%s'" -msgstr "Не съществува клон на име „%s“" - -#: sha1_name.c:1073 -#, c-format -msgid "No upstream configured for branch '%s'" -msgstr "Не е зададен клон-източник за клона „%s“" - -#: sha1_name.c:1077 -#, c-format -msgid "Upstream branch '%s' not stored as a remote-tracking branch" -msgstr "Клонът-източник „%s“ не е съхранен като следящ клон" - #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -1617,12 +1632,7 @@ msgstr "Записът „%s“ във файла „.gitmodules“ не мож msgid "staging updated .gitmodules failed" msgstr "неуспешно добавяне на променения файл „.gitmodules“ в индекса" -#: submodule.c:1109 builtin/init-db.c:371 -#, c-format -msgid "Could not create git link %s" -msgstr "Връзката в Git „%s“ не може да бъде създадена" - -#: submodule.c:1120 +#: submodule.c:1115 #, c-format msgid "Could not set core.worktree in %s" msgstr "Настройката „core.worktree“ не може да се зададе в „%s“" @@ -1652,7 +1662,7 @@ msgstr "входният файл „%s“ не може да бъде проч msgid "could not read from stdin" msgstr "от стандартния вход не може да се чете" -#: unpack-trees.c:202 +#: unpack-trees.c:203 msgid "Checking out files" msgstr "Изтегляне на файлове" @@ -1708,6 +1718,22 @@ msgstr "такъв потребител не съществува" msgid "unable to get current working directory" msgstr "текущата работна директория е недостъпна" +#: wrapper.c:575 +#, 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:587 +#, c-format +msgid "could not write to %s" +msgstr "„%s“ не може да бъде записан" + +#: wrapper.c:593 +#, c-format +msgid "could not close %s" +msgstr "„%s“ не може да се затвори" + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Неслети пътища:" @@ -1738,11 +1764,11 @@ msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)" -#: wt-status.c:198 wt-status.c:878 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "Промени, които ще бъдат подадени:" -#: wt-status.c:216 wt-status.c:887 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "Промени, които не са в индекса за подаване:" @@ -1857,15 +1883,15 @@ msgstr "неследено съдържание, " msgid "bug: unhandled diff status %c" msgstr "грешка: състоянието на промяната „%c“ не може да бъде обработено" -#: wt-status.c:753 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Подмодулите са променени, но не са обновени:" -#: wt-status.c:755 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Промени в подмодулите за подаване:" -#: wt-status.c:835 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1873,193 +1899,193 @@ msgstr "" "Не променяйте горния ред.\n" "Всичко отдолу ще бъде изтрито." -#: wt-status.c:946 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Някои пътища не са слети." -#: wt-status.c:949 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (коригирайте конфликтите и изпълнете „git commit“)" -#: wt-status.c:952 +#: wt-status.c:955 msgid "All conflicts fixed but you are still merging." msgstr "Всички конфликти са решени, но продължавате сливането." -#: wt-status.c:955 +#: wt-status.c:958 msgid " (use \"git commit\" to conclude merge)" msgstr " (използвайте „git commit“, за да завършите сливането)" -#: wt-status.c:965 +#: wt-status.c:968 msgid "You are in the middle of an am session." msgstr "В момента прилагате поредица от кръпки чрез „git am“." -#: wt-status.c:968 +#: wt-status.c:971 msgid "The current patch is empty." msgstr "Текущата кръпка е празна." -#: wt-status.c:972 +#: wt-status.c:975 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)" -#: wt-status.c:974 +#: wt-status.c:977 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)" -#: wt-status.c:976 +#: wt-status.c:979 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (използвайте „git am --abort“, за да възстановите първоначалния клон)" -#: wt-status.c:1036 wt-status.c:1053 +#: wt-status.c:1039 wt-status.c:1056 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "В момента пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1041 wt-status.c:1058 +#: wt-status.c:1044 wt-status.c:1061 msgid "You are currently rebasing." msgstr "В момента пребазирате." -#: wt-status.c:1044 +#: wt-status.c:1047 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)" -#: wt-status.c:1046 +#: wt-status.c:1049 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (използвайте „git rebase --skip“, за да пропуснете тази кръпка)" -#: wt-status.c:1048 +#: wt-status.c:1051 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (използвайте „git rebase --abort“, за да възстановите първоначалния клон)" -#: wt-status.c:1061 +#: wt-status.c:1064 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (всички конфликти са коригирани: изпълнете „git rebase --continue“)" -#: wt-status.c:1065 +#: wt-status.c:1068 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1070 +#: wt-status.c:1073 msgid "You are currently splitting a commit during a rebase." msgstr "В момента разделяте подаване докато пребазирате." -#: wt-status.c:1073 +#: wt-status.c:1076 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (След като работното ви дърво стане чисто, използвайте „git rebase --" "continue“)" -#: wt-status.c:1077 +#: wt-status.c:1080 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1082 +#: wt-status.c:1085 msgid "You are currently editing a commit during a rebase." msgstr "В момента редактирате подаване докато пребазирате." -#: wt-status.c:1085 +#: wt-status.c:1088 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (използвайте „git commit --amend“, за да редактирате текущото подаване)" -#: wt-status.c:1087 +#: wt-status.c:1090 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (използвайте „git rebase --continue“, след като завършите промените си)" -#: wt-status.c:1097 +#: wt-status.c:1100 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "В момента отбирате подаването „%s“." -#: wt-status.c:1102 +#: wt-status.c:1105 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)" -#: wt-status.c:1105 +#: wt-status.c:1108 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)" -#: wt-status.c:1107 +#: wt-status.c:1110 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (използвайте „git cherry-pick --abort“, за да отмените всички действия с " "отбиране)" -#: wt-status.c:1116 +#: wt-status.c:1119 #, c-format msgid "You are currently reverting commit %s." msgstr "В момента отменяте подаване „%s“." -#: wt-status.c:1121 +#: wt-status.c:1124 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)" -#: wt-status.c:1124 +#: wt-status.c:1127 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)" -#: wt-status.c:1126 +#: wt-status.c:1129 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (използвайте „git revert --abort“, за да преустановите отмяната на " "подаване)" -#: wt-status.c:1137 +#: wt-status.c:1140 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "В момента търсите двоично, като сте стартирали от клон „%s“." -#: wt-status.c:1141 +#: wt-status.c:1144 msgid "You are currently bisecting." msgstr "В момента търсите двоично." -#: wt-status.c:1144 +#: wt-status.c:1147 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (използвайте „git bisect reset“, за да се върнете към първоначалното " "състояние и клон)" -#: wt-status.c:1321 +#: wt-status.c:1324 msgid "On branch " msgstr "На клон " -#: wt-status.c:1328 +#: wt-status.c:1331 msgid "rebase in progress; onto " msgstr "извършвате пребазиране върху " -#: wt-status.c:1333 +#: wt-status.c:1336 msgid "HEAD detached at " msgstr "Указателят „HEAD“ не е свързан и е при " -#: wt-status.c:1335 +#: wt-status.c:1338 msgid "HEAD detached from " msgstr "Указателят „HEAD“ не е свързан и е отделѐн от " -#: wt-status.c:1338 +#: wt-status.c:1341 msgid "Not currently on any branch." msgstr "Извън всички клони." -#: wt-status.c:1355 +#: wt-status.c:1358 msgid "Initial commit" msgstr "Първоначално подаване" -#: wt-status.c:1369 +#: wt-status.c:1372 msgid "Untracked files" msgstr "Неследени файлове" -#: wt-status.c:1371 +#: wt-status.c:1374 msgid "Ignored files" msgstr "Игнорирани файлове" -#: wt-status.c:1375 +#: wt-status.c:1378 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2071,32 +2097,32 @@ msgstr "" "изпълнението, но не трябва да забравяте ръчно да добавяте новите файлове.\n" "За повече подробности погледнете „git status help“." -#: wt-status.c:1381 +#: wt-status.c:1384 #, c-format msgid "Untracked files not listed%s" msgstr "Неследените файлове не са изведени%s" -#: wt-status.c:1383 +#: wt-status.c:1386 msgid " (use -u option to show untracked files)" msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)" -#: wt-status.c:1389 +#: wt-status.c:1392 msgid "No changes" msgstr "Няма промени" -#: wt-status.c:1394 +#: wt-status.c:1397 #, 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:1397 +#: wt-status.c:1400 #, c-format msgid "no changes added to commit\n" msgstr "към индекса за подаване не са добавени промени\n" -#: wt-status.c:1400 +#: wt-status.c:1403 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2105,52 +2131,52 @@ msgstr "" "към индекса за подаване не са добавени промени, но има нови файлове " "(използвайте „git add“, за да започне тяхното следене)\n" -#: wt-status.c:1403 +#: wt-status.c:1406 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n" -#: wt-status.c:1406 +#: wt-status.c:1409 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "липсват каквито и да е промени (създайте или копирайте файлове и използвайте " "„git add“, за да започне тяхното следене)\n" -#: wt-status.c:1409 wt-status.c:1414 +#: wt-status.c:1412 wt-status.c:1417 #, c-format msgid "nothing to commit\n" msgstr "липсват каквито и да е промени\n" -#: wt-status.c:1412 +#: wt-status.c:1415 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и " "неследените файлове)\n" -#: wt-status.c:1416 +#: wt-status.c:1419 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "липсват каквито и да е промени, работното дърво е чисто\n" -#: wt-status.c:1525 +#: wt-status.c:1528 msgid "HEAD (no branch)" msgstr "HEAD (извън клон)" -#: wt-status.c:1531 +#: wt-status.c:1534 msgid "Initial commit on " msgstr "Първоначално подаване на клон" -#: wt-status.c:1563 +#: wt-status.c:1561 msgid "gone" msgstr "изтрит" -#: wt-status.c:1565 wt-status.c:1573 +#: wt-status.c:1563 wt-status.c:1571 msgid "behind " msgstr "назад с " -#: compat/precompose_utf8.c:55 builtin/clone.c:360 +#: compat/precompose_utf8.c:55 builtin/clone.c:352 #, c-format msgid "failed to unlink '%s'" msgstr "неуспешно изтриване на „%s“" @@ -2177,7 +2203,7 @@ msgstr "изтриване на „%s“\n" msgid "Unstaged changes after refreshing the index:" msgstr "Промени, които и след обновяването на индекса не са добавени към него:" -#: builtin/add.c:194 builtin/rev-parse.c:785 +#: builtin/add.c:194 builtin/rev-parse.c:796 msgid "Could not read the index" msgstr "Индексът не може да бъде прочетен" @@ -2190,119 +2216,123 @@ msgstr "Файлът „%s“ не може да бъде отворен за з msgid "Could not write patch" msgstr "Кръпката не може да бъде записана" -#: builtin/add.c:214 +#: builtin/add.c:212 +msgid "editing patch failed" +msgstr "неуспешно редактиране на кръпка" + +#: builtin/add.c:215 #, c-format msgid "Could not stat '%s'" msgstr "Не може да се получи информация чрез „stat“ за файла „%s“" -#: builtin/add.c:216 +#: builtin/add.c:217 msgid "Empty patch. Aborted." msgstr "Празна кръпка, преустановяване на действието." -#: builtin/add.c:221 +#: builtin/add.c:222 #, c-format msgid "Could not apply '%s'" msgstr "Кръпката „%s“ не може да бъде приложена" -#: builtin/add.c:231 +#: builtin/add.c:232 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n" -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 -#: builtin/rm.c:269 +#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369 +#: builtin/rm.c:268 msgid "dry run" msgstr "пробно изпълнeние" -#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "повече подробности" -#: builtin/add.c:251 +#: builtin/add.c:252 msgid "interactive picking" msgstr "интерактивно отбиране на промени" -#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286 msgid "select hunks interactively" msgstr "интерактивен избор на парчета код" -#: builtin/add.c:253 +#: builtin/add.c:254 msgid "edit current diff and apply" msgstr "редактиране на текущата разлика и прилагане" -#: builtin/add.c:254 +#: builtin/add.c:255 msgid "allow adding otherwise ignored files" msgstr "добавяне и на иначе игнорираните файлове" -#: builtin/add.c:255 +#: builtin/add.c:256 msgid "update tracked files" msgstr "обновяване на следените файлове" -#: builtin/add.c:256 +#: builtin/add.c:257 msgid "record only the fact that the path will be added later" msgstr "отбелязване само на факта, че пътят ще бъде добавен по-късно" -#: builtin/add.c:257 +#: builtin/add.c:258 msgid "add changes from all tracked and untracked files" msgstr "добавяне на всички промени в следените и неследените файлове" -#: builtin/add.c:260 +#: builtin/add.c:261 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "игнориране на пътищата, които са изтрити от работното дърво (същото като „--" "no-all“)" -#: builtin/add.c:262 +#: builtin/add.c:263 msgid "don't add, only refresh the index" msgstr "без добавяне на нови файлове, само обновяване на индекса" -#: builtin/add.c:263 +#: builtin/add.c:264 msgid "just skip files which cannot be added because of errors" msgstr "" "прескачане на файловете, които не могат да бъдат добавени поради грешки" -#: builtin/add.c:264 +#: builtin/add.c:265 msgid "check if - even missing - files are ignored in dry run" msgstr "" "проверка, че при пробно изпълнение всички файлове, дори и изтритите, се " "игнорират" -#: builtin/add.c:286 +#: builtin/add.c:287 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Използвайте опцията „-f“, за да ги добавите наистина.\n" -#: builtin/add.c:293 +#: builtin/add.c:294 msgid "adding files failed" msgstr "неуспешно добавяне на файлове" -#: builtin/add.c:329 +#: builtin/add.c:330 msgid "-A and -u are mutually incompatible" msgstr "опциите „-A“ и „-u“ са несъвместими" -#: builtin/add.c:336 +#: builtin/add.c:337 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Опцията „--ignore-missing“ е съвместима само с „--dry-run“" -#: builtin/add.c:357 +#: builtin/add.c:358 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Нищо не е зададено и нищо не е добавено.\n" -#: builtin/add.c:358 +#: builtin/add.c:359 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Вероятно искахте да използвате „git add .“?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 msgid "index file corrupt" msgstr "файлът с индекса е повреден" -#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Новият индекс не може да бъде записан" @@ -2388,66 +2418,66 @@ msgstr[1] "" "След съкращаването на първите %d части от компонентите на пътя, в заглавната " "част на „git diff“ липсва информация за име на файл (ред: %d)" -#: builtin/apply.c:1656 +#: builtin/apply.c:1659 msgid "new file depends on old contents" msgstr "новият файл зависи от старото съдържание на файла" -#: builtin/apply.c:1658 +#: builtin/apply.c:1661 msgid "deleted file still has contents" msgstr "изтритият файл не е празен" -#: builtin/apply.c:1684 +#: builtin/apply.c:1687 #, c-format msgid "corrupt patch at line %d" msgstr "грешка в кръпката на ред %d" -#: builtin/apply.c:1720 +#: builtin/apply.c:1723 #, c-format msgid "new file %s depends on old contents" msgstr "новият файл „%s“ зависи от старото съдържание на файла" -#: builtin/apply.c:1722 +#: builtin/apply.c:1725 #, c-format msgid "deleted file %s still has contents" msgstr "изтритият файл „%s“ не е празен" # FIXME - double **?? -#: builtin/apply.c:1725 +#: builtin/apply.c:1728 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "●● предупреждение: файлът „%s“ вече е празен, но не е изтрит" -#: builtin/apply.c:1871 +#: builtin/apply.c:1874 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "грешка в двоичната кръпка на ред %d: %.*s" -#: builtin/apply.c:1900 +#: builtin/apply.c:1903 #, c-format msgid "unrecognized binary patch at line %d" msgstr "неразпозната двоичната кръпка на ред %d" -#: builtin/apply.c:2051 +#: builtin/apply.c:2054 #, c-format msgid "patch with only garbage at line %d" msgstr "кръпката е с изцяло повредени данни на ред %d" -#: builtin/apply.c:2141 +#: builtin/apply.c:2144 #, c-format msgid "unable to read symlink %s" msgstr "символната връзка „%s“ не може да бъде прочетена" -#: builtin/apply.c:2145 +#: builtin/apply.c:2148 #, c-format msgid "unable to open or read %s" msgstr "файлът „%s“ не може да бъде отворен или прочетен" -#: builtin/apply.c:2778 +#: builtin/apply.c:2781 #, c-format msgid "invalid start of line: '%c'" msgstr "неправилно начало на ред: „%c“" -#: builtin/apply.c:2897 +#: builtin/apply.c:2900 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -2456,13 +2486,13 @@ msgstr[0] "" msgstr[1] "" "%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)." -#: builtin/apply.c:2909 +#: builtin/apply.c:2912 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" "Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d" -#: builtin/apply.c:2915 +#: builtin/apply.c:2918 #, c-format msgid "" "while searching for:\n" @@ -2471,345 +2501,345 @@ msgstr "" "при търсене за:\n" "%.*s" -#: builtin/apply.c:2935 +#: builtin/apply.c:2938 #, c-format msgid "missing binary patch data for '%s'" msgstr "липсват данните за двоичната кръпка за „%s“" -#: builtin/apply.c:3036 +#: builtin/apply.c:3039 #, c-format msgid "binary patch does not apply to '%s'" msgstr "двоичната кръпка не може да бъде приложена върху „%s“" -#: builtin/apply.c:3042 +#: builtin/apply.c:3045 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "двоичната кръпка за „%s“ води до неправилни резултати (очакваше се SHA1: " "„%s“, а бе получено: „%s“)" -#: builtin/apply.c:3063 +#: builtin/apply.c:3066 #, c-format msgid "patch failed: %s:%ld" msgstr "неуспешно прилагане на кръпка: „%s:%ld“" -#: builtin/apply.c:3187 +#: builtin/apply.c:3190 #, c-format msgid "cannot checkout %s" msgstr "„%s“ не може да се изтегли" -#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 +#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291 #, c-format msgid "read of %s failed" msgstr "неуспешно прочитане на „%s“" -#: builtin/apply.c:3240 +#: builtin/apply.c:3243 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "изчитане на „%s“ след проследяване на символна връзка" -#: builtin/apply.c:3268 builtin/apply.c:3490 +#: builtin/apply.c:3271 builtin/apply.c:3493 #, c-format msgid "path %s has been renamed/deleted" msgstr "обектът с път „%s“ е преименуван или изтрит" -#: builtin/apply.c:3349 builtin/apply.c:3504 +#: builtin/apply.c:3352 builtin/apply.c:3507 #, c-format msgid "%s: does not exist in index" msgstr "„%s“ не съществува в индекса" -#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 +#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521 #, c-format msgid "%s: %s" msgstr "„%s“: %s" -#: builtin/apply.c:3358 builtin/apply.c:3512 +#: builtin/apply.c:3361 builtin/apply.c:3515 #, c-format msgid "%s: does not match index" msgstr "„%s“ не съответства на индекса" -#: builtin/apply.c:3460 +#: builtin/apply.c:3463 msgid "removal patch leaves file contents" msgstr "изтриващата кръпка оставя файла непразен" -#: builtin/apply.c:3529 +#: builtin/apply.c:3532 #, c-format msgid "%s: wrong type" msgstr "„%s“: неправилен вид" -#: builtin/apply.c:3531 +#: builtin/apply.c:3534 #, c-format msgid "%s has type %o, expected %o" msgstr "„%s“ е от вид „%o“, а се очакваше „%o“" -#: builtin/apply.c:3690 builtin/apply.c:3692 +#: builtin/apply.c:3693 builtin/apply.c:3695 #, c-format msgid "invalid path '%s'" msgstr "неправилен път: „%s“" -#: builtin/apply.c:3747 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in index" msgstr "„%s“: вече съществува в индекса" -#: builtin/apply.c:3750 +#: builtin/apply.c:3753 #, c-format msgid "%s: already exists in working directory" -msgstr "„%s“: вече съществува в работната директория" +msgstr "„%s“: вече съществува в работното дърво" -#: builtin/apply.c:3770 +#: builtin/apply.c:3773 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)" -#: builtin/apply.c:3775 +#: builtin/apply.c:3778 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“" -#: builtin/apply.c:3795 +#: builtin/apply.c:3798 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "засегнатият файл „%s“ е след символна връзка" -#: builtin/apply.c:3799 +#: builtin/apply.c:3802 #, c-format msgid "%s: patch does not apply" msgstr "Кръпката „%s“ не може да бъде приложена" -#: builtin/apply.c:3813 +#: builtin/apply.c:3816 #, c-format msgid "Checking patch %s..." msgstr "Проверяване на кръпката „%s“…" -#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“" -#: builtin/apply.c:4049 +#: builtin/apply.c:4052 #, c-format msgid "unable to remove %s from index" msgstr "„%s“ не може да се извади от индекса" -#: builtin/apply.c:4078 +#: builtin/apply.c:4081 #, c-format msgid "corrupt patch for submodule %s" msgstr "повредена кръпка за модула „%s“" -#: builtin/apply.c:4082 +#: builtin/apply.c:4085 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" "не може да се получи информация чрез „stat“ за новосъздадения файл „%s“" -#: builtin/apply.c:4087 +#: builtin/apply.c:4090 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "не може да се за създаде мястото за съхранение на новосъздадения файл „%s“" -#: builtin/apply.c:4090 builtin/apply.c:4198 +#: builtin/apply.c:4093 builtin/apply.c:4201 #, c-format msgid "unable to add cache entry for %s" msgstr "не може да се добави запис в кеша за „%s“" -#: builtin/apply.c:4123 +#: builtin/apply.c:4126 #, c-format msgid "closing file '%s'" msgstr "затваряне на файла „%s“" -#: builtin/apply.c:4172 +#: builtin/apply.c:4175 #, c-format msgid "unable to write file '%s' mode %o" msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“" -#: builtin/apply.c:4259 +#: builtin/apply.c:4262 #, c-format msgid "Applied patch %s cleanly." msgstr "Кръпката „%s“ бе приложена чисто." -#: builtin/apply.c:4267 +#: builtin/apply.c:4270 msgid "internal error" msgstr "вътрешна грешка" -#: builtin/apply.c:4270 +#: builtin/apply.c:4273 #, 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:4280 +#: builtin/apply.c:4283 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“" -#: builtin/apply.c:4301 +#: builtin/apply.c:4304 #, c-format msgid "Hunk #%d applied cleanly." msgstr "%d-то парче бе успешно приложено." -#: builtin/apply.c:4304 +#: builtin/apply.c:4307 #, c-format msgid "Rejected hunk #%d." msgstr "%d-то парче бе отхвърлено." -#: builtin/apply.c:4394 +#: builtin/apply.c:4397 msgid "unrecognized input" msgstr "непознат вход" -#: builtin/apply.c:4405 +#: builtin/apply.c:4408 msgid "unable to read index file" msgstr "индексът не може да бъде записан" -#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85 #: builtin/fetch.c:92 msgid "path" msgstr "път" -#: builtin/apply.c:4523 +#: builtin/apply.c:4526 msgid "don't apply changes matching the given path" msgstr "без прилагане на промените напасващи на дадения път" -#: builtin/apply.c:4526 +#: builtin/apply.c:4529 msgid "apply changes matching the given path" msgstr "прилагане на промените напасващи на дадения път" -#: builtin/apply.c:4528 +#: builtin/apply.c:4531 msgid "num" msgstr "БРОЙ" -#: builtin/apply.c:4529 +#: builtin/apply.c:4532 msgid "remove <num> leading slashes from traditional diff paths" msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата" -#: builtin/apply.c:4532 +#: builtin/apply.c:4535 msgid "ignore additions made by the patch" msgstr "игнориране на редовете добавени от тази кръпка" -#: builtin/apply.c:4534 +#: builtin/apply.c:4537 msgid "instead of applying the patch, output diffstat for the input" msgstr "извеждане на статистика на промените без прилагане на кръпката" -#: builtin/apply.c:4538 +#: builtin/apply.c:4541 msgid "show number of added and deleted lines in decimal notation" msgstr "извеждане на броя на добавените и изтритите редове" -#: builtin/apply.c:4540 +#: builtin/apply.c:4543 msgid "instead of applying the patch, output a summary for the input" msgstr "извеждане на статистика на входните данни без прилагане на кръпката" -#: builtin/apply.c:4542 +#: builtin/apply.c:4545 msgid "instead of applying the patch, see if the patch is applicable" msgstr "проверка дали кръпката може да се приложи, без действително прилагане" -#: builtin/apply.c:4544 +#: builtin/apply.c:4547 msgid "make sure the patch is applicable to the current index" msgstr "проверка дали кръпката може да бъде приложена към текущия индекс" -#: builtin/apply.c:4546 +#: builtin/apply.c:4549 msgid "apply a patch without touching the working tree" msgstr "прилагане на кръпката без промяна на работното дърво" -#: builtin/apply.c:4548 +#: builtin/apply.c:4551 msgid "accept a patch that touches outside the working area" msgstr "прилагане на кръпка, която променя и файлове извън работното дърво" -#: builtin/apply.c:4550 +#: builtin/apply.c:4553 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--" "summary“" -#: builtin/apply.c:4552 +#: builtin/apply.c:4555 msgid "attempt three-way merge if a patch does not apply" msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно" -#: builtin/apply.c:4554 +#: builtin/apply.c:4557 msgid "build a temporary index based on embedded index information" msgstr "" "създаване на временен индекс на база на включената информация за индекса" -#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 +#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "разделяне на пътищата с нулевия знак „NUL“" -#: builtin/apply.c:4559 +#: builtin/apply.c:4562 msgid "ensure at least <n> lines of context match" msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове" -#: builtin/apply.c:4560 +#: builtin/apply.c:4563 msgid "action" msgstr "действие" -#: builtin/apply.c:4561 +#: builtin/apply.c:4564 msgid "detect new or modified lines that have whitespace errors" msgstr "засичане на нови или променени редове с грешки в знаците за интервали" -#: builtin/apply.c:4564 builtin/apply.c:4567 +#: builtin/apply.c:4567 builtin/apply.c:4570 msgid "ignore changes in whitespace when finding context" msgstr "" "игнориране на промените в знаците за интервали при откриване на контекста" -#: builtin/apply.c:4570 +#: builtin/apply.c:4573 msgid "apply the patch in reverse" msgstr "прилагане на кръпката в обратна посока" -#: builtin/apply.c:4572 +#: builtin/apply.c:4575 msgid "don't expect at least one line of context" msgstr "без изискване на дори и един ред контекст" -#: builtin/apply.c:4574 +#: builtin/apply.c:4577 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“" -#: builtin/apply.c:4576 +#: builtin/apply.c:4579 msgid "allow overlapping hunks" msgstr "позволяване на застъпващи се парчета" -#: builtin/apply.c:4579 +#: builtin/apply.c:4582 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл" -#: builtin/apply.c:4582 +#: builtin/apply.c:4585 msgid "do not trust the line counts in the hunk headers" msgstr "без доверяване на номерата на редовете в заглавните части на парчетата" -#: builtin/apply.c:4584 +#: builtin/apply.c:4587 msgid "root" msgstr "НАЧАЛНА_ДИРЕКТОРИЯ" -#: builtin/apply.c:4585 +#: builtin/apply.c:4588 msgid "prepend <root> to all filenames" msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове" -#: builtin/apply.c:4607 +#: builtin/apply.c:4610 msgid "--3way outside a repository" msgstr "като „--3way“, но извън хранилище" -#: builtin/apply.c:4615 +#: builtin/apply.c:4618 msgid "--index outside a repository" msgstr "като „--index“, но извън хранилище" -#: builtin/apply.c:4618 +#: builtin/apply.c:4621 msgid "--cached outside a repository" msgstr "като „--cached“, но извън хранилище" -#: builtin/apply.c:4637 +#: builtin/apply.c:4640 #, c-format msgid "can't open patch '%s'" msgstr "кръпката „%s“ не може да бъде отворена" -#: builtin/apply.c:4651 +#: builtin/apply.c:4654 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "пренебрегната е %d грешка в знаците за интервали" msgstr[1] "пренебрегнати са %d грешки в знаците за интервали" -#: builtin/apply.c:4657 builtin/apply.c:4667 +#: builtin/apply.c:4660 builtin/apply.c:4670 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2864,11 +2894,11 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" "обновяване на указателя „BISECT_HEAD“ вместо да се използва текущото подаване" -#: builtin/blame.c:30 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +#: builtin/blame.c:31 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗА_ВЕРСИЯТА…] [ВЕРСИЯ] [--] ФАЙЛ" -#: builtin/blame.c:35 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "ОПЦИИте_ЗА_ВЕРСИЯТА са документирани в ръководството git-rev-list(1)" @@ -3009,7 +3039,7 @@ msgstr "git branch [ОПЦИЯ…] [-r] (-d | -D) ИМЕ_НА_КЛОН…" msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [ОПЦИЯ…] (-m | -M) [СТАР_КЛОН] НОВ_КЛОН" -#: builtin/branch.c:152 +#: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3018,7 +3048,7 @@ msgstr "" "изтриване на клона „%s“, който е слят към „%s“,\n" " но още не е слят към върха „HEAD“." -#: builtin/branch.c:156 +#: builtin/branch.c:154 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3027,12 +3057,12 @@ msgstr "" "отказване на изтриване на клона „%s“, който не е слят към\n" " „%s“, но е слят към върха „HEAD“." -#: builtin/branch.c:170 +#: builtin/branch.c:168 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Обектът-подаване за „%s“ не може да бъде открит" -#: builtin/branch.c:174 +#: builtin/branch.c:172 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3041,310 +3071,310 @@ msgstr "" "Клонът „%s“ не е слят напълно. Ако сте сигурни, че искате\n" "да го изтриете, изпълнете „git branch -D %s“." -#: builtin/branch.c:187 +#: builtin/branch.c:185 msgid "Update of config-file failed" msgstr "Неуспешно обновяване на конфигурационния файл" -#: builtin/branch.c:215 +#: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "Опцията „-a“ е несъвместима с опцията „-d“" -#: builtin/branch.c:221 +#: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "Обектът-подаване, сочен от указателя „HEAD“, не може да бъде открит" -#: builtin/branch.c:229 +#: builtin/branch.c:227 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "Не можете да изтриете клона „%s“, защото в момента е текущ." -#: builtin/branch.c:245 +#: builtin/branch.c:243 #, c-format -msgid "remote branch '%s' not found." -msgstr "отдалеченият клон „%s“ не може да бъде открит." +msgid "remote-tracking branch '%s' not found." +msgstr "следящият клон „%s“ не може да бъде открит." -#: builtin/branch.c:246 +#: builtin/branch.c:244 #, c-format msgid "branch '%s' not found." msgstr "клонът „%s“ не може да бъде открит." -#: builtin/branch.c:260 +#: builtin/branch.c:258 #, c-format -msgid "Error deleting remote branch '%s'" -msgstr "Грешка при изтриването на отдалечения клон „%s“" +msgid "Error deleting remote-tracking branch '%s'" +msgstr "Грешка при изтриването на следящия клон „%s“" -#: builtin/branch.c:261 +#: builtin/branch.c:259 #, c-format msgid "Error deleting branch '%s'" msgstr "Грешка при изтриването на клона „%s“" -#: builtin/branch.c:268 +#: builtin/branch.c:266 #, c-format -msgid "Deleted remote branch %s (was %s).\n" -msgstr "Изтрит отдалечен клон „%s“ (той сочеше към „%s“).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" +msgstr "Изтрит следящ клон „%s“ (той сочеше към „%s“).\n" -#: builtin/branch.c:269 +#: builtin/branch.c:267 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n" -#: builtin/branch.c:370 +#: builtin/branch.c:368 #, c-format msgid "branch '%s' does not point at a commit" msgstr "клонът „%s“ не сочи към подаване" -#: builtin/branch.c:459 +#: builtin/branch.c:451 #, c-format msgid "[%s: gone]" msgstr "[%s: изтрит]" -#: builtin/branch.c:464 +#: builtin/branch.c:456 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:469 +#: builtin/branch.c:461 #, c-format msgid "[%s: behind %d]" msgstr "[%s: назад с %d]" -#: builtin/branch.c:471 +#: builtin/branch.c:463 #, c-format msgid "[behind %d]" msgstr "[назад с %d]" -#: builtin/branch.c:475 +#: builtin/branch.c:467 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: напред с %d]" -#: builtin/branch.c:477 +#: builtin/branch.c:469 #, c-format msgid "[ahead %d]" msgstr "[напред с %d]" -#: builtin/branch.c:480 +#: builtin/branch.c:472 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: напред с %d, назад с %d]" -#: builtin/branch.c:483 +#: builtin/branch.c:475 #, c-format msgid "[ahead %d, behind %d]" msgstr "[напред с %d, назад с %d]" # FIXME ** how many?? -#: builtin/branch.c:496 +#: builtin/branch.c:488 msgid " **** invalid ref ****" msgstr " ●●●● неправилен указател ●●●●" -#: builtin/branch.c:587 +#: builtin/branch.c:579 #, c-format msgid "(no branch, rebasing %s)" msgstr "(извън клон, пребазиране на „%s“)" -#: builtin/branch.c:590 +#: builtin/branch.c:582 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(извън клон, двоично търсене от „%s“)" -#: builtin/branch.c:596 +#: builtin/branch.c:588 #, c-format msgid "(HEAD detached at %s)" msgstr "(Указателят „HEAD“ не е свързан и е при „%s“)" -#: builtin/branch.c:599 +#: builtin/branch.c:591 #, c-format msgid "(HEAD detached from %s)" msgstr "Указателят „HEAD“ не е свързан и е отделѐн от „%s“" -#: builtin/branch.c:603 +#: builtin/branch.c:595 msgid "(no branch)" msgstr "(извън клон)" -#: builtin/branch.c:650 +#: builtin/branch.c:642 #, c-format msgid "object '%s' does not point to a commit" msgstr "обектът „%s“ не сочи към подаване" -#: builtin/branch.c:698 +#: builtin/branch.c:690 msgid "some refs could not be read" msgstr "някои указатели не могат да бъдат прочетени" -#: builtin/branch.c:711 +#: builtin/branch.c:703 msgid "cannot rename the current branch while not on any." msgstr "" "не можете да преименувате текущия клон, защото сте извън който и да е клон" -#: builtin/branch.c:721 +#: builtin/branch.c:713 #, c-format msgid "Invalid branch name: '%s'" msgstr "Неправилно име на клон: „%s“" -#: builtin/branch.c:736 +#: builtin/branch.c:728 msgid "Branch rename failed" msgstr "Неуспешно преименуване на клон" -#: builtin/branch.c:740 +#: builtin/branch.c:732 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "На клона с неправилно име „%s“ е дадено служебно име" -#: builtin/branch.c:744 +#: builtin/branch.c:736 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен" -#: builtin/branch.c:751 +#: builtin/branch.c:743 msgid "Branch is renamed, but update of config-file failed" msgstr "Клонът е преименуван, но конфигурационният файл не е обновен" -#: builtin/branch.c:766 +#: builtin/branch.c:758 #, c-format msgid "malformed object name %s" msgstr "неправилно име на обект „%s“" -#: builtin/branch.c:790 +#: builtin/branch.c:780 #, c-format msgid "could not write branch description template: %s" msgstr "шаблонът за описание на клон не бе записан: „%s“" -#: builtin/branch.c:820 +#: builtin/branch.c:810 msgid "Generic options" msgstr "Общи настройки" -#: builtin/branch.c:822 +#: builtin/branch.c:812 msgid "show hash and subject, give twice for upstream branch" msgstr "" "извеждане на хеша и темата. Повтарянето на опцията прибавя отдалечените клони" -#: builtin/branch.c:823 +#: builtin/branch.c:813 msgid "suppress informational messages" msgstr "без информационни съобщения" -#: builtin/branch.c:824 +#: builtin/branch.c:814 msgid "set up tracking mode (see git-pull(1))" msgstr "задаване на режима на следене (виж git-pull(1))" -#: builtin/branch.c:826 +#: builtin/branch.c:816 msgid "change upstream info" msgstr "смяна на следения клон" -#: builtin/branch.c:830 +#: builtin/branch.c:820 msgid "use colored output" msgstr "цветен изход" -#: builtin/branch.c:831 +#: builtin/branch.c:821 msgid "act on remote-tracking branches" msgstr "действие върху следящите клони" -#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 -#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 -#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 +#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851 +#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "подаване" -#: builtin/branch.c:835 builtin/branch.c:841 +#: builtin/branch.c:825 builtin/branch.c:831 msgid "print only branches that contain the commit" msgstr "извеждане само на клоните, които съдържат това подаване" -#: builtin/branch.c:847 +#: builtin/branch.c:837 msgid "Specific git-branch actions:" msgstr "Специални действия на „git-branch“:" -#: builtin/branch.c:848 +#: builtin/branch.c:838 msgid "list both remote-tracking and local branches" msgstr "извеждане както на следящите, така и на локалните клони" -#: builtin/branch.c:850 +#: builtin/branch.c:840 msgid "delete fully merged branch" msgstr "изтриване на клони, които са напълно слети" -#: builtin/branch.c:851 +#: builtin/branch.c:841 msgid "delete branch (even if not merged)" msgstr "изтриване и на клони, които не са напълно слети" -#: builtin/branch.c:852 +#: builtin/branch.c:842 msgid "move/rename a branch and its reflog" msgstr "" "преместване/преименуване на клон и принадлежащият му журнал на указателите" -#: builtin/branch.c:853 +#: builtin/branch.c:843 msgid "move/rename a branch, even if target exists" msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име" -#: builtin/branch.c:854 +#: builtin/branch.c:844 msgid "list branch names" msgstr "извеждане на имената на клоните" -#: builtin/branch.c:855 +#: builtin/branch.c:845 msgid "create the branch's reflog" msgstr "създаване на журнала на указателите на клона" -#: builtin/branch.c:857 +#: builtin/branch.c:847 msgid "edit the description for the branch" msgstr "редактиране на описанието на клона" -#: builtin/branch.c:858 +#: builtin/branch.c:848 msgid "force creation, move/rename, deletion" msgstr "принудително създаване, преместване, преименуване, изтриване" -#: builtin/branch.c:861 +#: builtin/branch.c:851 msgid "print only not merged branches" msgstr "извеждане само на неслетите клони" -#: builtin/branch.c:867 +#: builtin/branch.c:857 msgid "print only merged branches" msgstr "извеждане само на слетите клони" -#: builtin/branch.c:871 +#: builtin/branch.c:861 msgid "list branches in columns" msgstr "извеждане по колони" -#: builtin/branch.c:884 +#: builtin/branch.c:874 msgid "Failed to resolve HEAD as a valid ref." msgstr "Не може да се открие към какво сочи указателят „HEAD“" -#: builtin/branch.c:888 builtin/clone.c:637 +#: builtin/branch.c:878 builtin/clone.c:629 msgid "HEAD not found below refs/heads!" msgstr "В директорията „refs/heads“ липсва файл „HEAD“" -#: builtin/branch.c:910 +#: builtin/branch.c:900 msgid "--column and --verbose are incompatible" msgstr "Опциите „--column“ и „--verbose“ са несъвместими" -#: builtin/branch.c:921 builtin/branch.c:960 +#: builtin/branch.c:911 builtin/branch.c:950 msgid "branch name required" msgstr "Необходимо е име на клон" -#: builtin/branch.c:936 +#: builtin/branch.c:926 msgid "Cannot give description to detached HEAD" msgstr "Не може да зададете описание на „HEAD“ извън клон" -#: builtin/branch.c:941 +#: builtin/branch.c:931 msgid "cannot edit description of more than one branch" msgstr "Не може да редактирате описанието на повече от един клон едновременно" -#: builtin/branch.c:948 +#: builtin/branch.c:938 #, c-format msgid "No commit on branch '%s' yet." msgstr "В клона „%s“ все още няма подавания." -#: builtin/branch.c:951 +#: builtin/branch.c:941 #, c-format msgid "No branch named '%s'." msgstr "Липсва клон на име „%s“." -#: builtin/branch.c:966 +#: builtin/branch.c:956 msgid "too many branches for a rename operation" msgstr "Прекалено много клони за преименуване" -#: builtin/branch.c:971 +#: builtin/branch.c:961 msgid "too many branches to set new upstream" msgstr "Прекалено много клони за задаване на следене" -#: builtin/branch.c:975 +#: builtin/branch.c:965 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3352,39 +3382,39 @@ msgstr "" "Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към " "никой клон." -#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 +#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011 #, c-format msgid "no such branch '%s'" msgstr "Няма клон на име „%s“." -#: builtin/branch.c:982 +#: builtin/branch.c:972 #, c-format msgid "branch '%s' does not exist" msgstr "Не съществува клон на име „%s“." -#: builtin/branch.c:994 +#: builtin/branch.c:984 msgid "too many branches to unset upstream" msgstr "Прекалено много клони за махане на следене" -#: builtin/branch.c:998 +#: builtin/branch.c:988 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон." -#: builtin/branch.c:1004 +#: builtin/branch.c:994 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Няма информация клонът „%s“ да следи някой друг" -#: builtin/branch.c:1018 +#: builtin/branch.c:1008 msgid "it does not make sense to create 'HEAD' manually" msgstr "Няма никакъв смисъл ръчно да създавате „HEAD“." -#: builtin/branch.c:1024 +#: builtin/branch.c:1014 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "Опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон" -#: builtin/branch.c:1027 +#: builtin/branch.c:1017 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3393,7 +3423,7 @@ msgstr "" "Опцията „--set-upstream“ вече е остаряла и предстои да бъде махната. " "Използвайте „--track“ или „--set-upstream-to“\n" -#: builtin/branch.c:1044 +#: builtin/branch.c:1034 #, c-format msgid "" "\n" @@ -3404,74 +3434,91 @@ msgstr "" "За да накарате „%s“ да следи „%s“, изпълнете следната команда:\n" "\n" -#: builtin/branch.c:1045 +#: builtin/branch.c:1035 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1046 +#: builtin/branch.c:1036 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" -#: builtin/bundle.c:47 +#: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" msgstr "Пратката „%s“ е наред\n" -#: builtin/bundle.c:56 +#: builtin/bundle.c:64 msgid "Need a repository to create a bundle." msgstr "За създаването на пратка е необходимо хранилище." -#: builtin/bundle.c:60 +#: builtin/bundle.c:68 msgid "Need a repository to unbundle." msgstr "За приемането на пратка е необходимо хранилище." -#: builtin/cat-file.c:326 -msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" -msgstr "git cat-file (-t | -s | -e | -p | ВИД | --textconv) ОБЕКТ" +#: builtin/cat-file.c:369 +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 | ВИД | --textconv) ОБЕКТ" -#: builtin/cat-file.c:327 -msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" -msgstr "git cat-file (--batch | --batch-check) < СПИСЪК_С_ОБЕКТИ" +#: builtin/cat-file.c:370 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-" +"objects>" +msgstr "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] < СПИСЪК_С_ОБЕКТИ" -#: builtin/cat-file.c:364 +#: builtin/cat-file.c:407 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" "ВИДът може да е: „blob“ (обект BLOB), „tree“ (дърво), „commit“ (подаване), " "„tag“ (етикет)" -#: builtin/cat-file.c:365 +#: builtin/cat-file.c:408 msgid "show object type" msgstr "извеждане на вида на обект" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:409 msgid "show object size" msgstr "извеждане на размера на обект" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:411 msgid "exit with zero when there's no error" msgstr "изход с 0, когато няма грешка" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:412 msgid "pretty-print object's content" msgstr "форматирано извеждане на съдържанието на обекта" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:414 msgid "for blob objects, run textconv on object's content" msgstr "" "да се стартира програмата зададена в настройката „textconv“ за преобразуване " "на съдържанието на обекта" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:416 +msgid "allow -s and -t to work with broken/corrupt objects" +msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти" + +#: builtin/cat-file.c:418 msgid "show info and content of objects fed from the standard input" msgstr "" "извеждане на информация и съдържание на обектите подадени на стандартния вход" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:421 msgid "show info about objects fed from the standard input" msgstr "извеждане на информация за обектите подадени на стандартния вход" +#: builtin/cat-file.c:424 +msgid "follow in-tree symlinks (used with --batch or --batch-check)" +msgstr "" +"следване на символните връзки сочещи в дървото (ползва се с „--batch“ или „--" +"batch-check“)" + #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | АТРИБУТ…] [--] ПЪТ…" @@ -3488,7 +3535,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:98 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96 msgid "read file names from stdin" msgstr "изчитане на имената на файловете от стандартния вход" @@ -3496,7 +3543,7 @@ msgstr "изчитане на имената на файловете от ста msgid "terminate input and output records by a NUL character" msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“" -#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274 +#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279 msgid "suppress progress reporting" msgstr "без показване на напредъка" @@ -3596,117 +3643,117 @@ msgstr "при създаването на нови файлове да се д msgid "copy out the files from named stage" msgstr "копиране на файловете от това състояние на сливане" -#: builtin/checkout.c:25 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "git checkout [ОПЦИЯ…] КЛОН" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [ОПЦИЯ…] [КЛОН] -- ФАЙЛ…" -#: builtin/checkout.c:132 builtin/checkout.c:165 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "вашата версия липсва в пътя „%s“" -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "чуждата версия липсва в пътя „%s“" # FIXME SAME AS [1] -#: builtin/checkout.c:150 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "някоя от необходимите версии липсва в пътя „%s“" # FIXME SAME AS [1] -#: builtin/checkout.c:194 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "някоя от необходимите версии липсва в пътя „%s“" -#: builtin/checkout.c:211 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "пътят „%s“ не може да бъде слян" -#: builtin/checkout.c:228 +#: builtin/checkout.c:234 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Резултатът за „%s“ не може да бъде слян" -#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255 -#: builtin/checkout.c:258 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 builtin/checkout.c:277 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "Опцията „%s“ е несъвместима с обновяването на пътища" -#: builtin/checkout.c:261 builtin/checkout.c:264 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "Опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:267 +#: builtin/checkout.c:273 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Невъзможно е едновременно да обновявате пътища и да се прехвърлите към клона " "„%s“." -#: builtin/checkout.c:278 builtin/checkout.c:467 +#: builtin/checkout.c:287 builtin/checkout.c:481 msgid "corrupt index file" msgstr "повреден файл на индекса" -#: builtin/checkout.c:338 builtin/checkout.c:345 +#: builtin/checkout.c:347 builtin/checkout.c:354 #, c-format msgid "path '%s' is unmerged" msgstr "пътят „%s“ не е слят" -#: builtin/checkout.c:489 +#: builtin/checkout.c:503 msgid "you need to resolve your current index first" msgstr "първо трябва да коригирате индекса си" -#: builtin/checkout.c:615 +#: builtin/checkout.c:634 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Журналът на указателите за „%s“ не може да бъде създаден\n" -#: builtin/checkout.c:653 +#: builtin/checkout.c:670 msgid "HEAD is now at" msgstr "Указателят „HEAD“ в момента сочи към" -#: builtin/checkout.c:660 +#: builtin/checkout.c:677 #, c-format msgid "Reset branch '%s'\n" msgstr "Зануляване на клона „%s“\n" -#: builtin/checkout.c:663 +#: builtin/checkout.c:680 #, c-format msgid "Already on '%s'\n" msgstr "Вече сте на „%s“\n" -#: builtin/checkout.c:667 +#: builtin/checkout.c:684 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Преминаване към клона „%s“ и зануляване на промените\n" -#: builtin/checkout.c:669 builtin/checkout.c:1050 +#: builtin/checkout.c:686 builtin/checkout.c:1285 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Преминахте към новия клон „%s“\n" -#: builtin/checkout.c:671 +#: builtin/checkout.c:688 #, c-format msgid "Switched to branch '%s'\n" msgstr "Преминахте към клона „%s“\n" -#: builtin/checkout.c:723 +#: builtin/checkout.c:740 #, c-format msgid " ... and %d more.\n" msgstr "… и още %d.\n" -#: builtin/checkout.c:729 +#: builtin/checkout.c:746 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3728,158 +3775,208 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:747 +#: builtin/checkout.c:765 #, c-format msgid "" +"If you want to keep it by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch <new-branch-name> %s\n" +"\n" +msgid_plural "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" " git branch <new-branch-name> %s\n" "\n" -msgstr "" +msgstr[0] "" +"Ако все пак искате да запазите тази промяна чрез създаване на клон,\n" +"сега е най-подходящият за това чрез командата:\n" +"\n" +" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n" +"\n" +msgstr[1] "" "Ако все пак искате да запазите тези промени чрез създаване на клон,\n" "сега е най-подходящият за това чрез командата:\n" "\n" " git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n" "\n" -#: builtin/checkout.c:777 +#: builtin/checkout.c:801 msgid "internal error in revision walk" msgstr "вътрешна грешка при обхождането на версиите" -#: builtin/checkout.c:781 +#: builtin/checkout.c:805 msgid "Previous HEAD position was" msgstr "Преди това „HEAD“ сочеше към" -#: builtin/checkout.c:808 builtin/checkout.c:1045 +#: builtin/checkout.c:832 builtin/checkout.c:1280 msgid "You are on a branch yet to be born" msgstr "В момента сте на клон, който предстои да бъде създаден" -#: builtin/checkout.c:952 +#: builtin/checkout.c:893 +msgid "no branch specified" +msgstr "не е указано име на клон" + +#: builtin/checkout.c:895 +#, c-format +msgid "'%s' already exists" +msgstr "„%s“ вече съществува" + +#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842 +#: builtin/clone.c:853 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "родителските директории на „%s“ не могат да бъдат създадени" + +#: builtin/checkout.c:924 +#, c-format +msgid "could not create directory of '%s'" +msgstr "директорията „%s“ не може да бъде създадена" + +#: builtin/checkout.c:960 +#, c-format +msgid "Enter %s (identifier %s)" +msgstr "Въведете %s (идентификатор %s)" + +#: builtin/checkout.c:1070 +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "„%s“ вече е изтеглен в „%s“" + +#: builtin/checkout.c:1176 #, c-format msgid "only one reference expected, %d given." msgstr "очакваше се един указател, а сте подали %d." -#: builtin/checkout.c:991 +#: builtin/checkout.c:1215 #, c-format msgid "invalid reference: %s" msgstr "неправилен указател: %s" -#: builtin/checkout.c:1020 +#: builtin/checkout.c:1255 #, c-format msgid "reference is not a tree: %s" msgstr "указателят не сочи към обект-дърво: %s" -#: builtin/checkout.c:1059 +#: builtin/checkout.c:1294 msgid "paths cannot be used with switching branches" msgstr "задаването на път е несъвместимо с преминаването от един клон към друг" -#: builtin/checkout.c:1062 builtin/checkout.c:1066 +#: builtin/checkout.c:1297 builtin/checkout.c:1301 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг" -#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078 -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313 +#: builtin/checkout.c:1316 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:1086 +#: builtin/checkout.c:1321 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" "За да преминете към клон, подайте указател, който сочи към подаване. „%s“ не " "е такъв" -#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90 +#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "клон" -#: builtin/checkout.c:1109 +#: builtin/checkout.c:1347 msgid "create and checkout a new branch" msgstr "създаване и преминаване към нов клон" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1349 msgid "create/reset and checkout a branch" msgstr "създаване/зануляване на клон и преминаване към него" -#: builtin/checkout.c:1112 +#: builtin/checkout.c:1350 msgid "create reflog for new branch" msgstr "създаване на журнал на указателите за нов клон" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1351 msgid "detach the HEAD at named commit" msgstr "отделяне на указателя „HEAD“ към указаното подаване" -#: builtin/checkout.c:1114 +#: builtin/checkout.c:1352 msgid "set upstream info for new branch" msgstr "задаване на кой клон бива следен при създаването на новия клон" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new-branch" msgstr "НОВ_КЛОН" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new unparented branch" msgstr "нов клон без родител" -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1355 msgid "checkout our version for unmerged files" msgstr "изтегляне на вашата версия на неслетите файлове" -#: builtin/checkout.c:1119 +#: builtin/checkout.c:1357 msgid "checkout their version for unmerged files" msgstr "изтегляне на чуждата версия на неслетите файлове" -#: builtin/checkout.c:1121 +#: builtin/checkout.c:1359 msgid "force checkout (throw away local modifications)" msgstr "принудително изтегляне (вашите промени ще бъдат занулени)" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1360 msgid "perform a 3-way merge with the new branch" msgstr "извършване на тройно сливане с новия клон" -#: builtin/checkout.c:1123 builtin/merge.c:227 +#: builtin/checkout.c:1361 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "обновяване на игнорираните файлове (стандартно)" -#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 +#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244 msgid "style" msgstr "стил" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1363 msgid "conflict style (merge or diff3)" msgstr "действие при конфликт (сливане или тройна разлика)" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1366 msgid "do not limit pathspecs to sparse entries only" msgstr "без ограничаване на изброените пътища само до частично изтеглените" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1368 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" "опит за отгатване на име на клон след неуспешен опит с „git checkout " "НЕСЪЩЕСТВУВАЩ_КЛОН“" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1370 +msgid "check a branch out in a separate working directory" +msgstr "изтегляне на клон в отделно работно дърво" + +#: builtin/checkout.c:1372 +msgid "do not check if another worktree is holding the given ref" +msgstr "без проверка дали друго работно дърво държи указателя" + +#: builtin/checkout.c:1406 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1423 msgid "--track needs a branch name" msgstr "опцията „--track“ изисква име на клон" -#: builtin/checkout.c:1175 +#: builtin/checkout.c:1428 msgid "Missing branch name; try -b" msgstr "Липсва име на клон, използвайте опцията „-b“" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1464 msgid "invalid path specification" msgstr "указан е неправилен път" -#: builtin/checkout.c:1219 +#: builtin/checkout.c:1471 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3888,12 +3985,12 @@ msgstr "" "Не можете едновременно да обновявате пътища и да преминете към клона „%s“.\n" "Дали не искате да изтеглите „%s“, който не сочи към подаване?" -#: builtin/checkout.c:1224 +#: builtin/checkout.c:1476 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“" -#: builtin/checkout.c:1228 +#: builtin/checkout.c:1480 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3964,38 +4061,38 @@ msgstr "" " — (празно) завършване на избирането" # FIXME WTF does this mean -#: builtin/clean.c:517 +#: builtin/clean.c:515 #, c-format msgid "Huh (%s)?" msgstr "Неправилен избор (%s). Изберете отново." # FIXME - should we use >> or sth else -#: builtin/clean.c:659 +#: builtin/clean.c:657 #, c-format msgid "Input ignore patterns>> " msgstr "Шаблони за игнорирани елементи≫ " -#: builtin/clean.c:696 +#: builtin/clean.c:694 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ПРЕДУПРЕЖДЕНИЕ: Никой обект не напасва на „%s“" -#: builtin/clean.c:717 +#: builtin/clean.c:715 msgid "Select items to delete" msgstr "Избиране на обекти за изтриване" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:756 #, c-format msgid "Remove %s [y/N]? " msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ" # FIXME improve message -#: builtin/clean.c:783 +#: builtin/clean.c:781 msgid "Bye." msgstr "Изход." -#: builtin/clean.c:791 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -4014,63 +4111,63 @@ msgstr "" "? — подсказка за шаблоните" # FIXME how many *** -#: builtin/clean.c:818 +#: builtin/clean.c:816 msgid "*** Commands ***" msgstr "●●● Команди ●●●" # FIXME improve message -#: builtin/clean.c:819 +#: builtin/clean.c:817 msgid "What now" msgstr "Избор на следващо действие" -#: builtin/clean.c:827 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Следният обект ще бъде изтрит:" msgstr[1] "Следните обекти ще бъдат изтрити:" -#: builtin/clean.c:844 +#: builtin/clean.c:842 msgid "No more files to clean, exiting." msgstr "Файловете за изчистване свършиха. Изход от програмата." -#: builtin/clean.c:875 +#: builtin/clean.c:873 msgid "do not print names of files removed" msgstr "без извеждане на имената на файловете, които ще бъдат изтрити" -#: builtin/clean.c:877 +#: builtin/clean.c:875 msgid "force" msgstr "принудително изтриване" -#: builtin/clean.c:878 +#: builtin/clean.c:876 msgid "interactive cleaning" msgstr "интерактивно изтриване" -#: builtin/clean.c:880 +#: builtin/clean.c:878 msgid "remove whole directories" msgstr "изтриване на цели директории" -#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 msgid "pattern" msgstr "шаблон" -#: builtin/clean.c:882 +#: builtin/clean.c:880 msgid "add <pattern> to ignore rules" msgstr "добавяне на ШАБЛОН от файлове, които да не се трият" -#: builtin/clean.c:883 +#: builtin/clean.c:881 msgid "remove ignored files, too" msgstr "изтриване и на игнорираните файлове" -#: builtin/clean.c:885 +#: builtin/clean.c:883 msgid "remove only ignored files" msgstr "изтриване само на игнорирани файлове" -#: builtin/clean.c:903 +#: builtin/clean.c:901 msgid "-x and -X cannot be used together" msgstr "опциите „-x“ и „-X“ са несъвместими" -#: builtin/clean.c:907 +#: builtin/clean.c:905 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -4078,7 +4175,7 @@ msgstr "" "Настройката „clean.requireForce“ е зададена като истина, което изисква някоя " "от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване" -#: builtin/clean.c:910 +#: builtin/clean.c:908 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -4091,153 +4188,153 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" -#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224 #: builtin/push.c:523 msgid "force progress reporting" msgstr "извеждане на напредъка" -#: builtin/clone.c:68 +#: builtin/clone.c:59 msgid "don't create a checkout" msgstr "без създаване на работно дърво" -#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503 msgid "create a bare repository" msgstr "създаване на голо хранилище" -#: builtin/clone.c:73 +#: builtin/clone.c:64 msgid "create a mirror repository (implies bare)" msgstr "" "създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)" -#: builtin/clone.c:75 +#: builtin/clone.c:66 msgid "to clone from a local repository" msgstr "клониране от локално хранилище" -#: builtin/clone.c:77 +#: builtin/clone.c:68 msgid "don't use local hardlinks, always copy" msgstr "без твърди връзки, файловете винаги да се копират" -#: builtin/clone.c:79 +#: builtin/clone.c:70 msgid "setup as shared repository" msgstr "настройване за споделено хранилище" -#: builtin/clone.c:81 builtin/clone.c:83 +#: builtin/clone.c:72 builtin/clone.c:74 msgid "initialize submodules in the clone" msgstr "инициализиране на подмодулите при това клониране" -#: builtin/clone.c:84 builtin/init-db.c:493 +#: builtin/clone.c:75 builtin/init-db.c:500 msgid "template-directory" msgstr "директория с шаблони" -#: builtin/clone.c:85 builtin/init-db.c:494 +#: builtin/clone.c:76 builtin/init-db.c:501 msgid "directory from which templates will be used" msgstr "директория, която съдържа шаблоните, които да се ползват" -#: builtin/clone.c:87 +#: builtin/clone.c:78 msgid "reference repository" msgstr "еталонно хранилище" -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:80 +msgid "use --reference only while cloning" +msgstr "опцията „--reference“ може да се използва само при клониране" + +#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "ИМЕ" -#: builtin/clone.c:89 +#: builtin/clone.c:82 msgid "use <name> instead of 'origin' to track upstream" msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони" -#: builtin/clone.c:91 +#: builtin/clone.c:84 msgid "checkout <branch> instead of the remote's HEAD" msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“" -#: builtin/clone.c:93 +#: builtin/clone.c:86 msgid "path to git-upload-pack on the remote" msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище" -#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 +#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "ДЪЛБОЧИНА" -#: builtin/clone.c:95 +#: builtin/clone.c:88 msgid "create a shallow clone of that depth" msgstr "плитко клониране до тази ДЪЛБОЧИНА" -#: builtin/clone.c:97 +#: builtin/clone.c:90 msgid "clone only one branch, HEAD or --branch" msgstr "" "клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично " "зададения с „--branch“" -#: builtin/clone.c:99 -msgid "use --reference only while cloning" -msgstr "опцията „--reference“ може да се използва само при клониране" - -#: builtin/clone.c:100 builtin/init-db.c:502 +#: builtin/clone.c:91 builtin/init-db.c:509 msgid "gitdir" msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ" -#: builtin/clone.c:101 builtin/init-db.c:503 +#: builtin/clone.c:92 builtin/init-db.c:510 msgid "separate git dir from working tree" msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво" -#: builtin/clone.c:102 +#: builtin/clone.c:93 msgid "key=value" msgstr "КЛЮЧ=СТОЙНОСТ" -#: builtin/clone.c:103 +#: builtin/clone.c:94 msgid "set config inside the new repository" msgstr "задаване на настройките на новото хранилище" -#: builtin/clone.c:256 +#: builtin/clone.c:247 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "еталонното хранилище „%s“ не е локално" -#: builtin/clone.c:260 +#: builtin/clone.c:251 #, c-format msgid "reference repository '%s' is shallow" msgstr "еталонното хранилище „%s“ е плитко" -#: builtin/clone.c:263 +#: builtin/clone.c:254 #, c-format msgid "reference repository '%s' is grafted" msgstr "еталонното хранилище „%s“ е с присаждане" -#: builtin/clone.c:325 +#: builtin/clone.c:317 #, c-format msgid "failed to create directory '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/clone.c:327 builtin/diff.c:84 +#: builtin/clone.c:319 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "не може да бъде получена информация чрез „stat“ за „%s“" -#: builtin/clone.c:329 +#: builtin/clone.c:321 #, c-format msgid "%s exists and is not a directory" msgstr "„%s“ съществува и не е директория" -#: builtin/clone.c:343 +#: builtin/clone.c:335 #, c-format msgid "failed to stat %s\n" msgstr "не може да бъде получена информация чрез „stat“ за „%s“\n" -#: builtin/clone.c:365 +#: builtin/clone.c:357 #, c-format msgid "failed to create link '%s'" msgstr "връзката „%s“ не може да бъде създадена" -#: builtin/clone.c:369 +#: builtin/clone.c:361 #, c-format msgid "failed to copy file to '%s'" msgstr "файлът не може да бъде копиран като „%s“" -#: builtin/clone.c:392 builtin/clone.c:566 +#: builtin/clone.c:384 builtin/clone.c:558 #, c-format msgid "done.\n" msgstr "действието завърши.\n" -#: builtin/clone.c:404 +#: builtin/clone.c:396 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4248,7 +4345,7 @@ msgstr "" "клон в момента са изтеглени с командата „git status“. Можете да\n" "завършите изтеглянето на клона с командата „git checkout -f HEAD“.\n" -#: builtin/clone.c:481 +#: builtin/clone.c:473 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" @@ -4256,119 +4353,114 @@ msgstr "" "и който следва да бъде изтеглен, не съществува." # FIXME translator note that the space at end is necesssary -#: builtin/clone.c:561 +#: builtin/clone.c:553 #, c-format msgid "Checking connectivity... " msgstr "Проверка на връзката… " -#: builtin/clone.c:564 +#: builtin/clone.c:556 msgid "remote did not send all necessary objects" msgstr "отдалеченото хранилище не изпрати всички необходими обекти." -#: builtin/clone.c:628 +#: builtin/clone.c:620 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n" "което не съществува. Не може да се изтегли определен клон.\n" -#: builtin/clone.c:659 +#: builtin/clone.c:651 msgid "unable to checkout working tree" msgstr "работното дърво не може да бъде подготвено" -#: builtin/clone.c:746 +#: builtin/clone.c:738 msgid "cannot repack to clean up" msgstr "не може да се извърши пакетиране за изчистване на файловете" -#: builtin/clone.c:748 +#: builtin/clone.c:740 msgid "cannot unlink temporary alternates file" msgstr "временният файл за алтернативни обекти не може да бъде изтрит" -#: builtin/clone.c:778 +#: builtin/clone.c:770 msgid "Too many arguments." msgstr "Прекалено много аргументи." -#: builtin/clone.c:782 +#: builtin/clone.c:774 msgid "You must specify a repository to clone." msgstr "Трябва да укажете кое хранилище искате да клонирате." -#: builtin/clone.c:793 +#: builtin/clone.c:785 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "опциите „--bare“ и „--origin %s“ са несъвместими." -#: builtin/clone.c:796 +#: builtin/clone.c:788 msgid "--bare and --separate-git-dir are incompatible." msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими." -#: builtin/clone.c:809 +#: builtin/clone.c:801 #, c-format msgid "repository '%s' does not exist" msgstr "не съществува хранилище „%s“" -#: builtin/clone.c:815 builtin/fetch.c:1156 +#: builtin/clone.c:807 builtin/fetch.c:1160 #, c-format msgid "depth %s is not a positive number" msgstr "дълбочината трябва да е положително цяло число, а не „%s“" -#: builtin/clone.c:825 +#: builtin/clone.c:817 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевият път „%s“ съществува и не е празна директория." -#: builtin/clone.c:835 +#: builtin/clone.c:827 #, c-format msgid "working tree '%s' already exists." msgstr "в „%s“ вече съществува работно дърво." -#: builtin/clone.c:850 builtin/clone.c:861 -#, c-format -msgid "could not create leading directories of '%s'" -msgstr "родителските директории на „%s“ не могат да бъдат създадени" - -#: builtin/clone.c:853 +#: builtin/clone.c:845 #, c-format msgid "could not create work tree dir '%s'" msgstr "работното дърво в „%s“ не може да бъде създадено." -#: builtin/clone.c:871 +#: builtin/clone.c:863 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клониране и създаване на голо хранилище в „%s“…\n" -#: builtin/clone.c:873 +#: builtin/clone.c:865 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клониране и създаване на хранилище в „%s“…\n" -#: builtin/clone.c:898 +#: builtin/clone.c:890 msgid "--dissociate given, but there is no --reference" msgstr "Опцията „--dissociate“ е несъвместима с „--reference“" -#: builtin/clone.c:913 +#: builtin/clone.c:907 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--depth“ се игнорира. Ползвайте схемата " "„file://“." -#: builtin/clone.c:916 +#: builtin/clone.c:910 msgid "source repository is shallow, ignoring --local" msgstr "клонираното хранилище е плитко, затова опцията „--local“ се игнорира" -#: builtin/clone.c:921 +#: builtin/clone.c:915 msgid "--local is ignored" msgstr "опцията „--local“ се игнорира" -#: builtin/clone.c:925 +#: builtin/clone.c:919 #, c-format msgid "Don't know how to clone %s" msgstr "Не се поддържа клониране на връзки от вида „%s“ " -#: builtin/clone.c:976 builtin/clone.c:984 +#: builtin/clone.c:968 builtin/clone.c:976 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“" -#: builtin/clone.c:987 +#: builtin/clone.c:979 msgid "You appear to have cloned an empty repository." msgstr "Изглежда клонирахте празно хранилище." @@ -4610,7 +4702,7 @@ msgstr "съобщението за сливане MERGE_MSG не може да msgid "could not read SQUASH_MSG" msgstr "съобщението за смачкване SQUASH_MSG не може да бъде прочетено" -#: builtin/commit.c:738 +#: builtin/commit.c:738 builtin/merge.c:1079 #, c-format msgid "could not read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" @@ -4785,32 +4877,32 @@ msgstr "Несъществуващ режим на изчистване „%s“ msgid "Paths with -a does not make sense." msgstr "Опцията „-a“ е несъвместима със задаването на пътища." -#: builtin/commit.c:1324 builtin/commit.c:1604 +#: builtin/commit.c:1324 builtin/commit.c:1603 msgid "show status concisely" msgstr "кратка информация за състоянието" -#: builtin/commit.c:1326 builtin/commit.c:1606 +#: builtin/commit.c:1326 builtin/commit.c:1605 msgid "show branch information" msgstr "информация за клоните" -#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 +#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509 msgid "machine-readable output" msgstr "формат на изхода за четене от програма" -#: builtin/commit.c:1331 builtin/commit.c:1610 +#: builtin/commit.c:1331 builtin/commit.c:1609 msgid "show status in long format (default)" msgstr "подробна информация за състоянието (стандартно)" -#: builtin/commit.c:1334 builtin/commit.c:1613 +#: builtin/commit.c:1334 builtin/commit.c:1612 msgid "terminate entries with NUL" msgstr "разделяне на елементите с нулевия знак „NUL“" -#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "режим" -#: builtin/commit.c:1337 builtin/commit.c:1616 +#: builtin/commit.c:1337 builtin/commit.c:1615 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "извеждане на неследените файлове. Възможните режими са „all“ (подробна\n" @@ -4821,7 +4913,7 @@ msgstr "" msgid "show ignored files" msgstr "извеждане на игнорираните файлове" -#: builtin/commit.c:1341 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:152 msgid "when" msgstr "кога" @@ -4838,209 +4930,209 @@ msgstr "" msgid "list untracked files in columns" msgstr "извеждане на неследените файлове в колони" -#: builtin/commit.c:1431 +#: builtin/commit.c:1430 msgid "couldn't look up newly created commit" msgstr "току що създаденото подаване не може да бъде открито" -#: builtin/commit.c:1433 +#: builtin/commit.c:1432 msgid "could not parse newly created commit" msgstr "току що създаденото подаване не може да бъде анализирано" -#: builtin/commit.c:1478 +#: builtin/commit.c:1477 msgid "detached HEAD" msgstr "несвързан връх „HEAD“" -#: builtin/commit.c:1481 +#: builtin/commit.c:1480 msgid " (root-commit)" msgstr " (начално подаване)" -#: builtin/commit.c:1574 +#: builtin/commit.c:1573 msgid "suppress summary after successful commit" msgstr "без информация след успешно подаване" -#: builtin/commit.c:1575 +#: builtin/commit.c:1574 msgid "show diff in commit message template" msgstr "добавяне на разликата към шаблона за съобщението при подаване" -#: builtin/commit.c:1577 +#: builtin/commit.c:1576 msgid "Commit message options" msgstr "Опции за съобщението при подаване" -#: builtin/commit.c:1578 builtin/tag.c:601 +#: builtin/commit.c:1577 builtin/tag.c:601 msgid "read message from file" msgstr "взимане на съобщението от файл" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "author" msgstr "автор" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "override author for commit" msgstr "задаване на автор за подаването" -#: builtin/commit.c:1580 builtin/gc.c:275 +#: builtin/commit.c:1579 builtin/gc.c:280 msgid "date" msgstr "дата" -#: builtin/commit.c:1580 +#: builtin/commit.c:1579 msgid "override date for commit" msgstr "задаване на дата за подаването" -#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "съобщение" -#: builtin/commit.c:1581 +#: builtin/commit.c:1580 msgid "commit message" msgstr "съобщение при подаване" -#: builtin/commit.c:1582 +#: builtin/commit.c:1581 msgid "reuse and edit message from specified commit" msgstr "преизползване и редактиране на съобщението от указаното подаване" -#: builtin/commit.c:1583 +#: builtin/commit.c:1582 msgid "reuse message from specified commit" msgstr "преизползване на съобщението от указаното подаване" -#: builtin/commit.c:1584 +#: builtin/commit.c:1583 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "използване на автоматичното съобщение при смачкване за вкарване на " "указаното\n" "подаване в предното без следа" -#: builtin/commit.c:1585 +#: builtin/commit.c:1584 msgid "use autosquash formatted message to squash specified commit" msgstr "" "използване на автоматичното съобщение при смачкване за смачкване на " "указаното\n" "подаване в предното" -#: builtin/commit.c:1586 +#: builtin/commit.c:1585 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)" -#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "добавяне на поле за подпис — „Signed-off-by:“" -#: builtin/commit.c:1588 +#: builtin/commit.c:1587 msgid "use specified template file" msgstr "използване на указания шаблонен файл" -#: builtin/commit.c:1589 +#: builtin/commit.c:1588 msgid "force edit of commit" msgstr "редактиране на подаване" -#: builtin/commit.c:1590 +#: builtin/commit.c:1589 msgid "default" msgstr "стандартно" -#: builtin/commit.c:1590 builtin/tag.c:604 +#: builtin/commit.c:1589 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "кои празни знаци и #коментари да се махат от съобщенията" -#: builtin/commit.c:1591 +#: builtin/commit.c:1590 msgid "include status in commit message template" msgstr "вмъкване на състоянието в шаблона за съобщението при подаване" -#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ" -#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "подписване на подаването с GPG" -#: builtin/commit.c:1596 +#: builtin/commit.c:1595 msgid "Commit contents options" msgstr "Опции за избор на файлове при подаване" -#: builtin/commit.c:1597 +#: builtin/commit.c:1596 msgid "commit all changed files" msgstr "подаване на всички променени файлове" -#: builtin/commit.c:1598 +#: builtin/commit.c:1597 msgid "add specified files to index for commit" msgstr "добавяне на указаните файлове към индекса за подаване" -#: builtin/commit.c:1599 +#: builtin/commit.c:1598 msgid "interactively add files" msgstr "интерактивно добавяне на файлове" -#: builtin/commit.c:1600 +#: builtin/commit.c:1599 msgid "interactively add changes" msgstr "интерактивно добавяне на промени" -#: builtin/commit.c:1601 +#: builtin/commit.c:1600 msgid "commit only specified files" msgstr "подаване само на указаните файлове" -#: builtin/commit.c:1602 +#: builtin/commit.c:1601 msgid "bypass pre-commit hook" msgstr "без изпълнение на куката преди подаване (pre-commit)" -#: builtin/commit.c:1603 +#: builtin/commit.c:1602 msgid "show what would be committed" msgstr "отпечатване на това, което би било подадено" -#: builtin/commit.c:1614 +#: builtin/commit.c:1613 msgid "amend previous commit" msgstr "поправяне на предишното подаване" -#: builtin/commit.c:1615 +#: builtin/commit.c:1614 msgid "bypass post-rewrite hook" msgstr "без изпълнение на куката след презаписване (post-rewrite)" -#: builtin/commit.c:1620 +#: builtin/commit.c:1619 msgid "ok to record an empty change" msgstr "позволяване на празни подавания" -#: builtin/commit.c:1622 +#: builtin/commit.c:1621 msgid "ok to record a change with an empty message" msgstr "позволяване на подавания с празни съобщения" -#: builtin/commit.c:1651 +#: builtin/commit.c:1650 msgid "could not parse HEAD commit" msgstr "върховото подаване „HEAD“ не може да бъде прочетено" -#: builtin/commit.c:1690 builtin/merge.c:519 +#: builtin/commit.c:1689 builtin/merge.c:1076 #, c-format msgid "could not open '%s' for reading" msgstr "файлът не може да бъде прочетен: „%s“" -#: builtin/commit.c:1697 +#: builtin/commit.c:1696 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)" -#: builtin/commit.c:1704 +#: builtin/commit.c:1703 msgid "could not read MERGE_MODE" msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен" -#: builtin/commit.c:1723 +#: builtin/commit.c:1722 #, c-format msgid "could not read commit message: %s" msgstr "съобщението за подаване не може да бъде прочетено: %s" -#: builtin/commit.c:1734 +#: builtin/commit.c:1733 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Неизвършване на подаване поради нередактирано съобщение.\n" -#: builtin/commit.c:1739 +#: builtin/commit.c:1738 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Неизвършване на подаване поради празно съобщение.\n" -#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854 msgid "failed to write commit object" msgstr "обектът за подаването не може да бъде записан" -#: builtin/commit.c:1787 +#: builtin/commit.c:1786 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5188,18 +5280,18 @@ msgstr "неразпозната стойност на стандартния ц #, c-format msgid "" "# This is Git's per-user configuration file.\n" -"[core]\n" +"[user]\n" "# Please adapt and uncomment the following lines:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" msgstr "" "# Това е потребителският ви конфигурационен файл за Git.\n" -"[core]\n" +"[user]\n" "# Проверете и разкоментирайте следните два реда:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:589 +#: builtin/config.c:587 #, c-format msgid "cannot create configuration file %s" msgstr "конфигурационният файл „%s“ не може да бъде създаден" @@ -5533,84 +5625,84 @@ msgstr "карта с указатели" msgid "specify fetch refmap" msgstr "указване на картата с указатели за доставяне" -#: builtin/fetch.c:375 +#: builtin/fetch.c:377 msgid "Couldn't find remote ref HEAD" msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит" -#: builtin/fetch.c:455 +#: builtin/fetch.c:457 #, c-format msgid "object %s not found" msgstr "обектът „%s“ липсва" -#: builtin/fetch.c:460 +#: builtin/fetch.c:462 msgid "[up to date]" msgstr "[актуализиран]" -#: builtin/fetch.c:474 +#: builtin/fetch.c:476 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s → %s (в текущия клон не може да се доставя)" -#: builtin/fetch.c:475 builtin/fetch.c:561 +#: builtin/fetch.c:477 builtin/fetch.c:563 msgid "[rejected]" msgstr "[отхвърлен]" -#: builtin/fetch.c:486 +#: builtin/fetch.c:488 msgid "[tag update]" msgstr "[обновяване на етикетите]" -#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 +#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543 msgid " (unable to update local ref)" msgstr " (локалните указатели не могат да бъдат обновени)" -#: builtin/fetch.c:506 +#: builtin/fetch.c:508 msgid "[new tag]" msgstr "[нов етикет]" -#: builtin/fetch.c:509 +#: builtin/fetch.c:511 msgid "[new branch]" msgstr "[нов клон]" -#: builtin/fetch.c:512 +#: builtin/fetch.c:514 msgid "[new ref]" msgstr "[нов указател]" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "unable to update local ref" msgstr "локален указател не може да бъде обновен" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "forced update" msgstr "принудително обновяване" -#: builtin/fetch.c:563 +#: builtin/fetch.c:565 msgid "(non-fast-forward)" msgstr "(сливането не е тривиално)" -#: builtin/fetch.c:596 builtin/fetch.c:829 +#: builtin/fetch.c:599 builtin/fetch.c:832 #, c-format msgid "cannot open %s: %s\n" msgstr "файлът „%s“ не може да бъде отворен: %s\n" -#: builtin/fetch.c:605 +#: builtin/fetch.c:608 #, c-format msgid "%s did not send all necessary objects\n" msgstr "хранилището „%s“ не изпрати всички необходими обекти\n" -#: builtin/fetch.c:623 +#: builtin/fetch.c:626 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат " "обновявани" -#: builtin/fetch.c:711 builtin/fetch.c:794 +#: builtin/fetch.c:714 builtin/fetch.c:797 #, c-format msgid "From %.*s\n" msgstr "От %.*s\n" # FIXME - is the space necessary -#: builtin/fetch.c:722 +#: builtin/fetch.c:725 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5620,55 +5712,55 @@ msgstr "" "„git remote prune %s“, за да премахнете остарелите клони, които\n" "предизвикват конфликта" -#: builtin/fetch.c:774 +#: builtin/fetch.c:777 #, c-format msgid " (%s will become dangling)" msgstr " (обектът „%s“ ще се окаже извън клон)" -#: builtin/fetch.c:775 +#: builtin/fetch.c:778 #, c-format msgid " (%s has become dangling)" msgstr " (обектът „%s“ вече е извън клон)" -#: builtin/fetch.c:799 +#: builtin/fetch.c:802 msgid "[deleted]" msgstr "[изтрит]" -#: builtin/fetch.c:800 builtin/remote.c:1060 +#: builtin/fetch.c:803 builtin/remote.c:1057 msgid "(none)" msgstr "(нищо)" -#: builtin/fetch.c:819 +#: builtin/fetch.c:822 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Не може да изтегляте в текущия клон „%s“ на хранилище, което не е голо" -#: builtin/fetch.c:838 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“" -#: builtin/fetch.c:841 +#: builtin/fetch.c:844 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Опцията „%s“ се игнорира при „%s“\n" -#: builtin/fetch.c:897 +#: builtin/fetch.c:900 #, c-format msgid "Don't know how to fetch from %s" msgstr "Не се поддържа доставяне от „%s“" -#: builtin/fetch.c:1059 +#: builtin/fetch.c:1063 #, c-format msgid "Fetching %s\n" msgstr "Доставяне на „%s“\n" -#: builtin/fetch.c:1061 builtin/remote.c:90 +#: builtin/fetch.c:1065 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "„%s“ не може да се достави" -#: builtin/fetch.c:1079 +#: builtin/fetch.c:1083 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5676,33 +5768,33 @@ msgstr "" "Не сте указали отдалечено хранилище. Задайте или адрес, или име\n" "на отдалечено хранилище, откъдето да се доставят новите версии." -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1106 msgid "You need to specify a tag name." msgstr "Трябва да укажете име на етикет." -#: builtin/fetch.c:1144 +#: builtin/fetch.c:1148 msgid "--depth and --unshallow cannot be used together" msgstr "опциите „--depth“ и „--unshallow“ са несъвместими" -#: builtin/fetch.c:1146 +#: builtin/fetch.c:1150 msgid "--unshallow on a complete repository does not make sense" msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище" -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1173 msgid "fetch --all does not take a repository argument" msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище" -#: builtin/fetch.c:1171 +#: builtin/fetch.c:1175 msgid "fetch --all does not make sense with refspecs" msgstr "" "към „git fetch --all“ не можете да добавите аргумент — указател на версия" -#: builtin/fetch.c:1182 +#: builtin/fetch.c:1186 #, c-format msgid "No such remote or remote group: %s" msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“" -#: builtin/fetch.c:1190 +#: builtin/fetch.c:1194 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Указването на група и указването на версия са несъвместими" @@ -5712,133 +5804,133 @@ msgid "" msgstr "" "git fmt-merge-msg [-m СЪОБЩЕНИЕ] [--log[=БРОЙ] | --no-log] [--file ФАЙЛ]" -#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 +#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590 -#: parse-options.h:132 parse-options.h:239 +#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590 +#: parse-options.h:131 parse-options.h:238 msgid "n" msgstr "БРОЙ" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:669 msgid "populate log with at most <n> entries from shortlog" msgstr "" "вмъкване на журнал състоящ се от не повече от БРОЙ записа от съкратения " "журнал" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:672 msgid "alias for --log (deprecated)" msgstr "синоним на „--log“ (остаряло)" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:675 msgid "text" msgstr "ТЕКСТ" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:676 msgid "use <text> as start of message" msgstr "за начало на съобщението да се ползва ТЕКСТ" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:677 msgid "file to read from" msgstr "файл, от който да се чете" -#: builtin/for-each-ref.c:675 +#: builtin/for-each-ref.c:687 msgid "unable to parse format" msgstr "форматът не може да бъде анализиран" -#: builtin/for-each-ref.c:1063 +#: builtin/for-each-ref.c:1083 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [ОПЦИЯ…] [ШАБЛОН]" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1098 msgid "quote placeholders suitably for shells" msgstr "цитиране подходящо за командни интерпретатори на обвивката" -#: builtin/for-each-ref.c:1080 +#: builtin/for-each-ref.c:1100 msgid "quote placeholders suitably for perl" msgstr "цитиране подходящо за perl" -#: builtin/for-each-ref.c:1082 +#: builtin/for-each-ref.c:1102 msgid "quote placeholders suitably for python" msgstr "цитиране подходящо за python" -#: builtin/for-each-ref.c:1084 +#: builtin/for-each-ref.c:1104 msgid "quote placeholders suitably for Tcl" msgstr "цитиране подходящо за tcl" -#: builtin/for-each-ref.c:1087 +#: builtin/for-each-ref.c:1107 msgid "show only <n> matched refs" msgstr "извеждане само на този БРОЙ напаснати указатели" -#: builtin/for-each-ref.c:1088 builtin/replace.c:438 +#: builtin/for-each-ref.c:1108 builtin/replace.c:438 msgid "format" msgstr "ФОРМАТ" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1108 msgid "format to use for the output" msgstr "ФОРМАТ за изхода" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1109 msgid "key" msgstr "ключ" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1110 msgid "field name to sort on" msgstr "име на полето, по което да е подредбата" -#: builtin/fsck.c:147 builtin/prune.c:137 +#: builtin/fsck.c:147 builtin/prune.c:236 msgid "Checking connectivity" msgstr "Проверка на връзката" -#: builtin/fsck.c:540 +#: builtin/fsck.c:548 msgid "Checking object directories" msgstr "Проверка на директориите с обекти" -#: builtin/fsck.c:603 +#: builtin/fsck.c:611 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]" -#: builtin/fsck.c:609 +#: builtin/fsck.c:617 msgid "show unreachable objects" msgstr "показване на недостижимите обекти" -#: builtin/fsck.c:610 +#: builtin/fsck.c:618 msgid "show dangling objects" msgstr "показване на обектите извън клоните" -#: builtin/fsck.c:611 +#: builtin/fsck.c:619 msgid "report tags" msgstr "показване на етикетите" -#: builtin/fsck.c:612 +#: builtin/fsck.c:620 msgid "report root nodes" msgstr "показване на кореновите възли" -#: builtin/fsck.c:613 +#: builtin/fsck.c:621 msgid "make index objects head nodes" msgstr "задаване на обекти от индекса да са коренови" # FIXME bad message -#: builtin/fsck.c:614 +#: builtin/fsck.c:622 msgid "make reflogs head nodes (default)" msgstr "проследяване на указателите от журнала като глави (стандартно)" -#: builtin/fsck.c:615 +#: builtin/fsck.c:623 msgid "also consider packs and alternate objects" msgstr "допълнително да се проверяват пакетите и алтернативните обекти" -#: builtin/fsck.c:616 +#: builtin/fsck.c:624 msgid "enable more strict checking" msgstr "по-строги проверки" -#: builtin/fsck.c:618 +#: builtin/fsck.c:626 msgid "write dangling objects in .git/lost-found" msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“" -#: builtin/fsck.c:619 builtin/prune.c:108 +#: builtin/fsck.c:627 builtin/prune.c:198 msgid "show progress" msgstr "показване на напредъка" -#: builtin/fsck.c:669 +#: builtin/fsck.c:677 msgid "Checking objects" msgstr "Проверка на обектите" @@ -5847,53 +5939,54 @@ msgstr "Проверка на обектите" msgid "git gc [<options>]" msgstr "git gc [ОПЦИЯ…]" -#: builtin/gc.c:79 +#: builtin/gc.c:67 #, c-format -msgid "Invalid gc.pruneexpire: '%s'" -msgstr "Неправилна стойност за настройката „gc.pruneexpire“: %s" +msgid "Invalid %s: '%s'" +msgstr "Неправилен %s: „%s“" -#: builtin/gc.c:107 +#: builtin/gc.c:112 #, c-format msgid "insanely long object directory %.*s" msgstr "прекалено дълга директория с обекти „%.*s“" -#: builtin/gc.c:276 +#: builtin/gc.c:281 msgid "prune unreferenced objects" msgstr "окастряне на обектите, към които нищо не сочи" -#: builtin/gc.c:278 +#: builtin/gc.c:283 msgid "be more thorough (increased runtime)" msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)" -#: builtin/gc.c:279 +#: builtin/gc.c:284 msgid "enable auto-gc mode" msgstr "включване на автоматичното събиране на боклука (auto-gc)" -#: builtin/gc.c:280 +#: builtin/gc.c:285 msgid "force running gc even if there may be another gc running" msgstr "" "изрично стартиране на събирането на боклука, дори и ако вече работи друго " "събиране" -#: builtin/gc.c:321 +#: builtin/gc.c:327 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Автоматично пакетиране на заден фон на хранилището за по-добра " "производителност.\n" -#: builtin/gc.c:323 +#: builtin/gc.c:329 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n" -#: builtin/gc.c:324 +#: builtin/gc.c:330 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -"Вижте ръководството за повече информация как да изпълните „git help gc“.\n" +"Погледнете ръководството за повече информация как да изпълните „git help " +"gc“.\n" -#: builtin/gc.c:342 +#: builtin/gc.c:348 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5902,7 +5995,7 @@ msgstr "" "процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n" "опцията „--force“)" -#: builtin/gc.c:364 +#: builtin/gc.c:376 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -6118,7 +6211,7 @@ msgstr "" "позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази " "опция)" -#: builtin/grep.c:741 builtin/show-ref.c:187 +#: builtin/grep.c:741 builtin/show-ref.c:189 msgid "show usage" msgstr "извеждане на начина на употреба на командата" @@ -6150,7 +6243,7 @@ msgstr "" msgid "both --cached and trees are given." msgstr "опцията „--cached“ е несъвместима със задаване на дърво." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:80 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -6159,38 +6252,38 @@ msgstr "" "ФАЙЛ…" # FIXME - list of paths or path... -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:81 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < ПЪТ…" -#: builtin/hash-object.c:94 builtin/tag.c:612 +#: builtin/hash-object.c:92 builtin/tag.c:612 msgid "type" msgstr "ВИД" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:92 msgid "object type" msgstr "вид на обекта" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:93 msgid "write the object into the object database" msgstr "записване на обекта в базата от данни за обектите" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:95 msgid "read the object from stdin" msgstr "изчитане на обекта от стандартния вход" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:97 msgid "store file as is without filters" msgstr "запазване на файла както е — без филтри" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:98 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "създаване и хеширане на произволни данни за повредени обекти за трасиране на " "Git" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:99 msgid "process file as it were from this path" msgstr "обработване на файла все едно е с този път" @@ -6321,281 +6414,281 @@ msgid "`git %s' is aliased to `%s'" msgstr "„git %s“ е синоним на „%s“" # FIXME merge with next? -#: builtin/index-pack.c:150 +#: builtin/index-pack.c:151 #, c-format msgid "unable to open %s" msgstr "обектът „%s“ не може да бъде отворен" -#: builtin/index-pack.c:200 +#: builtin/index-pack.c:201 #, c-format msgid "object type mismatch at %s" msgstr "неправилен вид на обекта „%s“" -#: builtin/index-pack.c:220 +#: builtin/index-pack.c:221 #, c-format msgid "did not receive expected object %s" msgstr "очакваният обект „%s“ не бе получен" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "object %s: expected type %s, found %s" msgstr "неправилен вид на обекта „%s“: очакваше се „%s“, а бе получен „%s“" -#: builtin/index-pack.c:265 +#: builtin/index-pack.c:266 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "не може да се запълни %d байт" msgstr[1] "не може да се запълнят %d байта" -#: builtin/index-pack.c:275 +#: builtin/index-pack.c:276 msgid "early EOF" msgstr "неочакван край на файл" -#: builtin/index-pack.c:276 +#: builtin/index-pack.c:277 msgid "read error on input" msgstr "грешка при четене на входните данни" -#: builtin/index-pack.c:288 +#: builtin/index-pack.c:289 msgid "used more bytes than were available" msgstr "използвани са повече от наличните байтове" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:296 msgid "pack too large for current definition of off_t" msgstr "пакетният файл е прекалено голям за текущата стойност на типа „off_t“" -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:312 #, c-format msgid "unable to create '%s'" msgstr "пакетният файл „%s“ не може да бъде създаден" -#: builtin/index-pack.c:316 +#: builtin/index-pack.c:317 #, c-format msgid "cannot open packfile '%s'" msgstr "пакетният файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:330 +#: builtin/index-pack.c:331 msgid "pack signature mismatch" msgstr "несъответствие в подписа към пакетния файл" -#: builtin/index-pack.c:332 +#: builtin/index-pack.c:333 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "не се поддържа пакетиране вeрсия „%<PRIu32>“" -#: builtin/index-pack.c:350 +#: builtin/index-pack.c:351 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "повреден обект в пакетния файл при отместване %lu: %s" -#: builtin/index-pack.c:471 +#: builtin/index-pack.c:472 #, c-format msgid "inflate returned %d" msgstr "декомпресирането с „inflate“ върна %d" -#: builtin/index-pack.c:520 +#: builtin/index-pack.c:521 msgid "offset value overflow for delta base object" msgstr "стойността на отместването за обекта-разлика води до препълване" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "delta base offset is out of bound" msgstr "стойността на отместването за обекта-разлика е извън диапазона" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 #, c-format msgid "unknown object type %d" msgstr "непознат вид обект %d" -#: builtin/index-pack.c:567 +#: builtin/index-pack.c:568 msgid "cannot pread pack file" msgstr "пакетният файл не може да бъде прочетен" -#: builtin/index-pack.c:569 +#: builtin/index-pack.c:570 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "неочакван край на файл, липсва %lu байт" msgstr[1] "неочакван край на файл, липсват %lu байта" -#: builtin/index-pack.c:595 +#: builtin/index-pack.c:596 msgid "serious inflate inconsistency" msgstr "сериозна грешка при декомпресиране с „inflate“" -#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715 -#: builtin/index-pack.c:749 builtin/index-pack.c:758 +#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771 +#: builtin/index-pack.c:805 builtin/index-pack.c:814 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" "СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!" # FIXME merge with next? -#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/index-pack.c:745 builtin/pack-objects.c:162 #: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "обектът „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:755 +#: builtin/index-pack.c:811 #, c-format msgid "cannot read existing object %s" msgstr "съществуващият обект „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:769 +#: builtin/index-pack.c:825 #, c-format msgid "invalid blob object %s" msgstr "неправилен обект BLOB „%s“" # FIXME perhaps invalid object -#: builtin/index-pack.c:783 +#: builtin/index-pack.c:839 #, c-format msgid "invalid %s" msgstr "неправилен обект „%s“" -#: builtin/index-pack.c:787 +#: builtin/index-pack.c:843 msgid "Error in object" msgstr "Грешка в обекта" -#: builtin/index-pack.c:789 +#: builtin/index-pack.c:845 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Някои обекти, наследници на „%s“, не могат да бъдат достигнати" -#: builtin/index-pack.c:861 builtin/index-pack.c:890 +#: builtin/index-pack.c:917 builtin/index-pack.c:948 msgid "failed to apply delta" msgstr "разликата не може да бъде приложена" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Получаване на обекти" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Индексиране на обекти" -#: builtin/index-pack.c:1081 +#: builtin/index-pack.c:1150 msgid "pack is corrupted (SHA1 mismatch)" msgstr "пакетният файл е повреден (нееднакви суми по SHA1)" -#: builtin/index-pack.c:1086 +#: builtin/index-pack.c:1155 msgid "cannot fstat packfile" msgstr "не може да се получи информация за пакетния файл с „fstat“" -#: builtin/index-pack.c:1089 +#: builtin/index-pack.c:1158 msgid "pack has junk at the end" msgstr "в края на пакетния файл има повредени данни" # FIXME WTF message -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1169 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" "фатална грешка във функцията „parse_pack_objects“. Това е грешка в Git, " "докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger." "kernel.org“." -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1194 msgid "Resolving deltas" msgstr "Откриване на съответните разлики" -#: builtin/index-pack.c:1133 +#: builtin/index-pack.c:1205 #, c-format msgid "unable to create thread: %s" msgstr "не може да се създаде нишка: %s" # FIXME WTF message -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1247 msgid "confusion beyond insanity" msgstr "" "фатална грешка във функцията „conclude_pack“. Това е грешка в Git, " "докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger." "kernel.org“." -#: builtin/index-pack.c:1181 +#: builtin/index-pack.c:1253 #, c-format msgid "completed with %d local objects" msgstr "действието завърши с %d локални обекта" -#: builtin/index-pack.c:1191 +#: builtin/index-pack.c:1263 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в " "диска)" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1267 #, 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:1219 +#: builtin/index-pack.c:1291 #, c-format msgid "unable to deflate appended object (%d)" msgstr "добавеният обект не може да се компресира с „deflate“: %d" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1367 #, c-format msgid "local object %s is corrupt" msgstr "локалният обект „%s“ е повреден" -#: builtin/index-pack.c:1322 +#: builtin/index-pack.c:1391 msgid "error while closing pack file" msgstr "грешка при затварянето на пакетния файл" -#: builtin/index-pack.c:1335 +#: builtin/index-pack.c:1404 #, c-format msgid "cannot write keep file '%s'" msgstr "" "грешка при записването на файла „%s“, осигуряващ запазване на директория" -#: builtin/index-pack.c:1343 +#: builtin/index-pack.c:1412 #, c-format msgid "cannot close written keep file '%s'" msgstr "" "грешка при затварянето на записания файл „%s“, осигуряващ запазване на " "директория" -#: builtin/index-pack.c:1356 +#: builtin/index-pack.c:1425 msgid "cannot store pack file" msgstr "пакетният файл не може да бъде запазен" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1436 msgid "cannot store index file" msgstr "файлът за индекса не може да бъде съхранен" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1469 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1475 #, c-format msgid "invalid number of threads specified (%d)" msgstr "зададен е неправилен брой нишки: %d" -#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1658 #, c-format msgid "no threads support, ignoring %s" msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1537 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1539 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1517 +#: builtin/index-pack.c:1586 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "%d обект не е разлика" msgstr[1] "%d обекта не са разлика" -#: builtin/index-pack.c:1524 +#: builtin/index-pack.c:1593 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" @@ -6603,26 +6696,26 @@ msgstr[0] "дължината на веригата е %d: %lu обект" msgstr[1] "дължината на веригата е %d: %lu обекта" # FIXME it is not the cwd it is the previous cwd -#: builtin/index-pack.c:1553 +#: builtin/index-pack.c:1622 msgid "Cannot come back to cwd" msgstr "Процесът не може да се върне към предишната работна директория" -#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 -#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 +#: builtin/index-pack.c:1670 builtin/index-pack.c:1673 +#: builtin/index-pack.c:1685 builtin/index-pack.c:1689 #, c-format msgid "bad %s" msgstr "неправилна стойност „%s“" -#: builtin/index-pack.c:1634 +#: builtin/index-pack.c:1703 msgid "--fix-thin cannot be used without --stdin" msgstr "опцията „--fix-thin“ изисква „--stdin“" -#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 +#: builtin/index-pack.c:1707 builtin/index-pack.c:1716 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "името на пакетния файл „%s“ не завършва на „.pack“" -#: builtin/index-pack.c:1655 +#: builtin/index-pack.c:1724 msgid "--verify with no packfile name given" msgstr "опцията „--verify“ изисква име на пакетен файл" @@ -6695,22 +6788,22 @@ msgid "not copying templates of a wrong format version %d from '%s'" msgstr "" "шаблоните с неправилен номер на формата %d няма да бъдат копирани от „%s“" -#: builtin/init-db.c:197 +#: builtin/init-db.c:211 #, c-format msgid "insane git directory %s" msgstr "твърде дълго име на директория на Git: „%s“" -#: builtin/init-db.c:331 builtin/init-db.c:334 +#: builtin/init-db.c:343 builtin/init-db.c:346 #, c-format msgid "%s already exists" msgstr "Директорията „%s“ вече съществува" -#: builtin/init-db.c:363 +#: builtin/init-db.c:374 #, c-format msgid "unable to handle file type %d" msgstr "файлове от вид %d не се поддържат" -#: builtin/init-db.c:366 +#: builtin/init-db.c:377 #, c-format msgid "unable to move %s to %s" msgstr "„%s“ не може да се премести в „%s“" @@ -6718,24 +6811,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:426 +#: builtin/init-db.c:433 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s хранилище на Git в „%s%s“\n" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Reinitialized existing" msgstr "Наново инициализирано, съществуващо" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Initialized empty" msgstr "Инициализирано празно" -#: builtin/init-db.c:428 +#: builtin/init-db.c:435 msgid " shared" msgstr ", споделено" -#: builtin/init-db.c:475 +#: builtin/init-db.c:482 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -6743,31 +6836,31 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШАБЛОНИ] [--" "shared[=ПРАВА]] [ДИРЕКТОРИЯ]" -#: builtin/init-db.c:498 +#: builtin/init-db.c:505 msgid "permissions" msgstr "права" -#: builtin/init-db.c:499 +#: builtin/init-db.c:506 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "указване, че хранилището на Git ще бъде споделено от повече от един " "потребител" -#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171 +#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171 msgid "be quiet" msgstr "без извеждане на информация" -#: builtin/init-db.c:533 builtin/init-db.c:538 +#: builtin/init-db.c:540 builtin/init-db.c:545 #, c-format msgid "cannot mkdir %s" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/init-db.c:542 +#: builtin/init-db.c:549 #, c-format msgid "cannot chdir to %s" msgstr "не може да се влезе в директорията „%s“" -#: builtin/init-db.c:563 +#: builtin/init-db.c:570 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6776,7 +6869,7 @@ msgstr "" "%s (или --work-tree=ДИРЕКТОРИЯ) изисква указването на %s (или --git-" "dir=ДИРЕКТОРИЯ)" -#: builtin/init-db.c:591 +#: builtin/init-db.c:598 #, c-format msgid "Cannot access work tree '%s'" msgstr "Работното дърво в „%s“ е недостъпно" @@ -6802,7 +6895,7 @@ msgid "trailer(s) to add" msgstr "епилог(зи) за добавяне" #: builtin/log.c:41 -msgid "git log [<options>] [<revision range>] [[--] <path>...]" +msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]" #: builtin/log.c:42 @@ -6875,7 +6968,7 @@ msgstr "Файлът-кръпка „%s“ не може да бъде отво msgid "Need exactly one range." msgstr "Трябва да зададете точно един диапазон." -#: builtin/log.c:811 +#: builtin/log.c:813 msgid "Not a range." msgstr "Не е диапазон." @@ -7085,7 +7178,7 @@ msgstr "Изходните файлове не могат да бъдат съз msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]" -#: builtin/log.c:1638 +#: builtin/log.c:1637 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -7093,7 +7186,7 @@ msgstr "" "Следеният отдалечен клон не бе открит, затова изрично задайте " "ОТДАЛЕЧЕН_КЛОН.\n" -#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 +#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662 #, c-format msgid "Unknown commit %s" msgstr "Непознато подаване „%s“" @@ -7374,42 +7467,42 @@ msgstr "" msgid "'%s' does not point to a commit" msgstr "„%s“ не сочи към подаване" -#: builtin/merge.c:559 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“" -#: builtin/merge.c:654 +#: builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "Командата „git write-tree“ не успя да запише обект-дърво" -#: builtin/merge.c:678 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "Поддържа се само сливане на точно две истории." -#: builtin/merge.c:692 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“" -#: builtin/merge.c:705 +#: builtin/merge.c:683 #, c-format msgid "unable to write %s" msgstr "„%s“ не може да бъде записан" -#: builtin/merge.c:794 +#: builtin/merge.c:772 #, c-format msgid "Could not read from '%s'" msgstr "От „%s“ не може да се чете" -#: builtin/merge.c:803 +#: builtin/merge.c:781 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Сливането няма да бъде подадено. За завършването му и подаването му " "използвайте командата „git commit“.\n" -#: builtin/merge.c:809 +#: builtin/merge.c:787 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7424,50 +7517,55 @@ msgstr "" "Редовете, които започват с „%c“ ще бъдат пропуснати, а празно съобщение\n" "преустановява подаването.\n" -#: builtin/merge.c:833 +#: builtin/merge.c:811 msgid "Empty commit message." msgstr "Празно съобщение при подаване." # FIXME - WTF is wonderful. -#: builtin/merge.c:845 +#: builtin/merge.c:823 #, c-format msgid "Wonderful.\n" msgstr "Първият етап на тривиалното сливане завърши.\n" -#: builtin/merge.c:900 +#: builtin/merge.c:878 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "Неуспешно сливане — коригирайте конфликтите и подайте резултата.\n" -#: builtin/merge.c:916 +#: builtin/merge.c:894 #, c-format msgid "'%s' is not a commit" msgstr "„%s“ не е подаване" -#: builtin/merge.c:957 +#: builtin/merge.c:935 msgid "No current branch." msgstr "Няма текущ клон." -#: builtin/merge.c:959 +#: builtin/merge.c:937 msgid "No remote for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/merge.c:961 +#: builtin/merge.c:939 msgid "No default upstream defined for the current branch." msgstr "Текущият клон не следи никой клон." -#: builtin/merge.c:966 +#: builtin/merge.c:944 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Никой клон не следи клона „%s“ от хранилището „%s“" -#: builtin/merge.c:1122 +#: builtin/merge.c:1081 +#, c-format +msgid "could not close '%s'" +msgstr "„%s“ не може да се затвори" + +#: builtin/merge.c:1208 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Не може да преустановите сливане, защото в момента не се извършва такова " "(липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1138 +#: builtin/merge.c:1224 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7475,11 +7573,11 @@ msgstr "" "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n" "Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1141 git-pull.sh:34 +#: builtin/merge.c:1227 git-pull.sh:74 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)." -#: builtin/merge.c:1145 +#: builtin/merge.c:1231 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7487,111 +7585,111 @@ msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува). Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1148 +#: builtin/merge.c:1234 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува)." -#: builtin/merge.c:1157 +#: builtin/merge.c:1243 msgid "You cannot combine --squash with --no-ff." msgstr "Опцията „--squash“ е несъвместима с „--no-ff“." -#: builtin/merge.c:1166 +#: builtin/merge.c:1251 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена." -#: builtin/merge.c:1198 -msgid "Can merge only exactly one commit into empty head" -msgstr "Можете да слеете точно едно подаване във връх без история" - -#: builtin/merge.c:1201 +#: builtin/merge.c:1268 msgid "Squash commit into empty head not supported yet" msgstr "Подаване със смачкване във връх без история все още не се поддържа" -#: builtin/merge.c:1203 +#: builtin/merge.c:1270 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Понеже върхът е без история, всички сливания са тривиални, не може да се " "извърши нетривиално сливане изисквано от опцията „--no-ff“" -#: builtin/merge.c:1208 +#: builtin/merge.c:1276 #, c-format msgid "%s - not something we can merge" msgstr "„%s“ — не е нещо, което може да се слее" -#: builtin/merge.c:1259 +#: builtin/merge.c:1278 +msgid "Can merge only exactly one commit into empty head" +msgstr "Можете да слеете точно едно подаване във връх без история" + +#: builtin/merge.c:1333 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1262 +#: builtin/merge.c:1336 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1265 +#: builtin/merge.c:1339 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Подаването „%s“ е без подпис от GPG." -#: builtin/merge.c:1268 +#: builtin/merge.c:1342 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n" -#: builtin/merge.c:1349 +#: builtin/merge.c:1423 #, c-format msgid "Updating %s..%s\n" msgstr "Обновяване „%s..%s“\n" -#: builtin/merge.c:1388 +#: builtin/merge.c:1462 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Проба с най-тривиалното сливане в рамките на индекса…\n" # FIXME WTF message -#: builtin/merge.c:1395 +#: builtin/merge.c:1469 #, c-format msgid "Nope.\n" msgstr "Неуспешно сливане.\n" -#: builtin/merge.c:1427 +#: builtin/merge.c:1501 msgid "Not possible to fast-forward, aborting." msgstr "" "Не може да се извърши тривиално сливане, преустановяване на действието." -#: builtin/merge.c:1450 builtin/merge.c:1529 +#: builtin/merge.c:1524 builtin/merge.c:1603 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Привеждане на дървото към първоначалното…\n" -#: builtin/merge.c:1454 +#: builtin/merge.c:1528 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Пробване със стратегията за сливане „%s“…\n" -#: builtin/merge.c:1520 +#: builtin/merge.c:1594 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Никоя стратегия за сливане не може да извърши сливането.\n" -#: builtin/merge.c:1522 +#: builtin/merge.c:1596 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Неуспешно сливане със стратегия „%s“.\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1605 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" "Ползва се стратегията „%s“, която ще подготви дървото за коригиране на " "ръка.\n" -#: builtin/merge.c:1543 +#: builtin/merge.c:1617 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7786,7 +7884,7 @@ msgstr "%s, обект: „%s“, цел: „%s“" msgid "Renaming %s to %s\n" msgstr "Преименуване на „%s“ на „%s“\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 +#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361 #, c-format msgid "renaming '%s' failed" msgstr "неуспешно преименуване на „%s“" @@ -8173,7 +8271,7 @@ msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" msgid "use notes from <notes-ref>" msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" -#: builtin/notes.c:989 builtin/remote.c:1621 +#: builtin/notes.c:989 builtin/remote.c:1618 #, c-format msgid "Unknown subcommand: %s" msgstr "Непозната подкоманда: %s" @@ -8199,187 +8297,187 @@ msgstr "грешка при декомпресиране с „deflate“ (%d)" msgid "Writing objects" msgstr "Записване на обектите" -#: builtin/pack-objects.c:1013 +#: builtin/pack-objects.c:1011 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "изключване на записването на битовата маска, защото някои обекти няма да се " "пакетират" -#: builtin/pack-objects.c:2173 +#: builtin/pack-objects.c:2171 msgid "Compressing objects" msgstr "Компресиране на обектите" -#: builtin/pack-objects.c:2570 +#: builtin/pack-objects.c:2568 #, c-format msgid "unsupported index version %s" msgstr "неподдържана версия на индекса „%s“" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2572 #, c-format msgid "bad index version '%s'" msgstr "неправилна версия на индекса „%s“" -#: builtin/pack-objects.c:2597 +#: builtin/pack-objects.c:2595 #, c-format msgid "option %s does not accept negative form" msgstr "опцията „%s“ не притежава отрицателна версия" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2599 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "неразпозната стойност „%s“ за опцията „%s“" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2619 msgid "do not show progress meter" msgstr "без извеждане на напредъка" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "show progress meter" msgstr "извеждане на напредъка" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter during object writing phase" msgstr "извеждане на напредъка във фазата на запазване на обектите" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2626 msgid "similar to --all-progress when progress meter is shown" msgstr "" "същото действие като опцията „--all-progress“ при извеждането на напредъка" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:2627 msgid "version[,offset]" msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "write the pack index file in the specified idx format version" msgstr "" "запазване на индекса на пакетните файлове във форма̀та с указаната версия" -#: builtin/pack-objects.c:2633 +#: builtin/pack-objects.c:2631 msgid "maximum size of each output pack file" msgstr "максимален размер на всеки пакетен файл" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "ignore borrowed objects from alternate object store" msgstr "игнориране на обектите заети от други хранилища на обекти" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore packed objects" msgstr "игнориране на пакетираните обекти" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "limit pack window by objects" msgstr "ограничаване на прозореца за пакетиране по брой обекти" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by memory in addition to object limit" msgstr "" "ограничаване на прозореца за пакетиране и по памет освен по брой обекти" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "максимална дължина на веригата от разлики, която е позволена в пакетния файл" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "reuse existing deltas" msgstr "преизползване на съществуващите разлики" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing objects" msgstr "преизползване на съществуващите обекти" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "use OFS_DELTA objects" msgstr "използване на обекти „OFS_DELTA“" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use threads when searching for best delta matches" msgstr "" "стартиране на нишки за претърсване на най-добрите съвпадения на разликите" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "do not create an empty pack output" msgstr "без създаване на празен пакетен файл" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "read revision arguments from standard input" msgstr "изчитане на версиите от стандартния вход" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "limit the objects to those that are not yet packed" msgstr "ограничаване до все още непакетираните обекти" -#: builtin/pack-objects.c:2660 +#: builtin/pack-objects.c:2658 msgid "include objects reachable from any reference" msgstr "" "включване на всички обекти, които могат да се достигнат от произволен " "указател" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2661 msgid "include objects referred by reflog entries" msgstr "включване и на обектите сочени от записите в журнала на указателите" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2664 msgid "include objects referred to by the index" msgstr "включване и на обектите сочени от индекса" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2667 msgid "output pack to stdout" msgstr "извеждане на пакета на стандартния изход" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "include tag objects that refer to objects to be packed" msgstr "" "включване и на обектите-етикети, които сочат към обектите, които ще бъдат " "пакетирани" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "keep unreachable objects" msgstr "запазване на недостижимите обекти" -#: builtin/pack-objects.c:2674 parse-options.h:140 +#: builtin/pack-objects.c:2672 parse-options.h:139 msgid "time" msgstr "ВРЕМЕ" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "unpack unreachable objects newer than <time>" msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ" -#: builtin/pack-objects.c:2678 +#: builtin/pack-objects.c:2676 msgid "create thin packs" msgstr "създаване на съкратени пакети" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create packs suitable for shallow fetches" msgstr "пакетиране подходящо за плитко доставяне" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "ignore packs that have companion .keep file" msgstr "игнориране на пакетите, които са придружени от файл „.keep“" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "pack compression level" msgstr "ниво на компресиране при пакетиране" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "do not hide commits by grafts" msgstr "" "извеждане на всички родители — дори и тези, които нормално са скрити при " "присажданията" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "използване на съществуващи индекси на база битови маски за ускоряване на " "преброяването на обектите" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "write a bitmap index together with the pack index" msgstr "" "запазване и на индекс на база побитова маска, заедно с индекса за пакета" -#: builtin/pack-objects.c:2781 +#: builtin/pack-objects.c:2779 msgid "Counting objects" msgstr "Преброяване на обектите" @@ -8407,18 +8505,59 @@ msgstr "Изтриване на повтарящите се обекти" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire ВРЕМЕ] [--] [ВРЪХ…]" -#: builtin/prune.c:106 +#: builtin/prune.c:86 +#, c-format +msgid "Removing worktrees/%s: not a valid directory" +msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректория" + +#: builtin/prune.c:92 +#, c-format +msgid "Removing worktrees/%s: gitdir file does not exist" +msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не съществува" + +#: builtin/prune.c:97 +#, c-format +msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +msgstr "" +"Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен" + +#: builtin/prune.c:108 +#, c-format +msgid "Removing worktrees/%s: invalid gitdir file" +msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“" + +#: builtin/prune.c:124 +#, c-format +msgid "Removing worktrees/%s: gitdir file points to non-existent location" +msgstr "" +"Изтриване на „worktrees/%s“: файлът „gitdir“ сочи несъществуващо " +"местоположение" + +#: builtin/prune.c:159 +#, c-format +msgid "failed to remove: %s" +msgstr "„%s“ не може да се изтрие" + +#: builtin/prune.c:196 msgid "do not remove, show only" msgstr "само извеждане без действително окастряне" -#: builtin/prune.c:107 +#: builtin/prune.c:197 msgid "report pruned objects" msgstr "информация за окастрените обекти" -#: builtin/prune.c:110 +#: builtin/prune.c:199 +msgid "prune .git/worktrees" +msgstr "окастряне на „.git/worktrees“" + +#: builtin/prune.c:201 msgid "expire objects older than <time>" msgstr "окастряне на обектите по-стари от това ВРЕМЕ" +#: builtin/prune.c:216 +msgid "--worktrees does not take extra arguments" +msgstr "опцията „--worktrees“ не приема допълнителни аргументи" + #: builtin/push.c:14 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]" @@ -8437,8 +8576,8 @@ msgid "" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" -"За да включите тази опция за постоянно, вижте документацията за настройката " -"„push.default“ в „git help config“." +"За да включите тази опция за постоянно, погледнете документацията за " +"настройката „push.default“ в „git help config“." #: builtin/push.c:142 #, c-format @@ -8596,7 +8735,7 @@ msgstr "" "Обновяването е отхвърлено, защото върхът на изтласквания клон е преди върха\n" "на отдалечения клон. Проверете клона и внесете отдалечените промени (напр.\n" "с командата „git pull…“), преди отново да изтласкате промените. За повече\n" -"информация вижте раздела „Note about fast-forwards“ в страницата от\n" +"информация погледнете раздела „Note about fast-forwards“ в страницата от\n" "ръководството „git push --help“." #: builtin/push.c:291 @@ -8614,9 +8753,9 @@ msgstr "" "че някой друг е изтласквал към същия клон. Първо внесете отдалечените " "промени\n" "(напр. с командата „git pull…“), преди отново да изтласкате промените.\n" -"За повече информация вижте раздела „Note about fast-forwards“ в страницата " -"от\n" -"ръководството „git push --help“." +"За повече информация погледнете раздела „Note about fast-forwards“ в " +"страницата\n" +"от ръководството „git push --help“." #: builtin/push.c:298 msgid "Updates were rejected because the tag already exists in the remote." @@ -8848,12 +8987,12 @@ msgid "debug unpack-trees" msgstr "изчистване на грешки в командата „unpack-trees“" # FIXME -#: builtin/reflog.c:429 +#: builtin/reflog.c:430 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "„%s“ не е правилна стойност за време за „%s“" -#: builtin/reflog.c:546 builtin/reflog.c:551 +#: builtin/reflog.c:547 builtin/reflog.c:552 #, c-format msgid "'%s' is not a valid timestamp" msgstr "„%s“ не е правилна стойност за време" @@ -8996,12 +9135,12 @@ msgstr "" "указването на следени клони е смислено само за отдалечени хранилища, от " "които се доставя" -#: builtin/remote.c:187 builtin/remote.c:643 +#: builtin/remote.c:187 builtin/remote.c:640 #, c-format msgid "remote %s already exists." msgstr "вече съществува отдалечено хранилище с име „%s“." -#: builtin/remote.c:191 builtin/remote.c:647 +#: builtin/remote.c:191 builtin/remote.c:644 #, c-format msgid "'%s' is not a valid remote name" msgstr "„%s“ е неправилно име за отдалечено хранилище" @@ -9024,28 +9163,28 @@ msgstr "(съвпадащи)" msgid "(delete)" msgstr "(за изтриване)" -#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604 +#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 #, c-format msgid "Could not append '%s' to '%s'" msgstr "„%s“ не може да се добави към „%s“" -#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895 +#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892 #, c-format msgid "No such remote: %s" msgstr "Такова отдалечено хранилище няма: %s" -#: builtin/remote.c:653 +#: builtin/remote.c:650 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Разделът „%s“ в настройките не може да бъде преименуван на „%s“" -#: builtin/remote.c:659 builtin/remote.c:847 +#: builtin/remote.c:656 builtin/remote.c:844 #, c-format msgid "Could not remove config section '%s'" msgstr "Разделът „%s“ в настройките не може да бъде изтрит" # FIXME tabulator -#: builtin/remote.c:674 +#: builtin/remote.c:671 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -9056,32 +9195,32 @@ msgstr "" " %s\n" " Променете настройките ръчно, ако е необходимо." -#: builtin/remote.c:680 +#: builtin/remote.c:677 #, c-format msgid "Could not append '%s'" msgstr "Разделът „%s“ не може да бъде добавен в настройките" -#: builtin/remote.c:691 +#: builtin/remote.c:688 #, c-format msgid "Could not set '%s'" msgstr "Разделът „%s“ не може да бъде зададен в настройките" -#: builtin/remote.c:713 +#: builtin/remote.c:710 #, c-format msgid "deleting '%s' failed" msgstr "неуспешно изтриване на „%s“" -#: builtin/remote.c:747 +#: builtin/remote.c:744 #, c-format msgid "creating '%s' failed" msgstr "неуспешно създаване на „%s“" -#: builtin/remote.c:766 +#: builtin/remote.c:763 #, c-format msgid "Could not remove branch %s" msgstr "Клонът „%s“ не може да бъде изтрит" -#: builtin/remote.c:833 +#: builtin/remote.c:830 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -9095,125 +9234,125 @@ msgstr[1] "" "Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n" "Изтрийте ги чрез командата:" -#: builtin/remote.c:948 +#: builtin/remote.c:945 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)" -#: builtin/remote.c:951 +#: builtin/remote.c:948 msgid " tracked" msgstr " следен" -#: builtin/remote.c:953 +#: builtin/remote.c:950 msgid " stale (use 'git remote prune' to remove)" msgstr " стар (изтрийте чрез „git remote prune“)" # FIXME -#: builtin/remote.c:955 +#: builtin/remote.c:952 msgid " ???" msgstr " неясно състояние" # CHECK -#: builtin/remote.c:996 +#: builtin/remote.c:993 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" "неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече от " "1 клон" -#: builtin/remote.c:1003 +#: builtin/remote.c:1000 #, c-format msgid "rebases onto remote %s" msgstr "пребазиране върху отдалечения клон „%s“" -#: builtin/remote.c:1006 +#: builtin/remote.c:1003 #, c-format msgid " merges with remote %s" msgstr " сливане с отдалечения клон „%s“" -#: builtin/remote.c:1007 +#: builtin/remote.c:1004 msgid " and with remote" msgstr " и с отдалечения клон" -#: builtin/remote.c:1009 +#: builtin/remote.c:1006 #, c-format msgid "merges with remote %s" msgstr "сливане с отдалечения клон „%s“" -#: builtin/remote.c:1010 +#: builtin/remote.c:1007 msgid " and with remote" msgstr " и с отдалечения клон" -#: builtin/remote.c:1056 +#: builtin/remote.c:1053 msgid "create" msgstr "създаден" -#: builtin/remote.c:1059 +#: builtin/remote.c:1056 msgid "delete" msgstr "изтрит" -#: builtin/remote.c:1063 +#: builtin/remote.c:1060 msgid "up to date" msgstr "актуален" -#: builtin/remote.c:1066 +#: builtin/remote.c:1063 msgid "fast-forwardable" msgstr "може да се слее тривиално" -#: builtin/remote.c:1069 +#: builtin/remote.c:1066 msgid "local out of date" msgstr "локалният е изостанал" -#: builtin/remote.c:1076 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s принудително изтласква към %-*s (%s)" -#: builtin/remote.c:1079 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s изтласква към %-*s (%s)" -#: builtin/remote.c:1083 +#: builtin/remote.c:1080 #, c-format msgid " %-*s forces to %s" msgstr " %-*s принудително изтласква към %s" -#: builtin/remote.c:1086 +#: builtin/remote.c:1083 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s изтласква към %s" -#: builtin/remote.c:1154 +#: builtin/remote.c:1151 msgid "do not query remotes" msgstr "без заявки към отдалечените хранилища" -#: builtin/remote.c:1181 +#: builtin/remote.c:1178 #, c-format msgid "* remote %s" msgstr "● отдалечено хранилище „%s“" -#: builtin/remote.c:1182 +#: builtin/remote.c:1179 #, c-format msgid " Fetch URL: %s" msgstr " Адрес за доставяне: %s" -#: builtin/remote.c:1183 builtin/remote.c:1334 +#: builtin/remote.c:1180 builtin/remote.c:1331 msgid "(no URL)" msgstr "(без адрес)" # FIXME spaces betwen Push and URL -#: builtin/remote.c:1192 builtin/remote.c:1194 +#: builtin/remote.c:1189 builtin/remote.c:1191 #, c-format msgid " Push URL: %s" msgstr " Адрес за изтласкване: %s" -#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200 +#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " HEAD branch: %s" msgstr " клон сочен от HEAD: %s" -#: builtin/remote.c:1202 +#: builtin/remote.c:1199 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -9222,146 +9361,146 @@ msgstr "" "хранилище е\n" " нееднозначен и е някой от следните):\n" -#: builtin/remote.c:1214 +#: builtin/remote.c:1211 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Отдалечен клон:%s" msgstr[1] " Отдалечени клони:%s" -#: builtin/remote.c:1217 builtin/remote.c:1244 +#: builtin/remote.c:1214 builtin/remote.c:1241 msgid " (status not queried)" msgstr " (състоянието не бе проверено)" -#: builtin/remote.c:1226 +#: builtin/remote.c:1223 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:1234 +#: builtin/remote.c:1231 msgid " Local refs will be mirrored by 'git push'" msgstr " Локалните указатели ще бъдат пренесени чрез „ push“" -#: builtin/remote.c:1241 +#: builtin/remote.c:1238 #, 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:1262 +#: builtin/remote.c:1259 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище" -#: builtin/remote.c:1264 +#: builtin/remote.c:1261 msgid "delete refs/remotes/<name>/HEAD" msgstr "изтриване на refs/remotes/ИМЕ/HEAD" -#: builtin/remote.c:1279 +#: builtin/remote.c:1276 msgid "Cannot determine remote HEAD" msgstr "Не може да се установи отдалеченият връх" -#: builtin/remote.c:1281 +#: builtin/remote.c:1278 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Множество клони с върхове. Изберете изрично някой от тях чрез командата:" -#: builtin/remote.c:1291 +#: builtin/remote.c:1288 #, c-format msgid "Could not delete %s" msgstr "„%s“ не може да бъде изтрит" -#: builtin/remote.c:1299 +#: builtin/remote.c:1296 #, c-format msgid "Not a valid ref: %s" msgstr "Неправилен указател: %s" -#: builtin/remote.c:1301 +#: builtin/remote.c:1298 #, c-format msgid "Could not setup %s" msgstr "„%s“ не може да се настрои" -#: builtin/remote.c:1319 +#: builtin/remote.c:1316 #, c-format msgid " %s will become dangling!" msgstr "„%s“ ще се превърне в обект извън клоните!" -#: builtin/remote.c:1320 +#: builtin/remote.c:1317 #, c-format msgid " %s has become dangling!" msgstr "„%s“ се превърна в обект извън клоните!" -#: builtin/remote.c:1330 +#: builtin/remote.c:1327 #, c-format msgid "Pruning %s" msgstr "Окастряне на „%s“" -#: builtin/remote.c:1331 +#: builtin/remote.c:1328 #, c-format msgid "URL: %s" msgstr "адрес: %s" -#: builtin/remote.c:1354 +#: builtin/remote.c:1351 #, c-format msgid " * [would prune] %s" msgstr " ● [ще бъде окастрено] %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1354 #, c-format msgid " * [pruned] %s" msgstr " ● [окастрено] %s" -#: builtin/remote.c:1402 +#: builtin/remote.c:1399 msgid "prune remotes after fetching" msgstr "окастряне на огледалата на отдалечените хранилища след доставяне" -#: builtin/remote.c:1468 builtin/remote.c:1542 +#: builtin/remote.c:1465 builtin/remote.c:1539 #, c-format msgid "No such remote '%s'" msgstr "Няма отдалечено хранилище на име „%s“" -#: builtin/remote.c:1488 +#: builtin/remote.c:1485 msgid "add branch" msgstr "добавяне на клон" -#: builtin/remote.c:1495 +#: builtin/remote.c:1492 msgid "no remote specified" msgstr "не е указано отдалечено хранилище" -#: builtin/remote.c:1517 +#: builtin/remote.c:1514 msgid "manipulate push URLs" msgstr "промяна на адресите за изтласкване" -#: builtin/remote.c:1519 +#: builtin/remote.c:1516 msgid "add URL" msgstr "добавяне на адреси" -#: builtin/remote.c:1521 +#: builtin/remote.c:1518 msgid "delete URLs" msgstr "изтриване на адреси" # FIXME message - incompatible -#: builtin/remote.c:1528 +#: builtin/remote.c:1525 msgid "--add --delete doesn't make sense" msgstr "опциите „--add“ и „--delete“ са несъвместими" -#: builtin/remote.c:1568 +#: builtin/remote.c:1565 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Неправилен (стар) формат за адрес: %s" -#: builtin/remote.c:1576 +#: builtin/remote.c:1573 #, c-format msgid "No such URL found: %s" msgstr "Такъв адрес не е открит: %s" # FIXME CHECK MEANING -#: builtin/remote.c:1578 +#: builtin/remote.c:1575 msgid "Will not delete all non-push URLs" msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие" -#: builtin/remote.c:1592 +#: builtin/remote.c:1589 msgid "be verbose; must be placed before a subcommand" msgstr "повече подробности. Поставя се пред подкоманда" @@ -9442,7 +9581,7 @@ msgstr "максимален размер на всеки пакет" msgid "repack objects in packs marked with .keep" msgstr "препакетиране на обектите в пакети белязани с „.keep“" -#: builtin/repack.c:375 +#: builtin/repack.c:377 #, c-format msgid "removing '%s' failed" msgstr "неуспешно изтриване на „%s“" @@ -9826,7 +9965,7 @@ msgstr "" "\n" "(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)" -#: builtin/rm.c:231 +#: builtin/rm.c:230 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -9842,7 +9981,7 @@ msgstr[1] "" "съдържание и\n" "различно от съответстващото на HEAD:" -#: builtin/rm.c:236 +#: builtin/rm.c:235 msgid "" "\n" "(use -f to force removal)" @@ -9850,13 +9989,13 @@ msgstr "" "\n" "(за принудително изтриване използвайте опцията „-f“)" -#: builtin/rm.c:240 +#: builtin/rm.c:239 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "следният файл е с променено съдържание в индекса:" msgstr[1] "следните файлове са с променено съдържание в индекса:" -#: builtin/rm.c:244 builtin/rm.c:255 +#: builtin/rm.c:243 builtin/rm.c:254 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -9865,46 +10004,46 @@ msgstr "" "(за запазване на файла използвайте опцията „--cached“, а за принудително\n" "изтриване — „-f“)" -#: builtin/rm.c:252 +#: builtin/rm.c:251 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "следният файл е с променено съдържание" msgstr[1] "следните файлове са с променено съдържание" -#: builtin/rm.c:270 +#: builtin/rm.c:269 msgid "do not list removed files" msgstr "да не се извеждат изтритите файлове" -#: builtin/rm.c:271 +#: builtin/rm.c:270 msgid "only remove from the index" msgstr "изтриване само от индекса" -#: builtin/rm.c:272 +#: builtin/rm.c:271 msgid "override the up-to-date check" msgstr "въпреки проверката за актуалността на съдържанието" -#: builtin/rm.c:273 +#: builtin/rm.c:272 msgid "allow recursive removal" msgstr "рекурсивно изтриване" -#: builtin/rm.c:275 +#: builtin/rm.c:274 msgid "exit with a zero status even if nothing matched" msgstr "" "изходният код да е 0, дори ако никой файл нe e напаснал с шаблона за " "изтриване" -#: builtin/rm.c:318 +#: builtin/rm.c:317 msgid "Please, stage your changes to .gitmodules or stash them to proceed" msgstr "" "За да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n" "или ги скатайте" -#: builtin/rm.c:336 +#: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" msgstr "без използването на опцията „-r“ „%s“ няма да се изтрие рекурсивно" -#: builtin/rm.c:375 +#: builtin/rm.c:374 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: „%s“ не може да се изтрие" @@ -9957,69 +10096,69 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=БРОЙ[,БАЗА]] [--list] [УКАЗАТЕЛ]" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:659 msgid "show remote-tracking and local branches" msgstr "извеждане на следящите и локалните клони" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:661 msgid "show remote-tracking branches" msgstr "извеждане на следящите клони" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:663 msgid "color '*!+-' corresponding to the branch" msgstr "оцветяване на „*!+-“ според клоните" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:665 msgid "show <n> more commits after the common ancestor" msgstr "извеждане на такъв БРОЙ подавания от общия предшественик" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:667 msgid "synonym to more=-1" msgstr "синоним на „more=-1“" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:668 msgid "suppress naming strings" msgstr "без низове за имената на клоните" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:670 msgid "include the current branch" msgstr "включване и на текущия клон" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:672 msgid "name commits with their object names" msgstr "именуване на подаванията с имената им на обекти" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:674 msgid "show possible merge bases" msgstr "извеждане на възможните бази за сливания" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:676 msgid "show refs unreachable from any other ref" msgstr "извеждане на недостижимите указатели" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:678 msgid "show commits in topological order" msgstr "извеждане на подаванията в топологическа подредба" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:681 msgid "show only commits not on the first branch" msgstr "извеждане само на подаванията, които не са от първия клон" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:683 msgid "show merges reachable from only one tip" msgstr "извеждане на сливанията, които могат да се достигнат само от един връх" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:685 msgid "topologically sort, maintaining date order where possible" msgstr "" "топологическа подредба, при запазване на подредбата по дата, доколкото е\n" "възможно" -#: builtin/show-branch.c:681 +#: builtin/show-branch.c:688 msgid "<n>[,<base>]" msgstr "БРОЙ[,БАЗА]" -#: builtin/show-branch.c:682 +#: builtin/show-branch.c:689 msgid "show <n> most recent ref-log entries starting at base" msgstr "показване на най-много БРОЙ журнални записа с начало съответната БАЗА" @@ -10037,37 +10176,37 @@ msgstr "" msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "git show-ref --exclude-existing[=ШАБЛОН] < СПИСЪК_С_УКАЗАТЕЛИ" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:170 msgid "only show tags (can be combined with heads)" msgstr "извеждане на етикетите (може да се комбинира с върховете)" -#: builtin/show-ref.c:169 +#: builtin/show-ref.c:171 msgid "only show heads (can be combined with tags)" msgstr "извеждане на върховете (може да се комбинира с етикетите)" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:172 msgid "stricter reference checking, requires exact ref path" msgstr "строга проверка на указателите, изисква се указател с пълен път" -#: builtin/show-ref.c:173 builtin/show-ref.c:175 +#: builtin/show-ref.c:175 builtin/show-ref.c:177 msgid "show the HEAD reference, even if it would be filtered out" msgstr "задължително извеждане и на указателя HEAD" -#: builtin/show-ref.c:177 +#: builtin/show-ref.c:179 msgid "dereference tags into object IDs" msgstr "да се извеждат идентификаторите на обектите-етикети" -#: builtin/show-ref.c:179 +#: builtin/show-ref.c:181 msgid "only show SHA1 hash using <n> digits" msgstr "извеждане само на този БРОЙ цифри от всяка сума по SHA1" -#: builtin/show-ref.c:183 +#: builtin/show-ref.c:185 msgid "do not print results to stdout (useful with --verify)" msgstr "" "без извеждане на резултатите на стандартния вход (полезно с опцията „--" "verify“)" -#: builtin/show-ref.c:185 +#: builtin/show-ref.c:187 msgid "show refs from stdin that aren't in local repository" msgstr "" "извеждане на указателите приети от стандартния вход, които липсват в " @@ -10333,131 +10472,210 @@ msgstr "Обновен етикет „%s“ (бе „%s“)\n" msgid "Unpacking objects" msgstr "Разпакетиране на обектите" -#: builtin/update-index.c:403 +#: builtin/update-index.c:70 +#, c-format +msgid "failed to create directory %s" +msgstr "директорията „%s“ не може да бъде създадена" + +#: builtin/update-index.c:76 +#, c-format +msgid "failed to stat %s" +msgstr "не може да бъде получена информация чрез „stat“ за „%s“" + +#: builtin/update-index.c:86 +#, c-format +msgid "failed to create file %s" +msgstr "файлът „%s“ не може да бъде създаден" + +#: builtin/update-index.c:94 +#, c-format +msgid "failed to delete file %s" +msgstr "файлът „%s“ не може да бъде изтрит" + +#: builtin/update-index.c:101 builtin/update-index.c:203 +#, c-format +msgid "failed to delete directory %s" +msgstr "директорията „%s“ не може да бъде изтрита" + +#: builtin/update-index.c:124 +#, c-format +msgid "Testing " +msgstr "Проба" + +#: builtin/update-index.c:136 +msgid "directory stat info does not change after adding a new file" +msgstr "" +"информацията получена чрез „stat“ за директорията не се променя след " +"добавянето на нов файл" + +#: builtin/update-index.c:149 +msgid "directory stat info does not change after adding a new directory" +msgstr "" +"информацията получена чрез „stat“ за директорията не се променя след " +"добавянето на нова директория" + +#: builtin/update-index.c:162 +msgid "directory stat info changes after updating a file" +msgstr "" +"информацията получена чрез „stat“ за директорията се променя след " +"обновяването на нов файл" + +#: builtin/update-index.c:173 +msgid "directory stat info changes after adding a file inside subdirectory" +msgstr "" +"информацията получена чрез „stat“ за директорията се променя след добавянето " +"на файл в поддиректория" + +#: builtin/update-index.c:184 +msgid "directory stat info does not change after deleting a file" +msgstr "" +"информацията получена чрез „stat“ за директорията не се променя след " +"изтриването на файл" + +#: builtin/update-index.c:197 +msgid "directory stat info does not change after deleting a directory" +msgstr "" +"информацията получена чрез „stat“ за директорията не се променя след " +"изтриването на директория" + +#: builtin/update-index.c:204 +msgid " OK" +msgstr " Добре" + +#: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]" -#: builtin/update-index.c:757 +#: builtin/update-index.c:918 msgid "continue refresh even when index needs update" msgstr "" "продължаване с обновяването, дори когато индексът трябва да бъде обновен" -#: builtin/update-index.c:760 +#: builtin/update-index.c:921 msgid "refresh: ignore submodules" msgstr "подмодулите да се игнорират при обновяването" -#: builtin/update-index.c:763 +#: builtin/update-index.c:924 msgid "do not ignore new files" msgstr "новите файлове да не се игнорират" -#: builtin/update-index.c:765 +#: builtin/update-index.c:926 msgid "let files replace directories and vice-versa" msgstr "файлове да могат да заменят директории и обратно" -#: builtin/update-index.c:767 +#: builtin/update-index.c:928 msgid "notice files missing from worktree" msgstr "предупреждаване при липсващи в работното дърво файлове" -#: builtin/update-index.c:769 +#: builtin/update-index.c:930 msgid "refresh even if index contains unmerged entries" msgstr "обновяване дори и индексът да съдържа неслети обекти" -#: builtin/update-index.c:772 +#: builtin/update-index.c:933 msgid "refresh stat information" msgstr "обновяване на информацията от функцията „stat“" -#: builtin/update-index.c:776 +#: builtin/update-index.c:937 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" "като опцията „--refresh“, но да се проверят и обектите, които са били приети " "за непроменени" -#: builtin/update-index.c:780 +#: builtin/update-index.c:941 msgid "<mode>,<object>,<path>" msgstr "РЕЖИМ,ОБЕКТ,ПЪТ" -#: builtin/update-index.c:781 +#: builtin/update-index.c:942 msgid "add the specified entry to the index" msgstr "добавяне на изброените обекти към индекса" -#: builtin/update-index.c:785 +#: builtin/update-index.c:946 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:786 +#: builtin/update-index.c:947 msgid "override the executable bit of the listed files" msgstr "изрично задаване на стойността на флага дали файлът е изпълним" -#: builtin/update-index.c:790 +#: builtin/update-index.c:951 msgid "mark files as \"not changing\"" msgstr "задаване на флаг, че файлът не се променя" -#: builtin/update-index.c:793 +#: builtin/update-index.c:954 msgid "clear assumed-unchanged bit" msgstr "изчистване на флага, че файлът не се променя" -#: builtin/update-index.c:796 +#: builtin/update-index.c:957 msgid "mark files as \"index-only\"" msgstr "задаване на флаг, че файловете са само за индекса" -#: builtin/update-index.c:799 +#: builtin/update-index.c:960 msgid "clear skip-worktree bit" msgstr "изчистване на флага, че файловете са само за индекса" -#: builtin/update-index.c:802 +#: builtin/update-index.c:963 msgid "add to index only; do not add content to object database" msgstr "добавяне само към индекса без добавяне към базата от данни за обектите" -#: builtin/update-index.c:804 +#: builtin/update-index.c:965 msgid "remove named paths even if present in worktree" msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво" -#: builtin/update-index.c:806 +#: builtin/update-index.c:967 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" "при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия " "байт" -#: builtin/update-index.c:808 +#: builtin/update-index.c:969 msgid "read list of paths to be updated from standard input" msgstr "изчитане на списъка с пътища за обновяване от стандартния вход" -#: builtin/update-index.c:812 +#: builtin/update-index.c:973 msgid "add entries from standard input to the index" msgstr "добавяне на елементите от стандартния вход към индекса" -#: builtin/update-index.c:816 +#: builtin/update-index.c:977 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "възстановяване на състоянието преди сливане или нужда от обновяване за " "изброените пътища" -#: builtin/update-index.c:820 +#: builtin/update-index.c:981 msgid "only update entries that differ from HEAD" msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“" -#: builtin/update-index.c:824 +#: builtin/update-index.c:985 msgid "ignore files missing from worktree" msgstr "игнориране на файловете, които липсват в работното дърво" -#: builtin/update-index.c:827 +#: builtin/update-index.c:988 msgid "report actions to standard output" msgstr "извеждане на действията на стандартния изход" -#: builtin/update-index.c:829 +#: builtin/update-index.c:990 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "забравяне на записаната информация за неразрешени конфликти — за командите " "от потребителско ниво" -#: builtin/update-index.c:833 +#: builtin/update-index.c:994 msgid "write index in this format" msgstr "записване на индекса в този формат" -#: builtin/update-index.c:835 +#: builtin/update-index.c:996 msgid "enable or disable split index" msgstr "включване или изключване на разделянето на индекса" +#: builtin/update-index.c:998 +msgid "enable/disable untracked cache" +msgstr "включване/изключване на кеша за неследените файлове" + +#: builtin/update-index.c:1000 +msgid "enable untracked cache without testing the filesystem" +msgstr "" +"включване на кеша за неследените файлове без проверка на файловата система" + #: builtin/update-ref.c:9 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [ОПЦИЯ…] -d ИМЕ_НА_УКАЗАТЕЛ [СТАРА_СТОЙНОСТ]" @@ -10557,110 +10775,130 @@ msgstr "" "за\n" "някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“." -#: common-cmds.h:8 +#: common-cmds.h:10 +msgid "start a working area (see also: git help tutorial)" +msgstr "създаване на работно дърво (погледнете: „git help tutorial“)" + +#: common-cmds.h:11 +msgid "work on the current change (see also: git help everyday)" +msgstr "работа по текущата промяна (погледнете: „git help everyday“)" + +#: common-cmds.h:12 +msgid "examine the history and state (see also: git help revisions)" +msgstr "преглед на историята и състоянието (погледнете: „git help revisions“)" + +#: common-cmds.h:13 +msgid "grow, mark and tweak your common history" +msgstr "увеличаване, отбелязване и промяна на общата история" + +#: common-cmds.h:14 +msgid "collaborate (see also: git help workflows)" +msgstr "съвместна работа (погледнете: „git help workflows“)" + +#: common-cmds.h:18 msgid "Add file contents to the index" msgstr "Добавяне на съдържанието на файла към индекса" -#: common-cmds.h:9 +#: common-cmds.h:19 msgid "Find by binary search the change that introduced a bug" msgstr "Двоично търсене на промяната, която е причинила грешка" # FIXME - should be similar to tag -#: common-cmds.h:10 +#: common-cmds.h:20 msgid "List, create, or delete branches" msgstr "Извеждане, създаване, изтриване на клони" -#: common-cmds.h:11 +#: common-cmds.h:21 msgid "Checkout a branch or paths to the working tree" msgstr "Изтегляне на цял клон или файлове/директории в работното дърво" -#: common-cmds.h:12 +#: common-cmds.h:22 msgid "Clone a repository into a new directory" msgstr "Клониране на хранилище в нова директория" -#: common-cmds.h:13 +#: common-cmds.h:23 msgid "Record changes to the repository" msgstr "Подаване на промени в хранилището" -#: common-cmds.h:14 +#: common-cmds.h:24 msgid "Show changes between commits, commit and working tree, etc" msgstr "Извеждане на разликите между подаванията, версиите, работното дърво" -#: common-cmds.h:15 +#: common-cmds.h:25 msgid "Download objects and refs from another repository" msgstr "Изтегляне на обекти и указатели от друго хранилище" -#: common-cmds.h:16 +#: common-cmds.h:26 msgid "Print lines matching a pattern" msgstr "Извеждане на редовете напасващи на шаблон" -#: common-cmds.h:17 +#: common-cmds.h:27 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Създаване на празно хранилище на Git или зануляване на съществуващо" -#: common-cmds.h:18 +#: common-cmds.h:28 msgid "Show commit logs" msgstr "Извеждане на журнала с подаванията" -#: common-cmds.h:19 +#: common-cmds.h:29 msgid "Join two or more development histories together" msgstr "Сливане на две или повече поредици/истории от промени" -#: common-cmds.h:20 +#: common-cmds.h:30 msgid "Move or rename a file, a directory, or a symlink" msgstr "Преместване или преименуване на файл, директория или символна връзка" -#: common-cmds.h:21 +#: common-cmds.h:31 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Доставяне и интегрирането на промените от друго хранилище или клон" -#: common-cmds.h:22 +#: common-cmds.h:32 msgid "Update remote refs along with associated objects" msgstr "Обновяване на отдалечените указатели и свързаните с тях обекти" -#: common-cmds.h:23 +#: common-cmds.h:33 msgid "Forward-port local commits to the updated upstream head" msgstr "Пребазиране на промени към нова основа" -#: common-cmds.h:24 +#: common-cmds.h:34 msgid "Reset current HEAD to the specified state" msgstr "Привеждане на указателя „HEAD“ към зададеното състояние" -#: common-cmds.h:25 +#: common-cmds.h:35 msgid "Remove files from the working tree and from the index" msgstr "Изтриване на файлове от работното дърво и индекса" -#: common-cmds.h:26 +#: common-cmds.h:36 msgid "Show various types of objects" msgstr "Извеждане на различните видове обекти в Git" -#: common-cmds.h:27 +#: common-cmds.h:37 msgid "Show the working tree status" msgstr "Извеждане на състоянието на работното дърво" # FIXME - should be similar to branch -#: common-cmds.h:28 +#: common-cmds.h:38 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG" -#: parse-options.h:143 +#: parse-options.h:142 msgid "expiry-date" msgstr "период на валидност/запазване" -#: parse-options.h:158 +#: parse-options.h:157 msgid "no-op (backward compatibility)" msgstr "нулева операция (за съвместимост с предишни версии)" -#: parse-options.h:232 +#: parse-options.h:231 msgid "be more verbose" msgstr "повече подробности" -#: parse-options.h:234 +#: parse-options.h:233 msgid "be more quiet" msgstr "по-малко подробности" # FIXME SHA-1 -> SHA1 -#: parse-options.h:240 +#: parse-options.h:239 msgid "use <n> digits to display SHA-1s" msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1" @@ -10674,7 +10912,7 @@ msgstr "" msgid "You need to set your committer info first" msgstr "Първо трябва да зададете информация за себе си" -#: git-am.sh:98 +#: git-am.sh:100 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10685,7 +10923,7 @@ msgstr "" "към\n" "„ORIG_HEAD“" -#: git-am.sh:108 +#: git-am.sh:110 #, sh-format msgid "" "When you have resolved this problem, run \"$cmdline --continue\".\n" @@ -10699,21 +10937,21 @@ msgstr "" "на \n" "кръпки, изпълнете командата „$cmdline --abort“." -#: git-am.sh:124 +#: git-am.sh:126 msgid "Cannot fall back to three-way merge." msgstr "Не може да се премине към тройно сливане." -#: git-am.sh:140 +#: git-am.sh:142 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "В хранилището липсват необходимите обекти BLOB, за да се премине към тройно " "сливане." -#: git-am.sh:142 +#: git-am.sh:144 msgid "Using index info to reconstruct a base tree..." msgstr "Базовото дърво се реконструира от информацията в индекса…" -#: git-am.sh:157 +#: git-am.sh:159 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10721,29 +10959,29 @@ msgstr "" "Кръпката не може да се приложи към обектите BLOB в индекса.\n" "Да не би да сте я редактирали на ръка?" -#: git-am.sh:166 +#: git-am.sh:168 msgid "Falling back to patching base and 3-way merge..." msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…" -#: git-am.sh:182 +#: git-am.sh:185 msgid "Failed to merge in the changes." msgstr "Неуспешно сливане на промените." -#: git-am.sh:277 +#: git-am.sh:280 msgid "Only one StGIT patch series can be applied at once" msgstr "" "Само една серия кръпки от „StGIT“ може да бъде прилагана в даден момент" -#: git-am.sh:364 +#: git-am.sh:367 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "Неподдържан формат на кръпки: „$patch_format“." -#: git-am.sh:366 +#: git-am.sh:369 msgid "Patch format detection failed." msgstr "Форматът на кръпката не може да бъде определен." -#: git-am.sh:398 +#: git-am.sh:407 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." @@ -10751,7 +10989,7 @@ msgstr "" "Опциите „-b“/„--binary“ отдавна не правят нищо и\n" "ще бъдат премахнати в бъдеще. Не ги ползвайте." -#: git-am.sh:496 +#: git-am.sh:507 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" @@ -10759,11 +10997,11 @@ msgstr "" "зададен файл „mbox“." # FIXME better message -#: git-am.sh:501 +#: git-am.sh:512 msgid "Please make up your mind. --skip or --abort?" msgstr "Опциите „--skip“ и „--abort“ са несъвместими." -#: git-am.sh:537 +#: git-am.sh:560 #, sh-format msgid "" "Stray $dotest directory found.\n" @@ -10772,11 +11010,11 @@ msgstr "" "Открита е излишна директория „$dotest“.\n" "Можете да я изтриете с командата „git am --abort“." -#: git-am.sh:545 +#: git-am.sh:568 msgid "Resolve operation not in progress, we are not resuming." msgstr "В момента не тече операция по коригиране и няма как да се продължи." -#: git-am.sh:612 +#: git-am.sh:635 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" @@ -10784,7 +11022,7 @@ msgstr "" "$files)" # FIXME spaces -#: git-am.sh:722 +#: git-am.sh:747 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -10797,35 +11035,35 @@ msgstr "" "на \n" "кръпки, изпълнете командата „$cmdline --abort“." -#: git-am.sh:749 +#: git-am.sh:774 msgid "Patch does not have a valid e-mail address." msgstr "Кръпката не съдържа валиден адрес за е-поща." -#: git-am.sh:796 +#: git-am.sh:821 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "За интерактивно изпълнение е необходимо стандартният\n" "изход да е свързан с терминал, а в момента не е." -#: git-am.sh:800 +#: git-am.sh:825 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. -#: git-am.sh:807 +#: git-am.sh:832 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане " "на всичко" -#: git-am.sh:843 +#: git-am.sh:868 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Прилагане: $FIRSTLINE" -#: git-am.sh:864 +#: git-am.sh:889 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10835,7 +11073,7 @@ msgstr "" "Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n" "кръпка е довела до същите промени и в такъв случай просто пропуснете тази." -#: git-am.sh:872 +#: git-am.sh:897 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" @@ -10843,16 +11081,16 @@ msgstr "" "Индексът все още съдържа неслети промени — възможно е да не сте изпълнили " "„git add“." -#: git-am.sh:888 +#: git-am.sh:913 msgid "No changes -- Patch already applied." msgstr "Без промени — кръпката вече е приложена." -#: git-am.sh:898 +#: git-am.sh:923 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Неуспешно прилагане на кръпката „$msgnum“: „$FIRSTLINE“" -#: git-am.sh:901 +#: git-am.sh:926 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" @@ -10861,7 +11099,7 @@ msgstr "" "Дубликат на проблемната кръпка се намира в:\n" " $dotest/patch" -#: git-am.sh:919 +#: git-am.sh:945 msgid "applying to an empty history" msgstr "прилагане върху празна история" @@ -11031,7 +11269,7 @@ msgstr "" msgid "bisect run success" msgstr "успешно двоично търсене" -#: git-pull.sh:21 +#: git-pull.sh:61 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" @@ -11044,12 +11282,12 @@ msgstr "" "индекса с командата „git add/rm ФАЙЛ“, след което трябва да подадете " "промените." -#: git-pull.sh:25 +#: git-pull.sh:65 msgid "Pull is not possible because you have unmerged files." msgstr "" "Невъзможно е да издърпвате в момента, защото някои файлове не са слети." -#: git-pull.sh:31 +#: git-pull.sh:71 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -11057,11 +11295,11 @@ msgstr "" "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n" "Подайте промените си, преди да започнете ново сливане." -#: git-pull.sh:245 +#: git-pull.sh:285 msgid "updating an unborn branch with changes added to the index" msgstr "обновяване на все още несъздаден клон с промените от индекса" -#: git-pull.sh:269 +#: git-pull.sh:311 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -11071,11 +11309,11 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: доставянето обнови върха на текущия клон. Работното ви\n" "ПРЕДУПРЕЖДЕНИЕ: копие бе тривиално слято от подаване „$orig_head“." -#: git-pull.sh:294 +#: git-pull.sh:336 msgid "Cannot merge multiple branches into empty head" msgstr "Не може да сливате множество клони в празен върхов указател" -#: git-pull.sh:298 +#: git-pull.sh:340 msgid "Cannot rebase onto multiple branches" msgstr "Не може да пребазирате върху повече от един клон" @@ -11286,7 +11524,7 @@ msgstr "" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:238 +#: git-stash.sh:241 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -11295,87 +11533,92 @@ msgstr "" "грешка: командата „git stash save“ не поддържа опция „$option“\n" " За да зададете съобщение, изпълнете „git stash save -- '$option'“" -#: git-stash.sh:259 +#: git-stash.sh:262 msgid "No local changes to save" msgstr "Няма никакви локални промени за скатаване" -#: git-stash.sh:263 +#: git-stash.sh:266 msgid "Cannot initialize stash" msgstr "Скатаването не може да стартира" -#: git-stash.sh:267 +#: git-stash.sh:270 msgid "Cannot save the current status" msgstr "Текущото състояние не може да бъде запазено" -#: git-stash.sh:285 +#: git-stash.sh:288 msgid "Cannot remove worktree changes" msgstr "Промените в работното дърво не могат да бъдат занулени" -#: git-stash.sh:384 +#: git-stash.sh:389 +#, sh-format +msgid "unknown option: $opt" +msgstr "непозната опция: $opt" + +#: git-stash.sh:399 msgid "No stash found." msgstr "Не е открито нищо скатано." -#: git-stash.sh:391 +#: git-stash.sh:406 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Указани са прекалено много версии: „$REV“" -#: git-stash.sh:397 +#: git-stash.sh:412 #, sh-format msgid "$reference is not a valid reference" msgstr "Указателят „$reference“ е грешен" -#: git-stash.sh:425 +#: git-stash.sh:440 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "„$args“ не е подаване, приличащо на нещо скатано" -#: git-stash.sh:436 +#: git-stash.sh:451 #, sh-format msgid "'$args' is not a stash reference" msgstr "„$args“ не е указател към нещо скатано" -#: git-stash.sh:444 +#: git-stash.sh:459 msgid "unable to refresh index" msgstr "индексът не може да бъде обновен" -#: git-stash.sh:448 +#: git-stash.sh:463 msgid "Cannot apply a stash in the middle of a merge" msgstr "По време на сливане не може да приложите нещо скатано" -#: git-stash.sh:456 +#: git-stash.sh:471 msgid "Conflicts in index. Try without --index." msgstr "" "В индекса има конфликти. Пробвайте да изпълните командата без опцията „--" "index“." -#: git-stash.sh:458 +#: git-stash.sh:473 msgid "Could not save index tree" msgstr "Дървото сочено от индекса не може да бъде запазено" -#: git-stash.sh:492 +#: git-stash.sh:507 msgid "Cannot unstage modified files" msgstr "Променените файлове не могат да бъдат извадени от индекса" -#: git-stash.sh:507 +#: git-stash.sh:522 msgid "Index was not unstashed." msgstr "Индексът не е скатан." -#: git-stash.sh:530 +#: git-stash.sh:545 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Изтрито е скатаното „${REV}“ ($s)" -#: git-stash.sh:531 +#: git-stash.sh:546 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "Скатаното „${REV}“ не може да бъде изтрито" -#: git-stash.sh:539 +#: git-stash.sh:554 msgid "No branch name specified" msgstr "Не е указано име на клон" -#: git-stash.sh:611 +#: git-stash.sh:626 msgid "(To restore them type \"git stash apply\")" msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-04-03 08:13+0800\n" -"PO-Revision-Date: 2015-04-07 12:26-0700\n" +"POT-Creation-Date: 2015-06-27 19:17+0800\n" +"PO-Revision-Date: 2015-07-01 22:21-0700\n" "Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.7.5\n" +"X-Generator: Poedit 1.8.1\n" #: advice.c:55 #, c-format @@ -51,7 +51,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list" -#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "L'especificació de camí '%s' no ha coincidit amb cap fitxer" @@ -74,9 +74,9 @@ msgstr "anteposa el prefix a cada nom de camí en l'arxiu" #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150 msgid "file" msgstr "fitxer" @@ -108,7 +108,7 @@ msgstr "comprimeix millor" msgid "list supported archive formats" msgstr "allista els formats d'arxiu admesos" -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77 msgid "repo" msgstr "dipòsit" @@ -124,7 +124,7 @@ msgstr "ordre" msgid "path to the remote git-upload-archive command" msgstr "camí a l'ordre git-upload-archive remot" -#: attr.c:264 +#: attr.c:265 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -271,8 +271,8 @@ msgid "Repository lacks these prerequisite commits:" msgstr "Al dipòsit li manquen aquestes comissions prerequisits:" #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 -#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 +#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330 +#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "la configuració del passeig per revisions ha fallat" @@ -518,16 +518,16 @@ msgstr "" "Errors trobats en la variable de configuració 'diff.dirstat':\n" "%s" -#: diff.c:2956 +#: diff.c:2997 #, c-format msgid "external diff died, stopping at %s" msgstr "El diff external s'ha mort, aturant a %s" -#: diff.c:3351 +#: diff.c:3393 msgid "--follow requires exactly one pathspec" msgstr "--follow requereix exactament una especificació de camí" -#: diff.c:3514 +#: diff.c:3556 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -536,11 +536,19 @@ msgstr "" "S'ha fallat en analitzar el paràmetre d'opció de --dirstat/-X:\n" "%s" -#: diff.c:3528 +#: diff.c:3570 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: %s" +#: dir.c:1852 +msgid "failed to get kernel name and information" +msgstr "s'ha fallat en obtenir el nombre i la informació del nucli" + +#: dir.c:1945 +msgid "Untracked cache is disabled on this system." +msgstr "La memòria cau no seguida està deshabilitada en aquest sistema." + #: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "no s'ha pogut executar el gpg." @@ -587,11 +595,11 @@ msgstr "ordres de git disponibles en '%s'" msgid "git commands available from elsewhere on your $PATH" msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH" -#: help.c:230 -msgid "The most commonly used git commands are:" -msgstr "Les ordres de git més freqüentment usades són:" +#: help.c:246 +msgid "These are common Git commands used in various situations:" +msgstr "Aquests són ordres del Git comunament usats en diverses situacions:" -#: help.c:289 +#: help.c:311 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -600,11 +608,11 @@ msgstr "" "'%s' sembla una ordre git, però no hem pogut\n" "executar-la. Pot ser que git-%s estigui estropejat?" -#: help.c:346 +#: help.c:368 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ai. El vostre sistema no informa de cap ordre de Git." -#: help.c:368 +#: help.c:390 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -613,17 +621,17 @@ msgstr "" "AVÍS: Heu invocat una ordre de Git amb nom '%s', la qual no existeix.\n" "Continuant sota l'assumpció que volíeu dir '%s'" -#: help.c:373 +#: help.c:395 #, c-format msgid "in %0.1f seconds automatically..." msgstr "en %0.1f segons automàticament..." -#: help.c:380 +#: help.c:402 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' no és una ordre de git. Vegeu 'git --help'." -#: help.c:384 help.c:444 +#: help.c:406 help.c:466 msgid "" "\n" "Did you mean this?" @@ -637,16 +645,16 @@ msgstr[1] "" "\n" "Volíeu dir un d'aquests?" -#: help.c:440 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: lockfile.c:283 +#: lockfile.c:345 msgid "BUG: reopen a lockfile that is still open" msgstr "BUG: reobrir un fitxer de bloqueig que encara està obert" -#: lockfile.c:285 +#: lockfile.c:347 msgid "BUG: reopen a lockfile that has been committed" msgstr "BUG: reobrir un fitxer de bloqueig que s'ha comès" @@ -654,8 +662,8 @@ msgstr "BUG: reobrir un fitxer de bloqueig que s'ha comès" msgid "failed to read the cache" msgstr "s'ha fallat en llegir la memòria cau" -#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580 -#: builtin/clone.c:662 +#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594 +#: builtin/clone.c:654 msgid "unable to write new index file" msgstr "no s'ha pogut escriure un fitxer d'índex nou" @@ -673,64 +681,64 @@ msgstr "addinfo_cache ha fallat per al camí '%s'" msgid "error building trees" msgstr "error en construir arbres" -#: merge-recursive.c:688 +#: merge-recursive.c:687 #, c-format msgid "failed to create path '%s'%s" msgstr "s'ha fallat en crear el camí '%s' %s" -#: merge-recursive.c:699 +#: merge-recursive.c:698 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Eliminant %s per a fer espai per al subdirectori\n" -#: merge-recursive.c:713 merge-recursive.c:734 +#: merge-recursive.c:712 merge-recursive.c:733 msgid ": perhaps a D/F conflict?" msgstr ": potser un conflicte D/F?" -#: merge-recursive.c:724 +#: merge-recursive.c:723 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refusant perdre el fitxer no seguit a '%s'" -#: merge-recursive.c:764 +#: merge-recursive.c:763 #, c-format msgid "cannot read object %s '%s'" msgstr "no es pot llegir l'objecte %s '%s'" -#: merge-recursive.c:766 +#: merge-recursive.c:765 #, c-format msgid "blob expected for %s '%s'" msgstr "blob esperat per a %s '%s'" -#: merge-recursive.c:789 builtin/clone.c:321 +#: merge-recursive.c:788 builtin/clone.c:313 #, c-format msgid "failed to open '%s'" msgstr "s'ha fallat en obrir '%s'" -#: merge-recursive.c:797 +#: merge-recursive.c:796 #, c-format msgid "failed to symlink '%s'" msgstr "s'ha fallat en fer l'enllaç simbòlic '%s'" -#: merge-recursive.c:800 +#: merge-recursive.c:799 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "no es sap què fer amb %06o %s '%s'" -#: merge-recursive.c:938 +#: merge-recursive.c:937 msgid "Failed to execute internal merge" msgstr "S'ha fallat en executar la fusió interna" -#: merge-recursive.c:942 +#: merge-recursive.c:941 #, c-format msgid "Unable to add %s to database" msgstr "no s'ha pogut afegir %s a la base de dades" -#: merge-recursive.c:958 +#: merge-recursive.c:957 msgid "unsupported object type in the tree" msgstr "tipus d'objecte no compatible en l'arbre" -#: merge-recursive.c:1033 merge-recursive.c:1047 +#: merge-recursive.c:1032 merge-recursive.c:1046 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -739,7 +747,7 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " "s'ha deixat en l'arbre." -#: merge-recursive.c:1039 merge-recursive.c:1052 +#: merge-recursive.c:1038 merge-recursive.c:1051 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -748,20 +756,20 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " "s'ha deixat en l'arbre a %s." -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "rename" msgstr "canvia de nom" -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "renamed" msgstr "canviat de nom" -#: merge-recursive.c:1149 +#: merge-recursive.c:1148 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s és un directori en %s; afegint com a %s en lloc" -#: merge-recursive.c:1171 +#: merge-recursive.c:1170 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -770,146 +778,146 @@ msgstr "" "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la " "branca \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s" -#: merge-recursive.c:1176 +#: merge-recursive.c:1175 msgid " (left unresolved)" msgstr " (deixat sense resolució)" -#: merge-recursive.c:1230 +#: merge-recursive.c:1229 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de " "nom %s->%s en %s" -#: merge-recursive.c:1260 +#: merge-recursive.c:1259 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Canviant el nom de %s a %s i %s a %s en lloc d'això" -#: merge-recursive.c:1459 +#: merge-recursive.c:1458 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "CONFLICTE (supressió/afegiment): Canvi de nom %s->%s en %s. %s afegit en %s" -#: merge-recursive.c:1469 +#: merge-recursive.c:1468 #, c-format msgid "Adding merged %s" msgstr "Afegint %s fusionat" -#: merge-recursive.c:1474 merge-recursive.c:1672 +#: merge-recursive.c:1473 merge-recursive.c:1671 #, c-format msgid "Adding as %s instead" msgstr "Afegint com a %s en lloc d'això" -#: merge-recursive.c:1525 +#: merge-recursive.c:1524 #, c-format msgid "cannot read object %s" msgstr "no es pot llegir l'objecte %s" -#: merge-recursive.c:1528 +#: merge-recursive.c:1527 #, c-format msgid "object %s is not a blob" msgstr "L'objecte %s no és un blob" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modify" msgstr "modifica" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modified" msgstr "modificat" -#: merge-recursive.c:1586 +#: merge-recursive.c:1585 msgid "content" msgstr "contingut" -#: merge-recursive.c:1593 +#: merge-recursive.c:1592 msgid "add/add" msgstr "afegiment/afegiment" -#: merge-recursive.c:1627 +#: merge-recursive.c:1626 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s saltat (el fusionat és igual a l'existent)" -#: merge-recursive.c:1641 +#: merge-recursive.c:1640 #, c-format msgid "Auto-merging %s" msgstr "Autofusionant %s" -#: merge-recursive.c:1645 git-submodule.sh:1150 +#: merge-recursive.c:1644 git-submodule.sh:1150 msgid "submodule" msgstr "submòdul" -#: merge-recursive.c:1646 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTE (%s): Conflicte de fusió en %s" -#: merge-recursive.c:1732 +#: merge-recursive.c:1731 #, c-format msgid "Removing %s" msgstr "Eliminant %s" -#: merge-recursive.c:1757 +#: merge-recursive.c:1756 msgid "file/directory" msgstr "fitxer/directori" -#: merge-recursive.c:1763 +#: merge-recursive.c:1762 msgid "directory/file" msgstr "directori/fitxer" -#: merge-recursive.c:1768 +#: merge-recursive.c:1767 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLICTE (%s): Hi ha un directori amb nom %s en %s. Afegint %s com a %s" -#: merge-recursive.c:1778 +#: merge-recursive.c:1777 #, c-format msgid "Adding %s" msgstr "Afegint %s" -#: merge-recursive.c:1795 +#: merge-recursive.c:1794 msgid "Fatal merge failure, shouldn't happen." msgstr "Fallat de fusió fatal; això no ha de passar." -#: merge-recursive.c:1814 +#: merge-recursive.c:1813 msgid "Already up-to-date!" msgstr "Ja al dia!" -#: merge-recursive.c:1823 +#: merge-recursive.c:1822 #, c-format msgid "merging of trees %s and %s failed" msgstr "la fusió dels arbres %s i %s ha fallat" -#: merge-recursive.c:1853 +#: merge-recursive.c:1852 #, c-format msgid "Unprocessed path??? %s" msgstr "Camí no processat??? %s" -#: merge-recursive.c:1901 +#: merge-recursive.c:1900 msgid "Merging:" msgstr "Fusionant:" -#: merge-recursive.c:1914 +#: merge-recursive.c:1913 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "s'ha trobat %u avantpassat:" msgstr[1] "s'han trobat %u avantpassats:" -#: merge-recursive.c:1951 +#: merge-recursive.c:1950 msgid "merge returned no commit" msgstr "la fusió no ha retornat cap comissió" -#: merge-recursive.c:2008 +#: merge-recursive.c:2007 #, c-format msgid "Could not parse object '%s'" msgstr "No s'ha pogut analitzar l'objecte '%s'" -#: merge-recursive.c:2019 builtin/merge.c:667 +#: merge-recursive.c:2018 builtin/merge.c:645 msgid "Unable to write index." msgstr "No s'ha pogut escriure l'índex." @@ -934,7 +942,7 @@ msgstr "Refusant reescriure les notes en %s (fora de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Valor dolent de %s: '%s'" -#: object.c:241 +#: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "no s'ha pogut analitzar l'objecte: %s" @@ -1035,11 +1043,11 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "no s'ha pogut analitzar el format --pretty" -#: progress.c:225 +#: progress.c:236 msgid "done" msgstr "fet" -#: read-cache.c:1275 +#: read-cache.c:1295 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1048,7 +1056,7 @@ msgstr "" "index.version establert, però el valor no és vàlid.\n" "Usant la versió %i" -#: read-cache.c:1285 +#: read-cache.c:1305 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1057,51 +1065,94 @@ msgstr "" "GIT_INDEX_VERSION establert, però el valor no és vàlid.\n" "Usant la versió %i" -#: remote.c:782 +#: remote.c:792 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No es pot obtenir ambdós %s i %s a %s" -#: remote.c:786 +#: remote.c:796 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s generalment segueix %s, no %s" -#: remote.c:790 +#: remote.c:800 #, c-format msgid "%s tracks both %s and %s" msgstr "%s segueix ambdós %s i %s" -#: remote.c:798 +#: remote.c:808 msgid "Internal error" msgstr "Error intern" -#: remote.c:1980 +#: remote.c:1723 remote.c:1766 +msgid "HEAD does not point to a branch" +msgstr "HEAD no assenyala cap branca" + +#: remote.c:1732 +#, c-format +msgid "no such branch: '%s'" +msgstr "no hi ha tal branca: '%s'" + +#: remote.c:1735 +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "cap font configurada per a la branca '%s'" + +#: remote.c:1741 +#, c-format +msgid "upstream branch '%s' not stored as a remote-tracking branch" +msgstr "La branca font '%s' no s'emmagatzema com a branca amb seguiment remot" + +#: remote.c:1756 +#, c-format +msgid "push destination '%s' on remote '%s' has no local tracking branch" +msgstr "" +"el destí de pujada '%s' en el remot '%s' no té cap branca seguidora local" + +#: remote.c:1771 +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "la branca '%s' no té cap remot al qual pujar" + +#: remote.c:1782 +#, c-format +msgid "push refspecs for '%s' do not include '%s'" +msgstr "les especificacions de referència de '%s' no inclouen '%s'" + +#: remote.c:1795 +msgid "push has no destination (push.default is 'nothing')" +msgstr "push no té destí (push.default és 'nothing')" + +#: remote.c:1817 +msgid "cannot resolve 'simple' push to a single destination" +msgstr "no es pot resoldre una pujada 'simple' a un sol destí" + +#: remote.c:2124 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "La vostra branca està basada en '%s', però la font no hi és.\n" -#: remote.c:1984 +#: remote.c:2128 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n" -#: remote.c:1987 +#: remote.c:2131 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "La vostra branca està al dia amb '%s'.\n" -#: remote.c:1991 +#: remote.c:2135 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "La vostra branca està davant de '%s' per %d comissió.\n" msgstr[1] "La vostra branca està davant de '%s' per %d comissions.\n" -#: remote.c:1997 +#: remote.c:2141 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n" -#: remote.c:2000 +#: remote.c:2144 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1113,11 +1164,11 @@ msgstr[1] "" "La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se " "ràpidament.\n" -#: remote.c:2008 +#: remote.c:2152 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n" -#: remote.c:2011 +#: remote.c:2155 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1132,11 +1183,11 @@ msgstr[1] "" "La vostra branca i '%s' s'han divergit,\n" "i tenen %d i %d comissions distintes cada una, respectivament.\n" -#: remote.c:2021 +#: remote.c:2165 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n" -#: revision.c:2348 +#: revision.c:2366 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent és incompatible amb --bisect" @@ -1153,22 +1204,22 @@ msgstr "dup2(%d,%d) ha fallat" msgid "failed to sign the push certificate" msgstr "s'ha fallat en firmar el certificat de pujada" -#: send-pack.c:356 +#: send-pack.c:378 msgid "the receiving end does not support --signed push" msgstr "el destí receptor no admet pujar --signed" -#: send-pack.c:366 +#: send-pack.c:389 msgid "the receiving end does not support --atomic push" msgstr "el destí receptor no admet pujar --atomic" -#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 -#: builtin/merge.c:1005 +#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" msgstr "No s'ha pogut obrir '%s' per a escriptura" -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 -#: builtin/merge.c:1010 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 +#: builtin/merge.c:988 #, c-format msgid "Could not write to '%s'" msgstr "No s'ha pogut escriure al '%s'" @@ -1367,7 +1418,7 @@ msgstr "no es pot resoldre HEAD" msgid "cannot abort from a branch yet to be born" msgstr "no es pot avortar des d'una branca que encara ha de nàixer" -#: sequencer.c:908 builtin/apply.c:4288 +#: sequencer.c:908 builtin/apply.c:4291 #, c-format msgid "cannot open %s: %s" msgstr "no es pot obrir %s: %s" @@ -1410,7 +1461,12 @@ msgstr "No es pot revertir com a comissió inicial" msgid "Can't cherry-pick into empty head" msgstr "No es pot recollir cireres en un cap buit" -#: sha1_name.c:440 +#: setup.c:243 +#, c-format +msgid "failed to read %s" +msgstr "s'ha fallat en llegir %s" + +#: sha1_name.c:453 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" @@ -1434,26 +1490,6 @@ msgstr "" "suprimiu-les. Desactiveu aquest missatge executant\n" "\"git config advice.objectNameWarning false\"" -#: sha1_name.c:1068 -msgid "HEAD does not point to a branch" -msgstr "HEAD no assenyala cap branca" - -#: sha1_name.c:1071 -#, c-format -msgid "No such branch: '%s'" -msgstr "No hi ha tal branca: '%s'" - -#: sha1_name.c:1073 -#, c-format -msgid "No upstream configured for branch '%s'" -msgstr "Cap font configurada per a la branca '%s'" - -#: sha1_name.c:1077 -#, c-format -msgid "Upstream branch '%s' not stored as a remote-tracking branch" -msgstr "" -"La branca font '%s' no s'emmagatzema com a branca que segueixi al remot" - #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -1479,12 +1515,7 @@ msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s" msgid "staging updated .gitmodules failed" msgstr "L'allistament del .gitmodules actualitzat ha fallat" -#: submodule.c:1109 builtin/init-db.c:371 -#, c-format -msgid "Could not create git link %s" -msgstr "No s'ha pogut crear l'enllaç de git %s" - -#: submodule.c:1120 +#: submodule.c:1115 #, c-format msgid "Could not set core.worktree in %s" msgstr "No s'ha pogut establir core.worktree en %s" @@ -1514,7 +1545,7 @@ msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'" msgid "could not read from stdin" msgstr "No s'ha pogut llegir des d'stdin" -#: unpack-trees.c:202 +#: unpack-trees.c:203 msgid "Checking out files" msgstr "Agafant fitxers" @@ -1570,6 +1601,21 @@ msgstr "no hi ha tal usuari" msgid "unable to get current working directory" msgstr "no s'ha pogut obtenir el directori de treball actual" +#: wrapper.c:575 +#, c-format +msgid "could not open %s for writing" +msgstr "no s'ha pogut obrir '%s' per a escriptura" + +#: wrapper.c:587 +#, c-format +msgid "could not write to %s" +msgstr "no s'ha pogut escriure a %s" + +#: wrapper.c:593 +#, c-format +msgid "could not close %s" +msgstr "no s'ha pogut tancar %s" + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Camins sense fusionar:" @@ -1597,11 +1643,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)" -#: wt-status.c:198 wt-status.c:878 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "Canvis a cometre:" -#: wt-status.c:216 wt-status.c:887 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "Canvis no allistats per a cometre:" @@ -1712,15 +1758,15 @@ msgstr "contingut no seguit, " msgid "bug: unhandled diff status %c" msgstr "bug: estat de diferència no gestionat %c" -#: wt-status.c:753 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Submòduls canviats però no actualitzats:" -#: wt-status.c:755 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Canvis de submòdul a cometre:" -#: wt-status.c:835 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1728,191 +1774,191 @@ msgstr "" "No toqueu la línia de sobre.\n" "Tot el que hi ha a sota s'eliminarà." -#: wt-status.c:946 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Teniu camins sense fusionar." -#: wt-status.c:949 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (arregleu els conflictes i executeu \"git commit\")" -#: wt-status.c:952 +#: wt-status.c:955 msgid "All conflicts fixed but you are still merging." msgstr "Tots els conflictes estan arreglats però encara esteu fusionant." -#: wt-status.c:955 +#: wt-status.c:958 msgid " (use \"git commit\" to conclude merge)" msgstr " (useu \"git commit\" per a concloure la fusió)" -#: wt-status.c:965 +#: wt-status.c:968 msgid "You are in the middle of an am session." msgstr "Esteu enmig d'una sessió am." -#: wt-status.c:968 +#: wt-status.c:971 msgid "The current patch is empty." msgstr "El pedaç actual està buit." -#: wt-status.c:972 +#: wt-status.c:975 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (arregleu els conflictes i després executeu \"git am --continue\")" -#: wt-status.c:974 +#: wt-status.c:977 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)" -#: wt-status.c:976 +#: wt-status.c:979 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (useu \"git am --abort\" per a restaurar la branca original)" -#: wt-status.c:1036 wt-status.c:1053 +#: wt-status.c:1039 wt-status.c:1056 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Actualment esteu rebasant la branca '%s' en '%s'." -#: wt-status.c:1041 wt-status.c:1058 +#: wt-status.c:1044 wt-status.c:1061 msgid "You are currently rebasing." msgstr "Actualment esteu rebasant." -#: wt-status.c:1044 +#: wt-status.c:1047 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (arregleu els conflictes i després executeu \"git rebase --continue\")" -#: wt-status.c:1046 +#: wt-status.c:1049 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (useu \"git rebase --skip\" per a saltar aquest pedaç)" -#: wt-status.c:1048 +#: wt-status.c:1051 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (useu \"git rebase --abort\" per a agafar la branca original)" -#: wt-status.c:1061 +#: wt-status.c:1064 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tots els conflictes arreglats: executeu \"git rebase --continue\")" -#: wt-status.c:1065 +#: wt-status.c:1068 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" "Actualment esteu dividint una comissió mentre rebaseu la branca '%s' en '%s'." -#: wt-status.c:1070 +#: wt-status.c:1073 msgid "You are currently splitting a commit during a rebase." msgstr "Actualment esteu dividint una comissió durant una rebase." -#: wt-status.c:1073 +#: wt-status.c:1076 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Una vegada que el vostre directori de treball sigui net, executeu \"git " "rebase --continue\")" -#: wt-status.c:1077 +#: wt-status.c:1080 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Actualment esteu editant una comissió mentre rebaseu la branca '%s' en '%s'." -#: wt-status.c:1082 +#: wt-status.c:1085 msgid "You are currently editing a commit during a rebase." msgstr "Actualment esteu editant una comissió durant una rebase." -#: wt-status.c:1085 +#: wt-status.c:1088 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)" -#: wt-status.c:1087 +#: wt-status.c:1090 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (useu \"git rebase --continue\" una vegada que esteu satisfet amb els " "vostres canvis)" -#: wt-status.c:1097 +#: wt-status.c:1100 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Actualment esteu recollint com a cirera la comissió %s." -#: wt-status.c:1102 +#: wt-status.c:1105 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" -#: wt-status.c:1105 +#: wt-status.c:1108 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tots els conflictes arreglats: executeu \"git cherry-pick --continue\")" -#: wt-status.c:1107 +#: wt-status.c:1110 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de recull de " "cireres)" -#: wt-status.c:1116 +#: wt-status.c:1119 #, c-format msgid "You are currently reverting commit %s." msgstr "Actualment esteu revertint la comissió %s." -#: wt-status.c:1121 +#: wt-status.c:1124 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" -#: wt-status.c:1124 +#: wt-status.c:1127 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git revert --continue\")" -#: wt-status.c:1126 +#: wt-status.c:1129 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" -#: wt-status.c:1137 +#: wt-status.c:1140 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'." -#: wt-status.c:1141 +#: wt-status.c:1144 msgid "You are currently bisecting." msgstr "Actualment esteu bisecant." -#: wt-status.c:1144 +#: wt-status.c:1147 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (useu \"git bisect reset\" per a tornar a la branca original)" -#: wt-status.c:1321 +#: wt-status.c:1324 msgid "On branch " msgstr "En la branca " -#: wt-status.c:1328 +#: wt-status.c:1331 msgid "rebase in progress; onto " msgstr "rebase en progrés; en " -#: wt-status.c:1333 +#: wt-status.c:1336 msgid "HEAD detached at " msgstr "HEAD separat a " -#: wt-status.c:1335 +#: wt-status.c:1338 msgid "HEAD detached from " msgstr "HEAD separat de " -#: wt-status.c:1338 +#: wt-status.c:1341 msgid "Not currently on any branch." msgstr "Actualment no en cap branca." -#: wt-status.c:1355 +#: wt-status.c:1358 msgid "Initial commit" msgstr "Comissió inicial" -#: wt-status.c:1369 +#: wt-status.c:1372 msgid "Untracked files" msgstr "Fitxers no seguits" -#: wt-status.c:1371 +#: wt-status.c:1374 msgid "Ignored files" msgstr "Fitxers ignorats" -#: wt-status.c:1375 +#: wt-status.c:1378 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1924,31 +1970,31 @@ msgstr "" "oblidar-vos d'afegir fitxers nous per vós mateix (vegeu\n" "'git help status')." -#: wt-status.c:1381 +#: wt-status.c:1384 #, c-format msgid "Untracked files not listed%s" msgstr "Els fitxers no seguits no estan llistats%s" -#: wt-status.c:1383 +#: wt-status.c:1386 msgid " (use -u option to show untracked files)" msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)" -#: wt-status.c:1389 +#: wt-status.c:1392 msgid "No changes" msgstr "Sense canvis" -#: wt-status.c:1394 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" -#: wt-status.c:1397 +#: wt-status.c:1400 #, c-format msgid "no changes added to commit\n" msgstr "no hi ha canvis afegits a cometre\n" -#: wt-status.c:1400 +#: wt-status.c:1403 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1957,51 +2003,51 @@ msgstr "" "no hi ha res afegit a cometre però fitxers no seguits estan presents (useu " "\"git add\" per a seguir-los)\n" -#: wt-status.c:1403 +#: wt-status.c:1406 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n" -#: wt-status.c:1406 +#: wt-status.c:1409 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-" "los)\n" -#: wt-status.c:1409 wt-status.c:1414 +#: wt-status.c:1412 wt-status.c:1417 #, c-format msgid "nothing to commit\n" msgstr "no hi ha res a cometre\n" -#: wt-status.c:1412 +#: wt-status.c:1415 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" -#: wt-status.c:1416 +#: wt-status.c:1419 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "no hi ha res a cometre, directori de treball net\n" -#: wt-status.c:1525 +#: wt-status.c:1528 msgid "HEAD (no branch)" msgstr "HEAD (sense branca)" -#: wt-status.c:1531 +#: wt-status.c:1534 msgid "Initial commit on " msgstr "Comissió inicial en " -#: wt-status.c:1563 +#: wt-status.c:1561 msgid "gone" msgstr "no hi és" -#: wt-status.c:1565 wt-status.c:1573 +#: wt-status.c:1563 wt-status.c:1571 msgid "behind " msgstr "darrere " -#: compat/precompose_utf8.c:55 builtin/clone.c:360 +#: compat/precompose_utf8.c:55 builtin/clone.c:352 #, c-format msgid "failed to unlink '%s'" msgstr "s'ha fallat en desenllaçar '%s'" @@ -2028,7 +2074,7 @@ msgstr "elimina '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Canvis no allistats després d'actualitzar l'índex:" -#: builtin/add.c:194 builtin/rev-parse.c:785 +#: builtin/add.c:194 builtin/rev-parse.c:796 msgid "Could not read the index" msgstr "No s'ha pogut llegir l'índex" @@ -2041,116 +2087,120 @@ msgstr "No s'ha pogut obrir '%s' per a escriptura." msgid "Could not write patch" msgstr "No s'ha pogut escriure el pedaç" -#: builtin/add.c:214 +#: builtin/add.c:212 +msgid "editing patch failed" +msgstr "l'edició del pedaç ha fallat" + +#: builtin/add.c:215 #, c-format msgid "Could not stat '%s'" msgstr "No s'ha pogut fer stat a '%s'" -#: builtin/add.c:216 +#: builtin/add.c:217 msgid "Empty patch. Aborted." msgstr "El pedaç és buit. Avortat." -#: builtin/add.c:221 +#: builtin/add.c:222 #, c-format msgid "Could not apply '%s'" msgstr "No s'ha pogut aplicar '%s'" -#: builtin/add.c:231 +#: builtin/add.c:232 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 -#: builtin/rm.c:269 +#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369 +#: builtin/rm.c:268 msgid "dry run" msgstr "marxa en sec" -#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "sigues detallat" -#: builtin/add.c:251 +#: builtin/add.c:252 msgid "interactive picking" msgstr "recull interactiu" -#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286 msgid "select hunks interactively" msgstr "selecciona els trossos interactivament" -#: builtin/add.c:253 +#: builtin/add.c:254 msgid "edit current diff and apply" msgstr "edita la diferència actual i aplica-la" -#: builtin/add.c:254 +#: builtin/add.c:255 msgid "allow adding otherwise ignored files" msgstr "permet afegir fitxers que d'altra manera s'ignoren" -#: builtin/add.c:255 +#: builtin/add.c:256 msgid "update tracked files" msgstr "actualitza els fitxers seguits" -#: builtin/add.c:256 +#: builtin/add.c:257 msgid "record only the fact that the path will be added later" msgstr "registra només el fet que el camí s'afegirà més tard" -#: builtin/add.c:257 +#: builtin/add.c:258 msgid "add changes from all tracked and untracked files" msgstr "afegeix els canvis de tots els fitxers seguits i no seguits" -#: builtin/add.c:260 +#: builtin/add.c:261 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)" -#: builtin/add.c:262 +#: builtin/add.c:263 msgid "don't add, only refresh the index" msgstr "no afegeixis, només actualitza l'índex" -#: builtin/add.c:263 +#: builtin/add.c:264 msgid "just skip files which cannot be added because of errors" msgstr "només omet els fitxers que no es poden afegir a causa d'errors" -#: builtin/add.c:264 +#: builtin/add.c:265 msgid "check if - even missing - files are ignored in dry run" msgstr "" "comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec" -#: builtin/add.c:286 +#: builtin/add.c:287 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Useu -f si realment els voleu afegir.\n" -#: builtin/add.c:293 +#: builtin/add.c:294 msgid "adding files failed" msgstr "l'afegiment de fitxers ha fallat" -#: builtin/add.c:329 +#: builtin/add.c:330 msgid "-A and -u are mutually incompatible" msgstr "-A i -u són mutualment incompatibles" -#: builtin/add.c:336 +#: builtin/add.c:337 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run" -#: builtin/add.c:357 +#: builtin/add.c:358 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Res especificat, res afegit.\n" -#: builtin/add.c:358 +#: builtin/add.c:359 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Potser volíeu dir 'git add .'?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 msgid "index file corrupt" msgstr "fitxer d'índex malmès" -#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "no s'ha pogut escriure un fitxer d'índex nou" @@ -2231,77 +2281,77 @@ msgstr[1] "" "a la capçalera de git diff li manca informació de nom de fitxer en eliminar " "%d components de nom de camí inicial (línia %d)" -#: builtin/apply.c:1656 +#: builtin/apply.c:1659 msgid "new file depends on old contents" msgstr "el fitxer nou depèn dels continguts antics" -#: builtin/apply.c:1658 +#: builtin/apply.c:1661 msgid "deleted file still has contents" msgstr "el fitxer suprimit encara té continguts" -#: builtin/apply.c:1684 +#: builtin/apply.c:1687 #, c-format msgid "corrupt patch at line %d" msgstr "el pedaç és malmès a la línia %d" -#: builtin/apply.c:1720 +#: builtin/apply.c:1723 #, c-format msgid "new file %s depends on old contents" msgstr "el fitxer nou %s depèn dels continguts antics" -#: builtin/apply.c:1722 +#: builtin/apply.c:1725 #, c-format msgid "deleted file %s still has contents" msgstr "el fitxer suprimit %s encara té continguts" -#: builtin/apply.c:1725 +#: builtin/apply.c:1728 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** avís: el fitxer %s queda buit però no es suprimeix" -#: builtin/apply.c:1871 +#: builtin/apply.c:1874 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "pedaç binari malmès a la línia %d: %.*s" -#: builtin/apply.c:1900 +#: builtin/apply.c:1903 #, c-format msgid "unrecognized binary patch at line %d" msgstr "pedaç binari no reconegut a la línia %d" -#: builtin/apply.c:2051 +#: builtin/apply.c:2054 #, c-format msgid "patch with only garbage at line %d" msgstr "pedaç amb només escombraries a la línia %d" -#: builtin/apply.c:2141 +#: builtin/apply.c:2144 #, c-format msgid "unable to read symlink %s" msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" -#: builtin/apply.c:2145 +#: builtin/apply.c:2148 #, c-format msgid "unable to open or read %s" msgstr "no s'ha pogut obrir o llegir %s" -#: builtin/apply.c:2778 +#: builtin/apply.c:2781 #, c-format msgid "invalid start of line: '%c'" msgstr "inici de línia no vàlid: '%c'" -#: builtin/apply.c:2897 +#: builtin/apply.c:2900 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "El tros #%d ha tingut éxit a %d (desplaçament %d línia)." msgstr[1] "El tros #%d ha tingut éxit a %d (desplaçament %d línies)." -#: builtin/apply.c:2909 +#: builtin/apply.c:2912 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d" -#: builtin/apply.c:2915 +#: builtin/apply.c:2918 #, c-format msgid "" "while searching for:\n" @@ -2310,343 +2360,343 @@ msgstr "" "tot cercant:\n" "%.*s" -#: builtin/apply.c:2935 +#: builtin/apply.c:2938 #, c-format msgid "missing binary patch data for '%s'" msgstr "manquen les dades de pedaç binari de '%s'" -#: builtin/apply.c:3036 +#: builtin/apply.c:3039 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el pedaç binari no s'aplica a '%s'" -#: builtin/apply.c:3042 +#: builtin/apply.c:3045 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)" -#: builtin/apply.c:3063 +#: builtin/apply.c:3066 #, c-format msgid "patch failed: %s:%ld" msgstr "el pedaç ha fallat: %s:%ld" -#: builtin/apply.c:3187 +#: builtin/apply.c:3190 #, c-format msgid "cannot checkout %s" msgstr "no es pot agafar %s" -#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 +#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291 #, c-format msgid "read of %s failed" msgstr "la lectura de %s ha fallat" -#: builtin/apply.c:3240 +#: builtin/apply.c:3243 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "llegint de '%s' més enllà d'un enllaç simbòlic" -#: builtin/apply.c:3268 builtin/apply.c:3490 +#: builtin/apply.c:3271 builtin/apply.c:3493 #, c-format msgid "path %s has been renamed/deleted" msgstr "el camí %s s'ha canviat de nom / s'ha suprimit" -#: builtin/apply.c:3349 builtin/apply.c:3504 +#: builtin/apply.c:3352 builtin/apply.c:3507 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existeix en l'índex" -#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 +#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3358 builtin/apply.c:3512 +#: builtin/apply.c:3361 builtin/apply.c:3515 #, c-format msgid "%s: does not match index" msgstr "%s: no coincideix amb l'índex" -#: builtin/apply.c:3460 +#: builtin/apply.c:3463 msgid "removal patch leaves file contents" msgstr "el pedaç de supressió deixa els continguts dels fitxers" -#: builtin/apply.c:3529 +#: builtin/apply.c:3532 #, c-format msgid "%s: wrong type" msgstr "%s: tipus erroni" -#: builtin/apply.c:3531 +#: builtin/apply.c:3534 #, c-format msgid "%s has type %o, expected %o" msgstr "%s és del tipus %o, s'esperava %o" -#: builtin/apply.c:3690 builtin/apply.c:3692 +#: builtin/apply.c:3693 builtin/apply.c:3695 #, c-format msgid "invalid path '%s'" msgstr "camí no vàlid: %s" -#: builtin/apply.c:3747 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in index" msgstr "%s: ja existeix en l'índex" -#: builtin/apply.c:3750 +#: builtin/apply.c:3753 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ja existeix en el directori de treball" -#: builtin/apply.c:3770 +#: builtin/apply.c:3773 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)" -#: builtin/apply.c:3775 +#: builtin/apply.c:3778 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s" -#: builtin/apply.c:3795 +#: builtin/apply.c:3798 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic" -#: builtin/apply.c:3799 +#: builtin/apply.c:3802 #, c-format msgid "%s: patch does not apply" msgstr "%s: el pedaç no aplica" -#: builtin/apply.c:3813 +#: builtin/apply.c:3816 #, c-format msgid "Checking patch %s..." msgstr "Comprovant el pedaç %s..." -#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry ha fallat per al camí '%s'" -#: builtin/apply.c:4049 +#: builtin/apply.c:4052 #, c-format msgid "unable to remove %s from index" msgstr "no s'ha pogut eliminar %s de l'índex" -#: builtin/apply.c:4078 +#: builtin/apply.c:4081 #, c-format msgid "corrupt patch for submodule %s" msgstr "pedaç corrupte per al submòdul %s" -#: builtin/apply.c:4082 +#: builtin/apply.c:4085 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'" -#: builtin/apply.c:4087 +#: builtin/apply.c:4090 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat " "%s" -#: builtin/apply.c:4090 builtin/apply.c:4198 +#: builtin/apply.c:4093 builtin/apply.c:4201 #, c-format msgid "unable to add cache entry for %s" msgstr "no s'ha pogut afegir una entrada de cau per a %s" -#: builtin/apply.c:4123 +#: builtin/apply.c:4126 #, c-format msgid "closing file '%s'" msgstr "tancant el fitxer '%s'" -#: builtin/apply.c:4172 +#: builtin/apply.c:4175 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no s'ha pogut escriure el fitxer '%s' mode %o" -#: builtin/apply.c:4259 +#: builtin/apply.c:4262 #, c-format msgid "Applied patch %s cleanly." msgstr "El pedaç %s s'ha aplicat netament." -#: builtin/apply.c:4267 +#: builtin/apply.c:4270 msgid "internal error" msgstr "error intern" -#: builtin/apply.c:4270 +#: builtin/apply.c:4273 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Aplicant el pedaç %%s amb %d rebuig" msgstr[1] "Aplicant el pedaç %%s amb %d rebuitjos" -#: builtin/apply.c:4280 +#: builtin/apply.c:4283 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncant el nom del fitxer .rej a %.*s.rej" -#: builtin/apply.c:4301 +#: builtin/apply.c:4304 #, c-format msgid "Hunk #%d applied cleanly." msgstr "El tros #%d s'ha aplicat netament." -#: builtin/apply.c:4304 +#: builtin/apply.c:4307 #, c-format msgid "Rejected hunk #%d." msgstr "S'ha rebutjat el tros #%d." -#: builtin/apply.c:4394 +#: builtin/apply.c:4397 msgid "unrecognized input" msgstr "entrada no reconeguda" -#: builtin/apply.c:4405 +#: builtin/apply.c:4408 msgid "unable to read index file" msgstr "no es pot llegir el fitxer d'índex" -#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85 #: builtin/fetch.c:92 msgid "path" msgstr "camí" -#: builtin/apply.c:4523 +#: builtin/apply.c:4526 msgid "don't apply changes matching the given path" msgstr "no apliquis els canvis que coincideixin amb el camí donat" -#: builtin/apply.c:4526 +#: builtin/apply.c:4529 msgid "apply changes matching the given path" msgstr "aplica els canvis que coincideixin amb el camí donat" -#: builtin/apply.c:4528 +#: builtin/apply.c:4531 msgid "num" msgstr "número" -#: builtin/apply.c:4529 +#: builtin/apply.c:4532 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "elimina <nombre> barres obliqües inicials dels camins de diferència " "tradicionals" -#: builtin/apply.c:4532 +#: builtin/apply.c:4535 msgid "ignore additions made by the patch" msgstr "ignora afegiments fets pel pedaç" -#: builtin/apply.c:4534 +#: builtin/apply.c:4537 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada" -#: builtin/apply.c:4538 +#: builtin/apply.c:4541 msgid "show number of added and deleted lines in decimal notation" msgstr "mostra el nombre de línies afegides i suprimides en notació decimal" -#: builtin/apply.c:4540 +#: builtin/apply.c:4543 msgid "instead of applying the patch, output a summary for the input" msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada" -#: builtin/apply.c:4542 +#: builtin/apply.c:4545 msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable" -#: builtin/apply.c:4544 +#: builtin/apply.c:4547 msgid "make sure the patch is applicable to the current index" msgstr "assegura que el pedaç sigui aplicable a l'índex actual" -#: builtin/apply.c:4546 +#: builtin/apply.c:4549 msgid "apply a patch without touching the working tree" msgstr "aplica un pedaç sense tocar l'arbre de treball" -#: builtin/apply.c:4548 +#: builtin/apply.c:4551 msgid "accept a patch that touches outside the working area" msgstr "accepta un pedaç que toqui fora de l'àrea de treball" -#: builtin/apply.c:4550 +#: builtin/apply.c:4553 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)" -#: builtin/apply.c:4552 +#: builtin/apply.c:4555 msgid "attempt three-way merge if a patch does not apply" msgstr "intenta una fusió de tres vies si el pedaç no s'aplica" -#: builtin/apply.c:4554 +#: builtin/apply.c:4557 msgid "build a temporary index based on embedded index information" msgstr "construeix un índex temporal basat en la informació d'índex incrustada" -#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 +#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "els camins es separen amb el caràcter NUL" -#: builtin/apply.c:4559 +#: builtin/apply.c:4562 msgid "ensure at least <n> lines of context match" msgstr "assegura't que almenys <n> línies de context coincideixin" -#: builtin/apply.c:4560 +#: builtin/apply.c:4563 msgid "action" msgstr "acció" -#: builtin/apply.c:4561 +#: builtin/apply.c:4564 msgid "detect new or modified lines that have whitespace errors" msgstr "" "detecta les línies noves o modificades que tinguin errors d'espai en blanc" -#: builtin/apply.c:4564 builtin/apply.c:4567 +#: builtin/apply.c:4567 builtin/apply.c:4570 msgid "ignore changes in whitespace when finding context" msgstr "ignora els canvis d'espai en blanc en cercar context" -#: builtin/apply.c:4570 +#: builtin/apply.c:4573 msgid "apply the patch in reverse" msgstr "aplica el pedaç al revés" -#: builtin/apply.c:4572 +#: builtin/apply.c:4575 msgid "don't expect at least one line of context" msgstr "no esperis almenys una línia de context" -#: builtin/apply.c:4574 +#: builtin/apply.c:4577 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixa els trossos rebutjats en fitxers *.reg coresspondents" -#: builtin/apply.c:4576 +#: builtin/apply.c:4579 msgid "allow overlapping hunks" msgstr "permet trossos encavalcants" -#: builtin/apply.c:4579 +#: builtin/apply.c:4582 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolera una línia nova incorrectament detectada al final del fitxer" -#: builtin/apply.c:4582 +#: builtin/apply.c:4585 msgid "do not trust the line counts in the hunk headers" msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos" -#: builtin/apply.c:4584 +#: builtin/apply.c:4587 msgid "root" msgstr "arrel" -#: builtin/apply.c:4585 +#: builtin/apply.c:4588 msgid "prepend <root> to all filenames" msgstr "anteposa <arrel> a tots els noms de fitxer" -#: builtin/apply.c:4607 +#: builtin/apply.c:4610 msgid "--3way outside a repository" msgstr "--3way fora d'un dipòsit" -#: builtin/apply.c:4615 +#: builtin/apply.c:4618 msgid "--index outside a repository" msgstr "--index fora d'un dipòsit" -#: builtin/apply.c:4618 +#: builtin/apply.c:4621 msgid "--cached outside a repository" msgstr "--cached fora d'un dipòsit" -#: builtin/apply.c:4637 +#: builtin/apply.c:4640 #, c-format msgid "can't open patch '%s'" msgstr "no es pot obrir el pedaç '%s'" -#: builtin/apply.c:4651 +#: builtin/apply.c:4654 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d error d'espai en blanc omès" msgstr[1] "%d errors d'espai en blanc omesos" -#: builtin/apply.c:4657 builtin/apply.c:4667 +#: builtin/apply.c:4660 builtin/apply.c:4670 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2700,11 +2750,11 @@ msgstr "realitza 'git bisect next'" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissió actual" -#: builtin/blame.c:30 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +#: builtin/blame.c:31 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer" -#: builtin/blame.c:35 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)" @@ -2832,7 +2882,7 @@ msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..." msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>" -#: builtin/branch.c:152 +#: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2842,7 +2892,7 @@ msgstr "" " '%s', però encara no s'ha fusionat\n" " a HEAD." -#: builtin/branch.c:156 +#: builtin/branch.c:154 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2852,12 +2902,12 @@ msgstr "" " fusionat a '%s', encara que està\n" " fusionada a HEAD." -#: builtin/branch.c:170 +#: builtin/branch.c:168 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "No s'ha pogut trobar l'objecte de comissió de '%s'" -#: builtin/branch.c:174 +#: builtin/branch.c:172 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2866,348 +2916,348 @@ msgstr "" "La branca '%s' no està totalment fusionada.\n" "Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'." -#: builtin/branch.c:187 +#: builtin/branch.c:185 msgid "Update of config-file failed" msgstr "L'actualització del fitxer de configuració ha fallat" -#: builtin/branch.c:215 +#: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "no es pot usar -a amb -d" -#: builtin/branch.c:221 +#: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD" -#: builtin/branch.c:229 +#: builtin/branch.c:227 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "No es pot suprimir la branca '%s', en la qual sou actualment." -#: builtin/branch.c:245 +#: builtin/branch.c:243 #, c-format -msgid "remote branch '%s' not found." -msgstr "no s'ha trobat la branca remota '%s'." +msgid "remote-tracking branch '%s' not found." +msgstr "no s'ha trobat la branca amb seguiment remot '%s'." -#: builtin/branch.c:246 +#: builtin/branch.c:244 #, c-format msgid "branch '%s' not found." msgstr "no s'ha trobat la branca '%s'." -#: builtin/branch.c:260 +#: builtin/branch.c:258 #, c-format -msgid "Error deleting remote branch '%s'" -msgstr "Error en suprimir la branca remota '%s'" +msgid "Error deleting remote-tracking branch '%s'" +msgstr "Error en suprimir la branca amb seguiment remot '%s'" -#: builtin/branch.c:261 +#: builtin/branch.c:259 #, c-format msgid "Error deleting branch '%s'" msgstr "Error en suprimir la branca '%s'" -#: builtin/branch.c:268 +#: builtin/branch.c:266 #, c-format -msgid "Deleted remote branch %s (was %s).\n" -msgstr "S'ha suprimit la branca remota %s (ha estat %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" +msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n" -#: builtin/branch.c:269 +#: builtin/branch.c:267 #, c-format msgid "Deleted branch %s (was %s).\n" -msgstr "S'ha suprimit la branca %s (ha estat %s).\n" +msgstr "S'ha suprimit la branca %s (era %s).\n" -#: builtin/branch.c:370 +#: builtin/branch.c:368 #, c-format msgid "branch '%s' does not point at a commit" msgstr "la branca '%s' no assenyala cap comissió" -#: builtin/branch.c:459 +#: builtin/branch.c:451 #, c-format msgid "[%s: gone]" msgstr "[%s: no hi és]" -#: builtin/branch.c:464 +#: builtin/branch.c:456 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:469 +#: builtin/branch.c:461 #, c-format msgid "[%s: behind %d]" msgstr "[%s: darrere per %d]" -#: builtin/branch.c:471 +#: builtin/branch.c:463 #, c-format msgid "[behind %d]" msgstr "[darrere de %d]" -#: builtin/branch.c:475 +#: builtin/branch.c:467 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: davant per %d]" -#: builtin/branch.c:477 +#: builtin/branch.c:469 #, c-format msgid "[ahead %d]" msgstr "[davant de %d]" -#: builtin/branch.c:480 +#: builtin/branch.c:472 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: davant per %d, darrere per %d]" -#: builtin/branch.c:483 +#: builtin/branch.c:475 #, c-format msgid "[ahead %d, behind %d]" msgstr "[davant %d, darrere %d]" -#: builtin/branch.c:496 +#: builtin/branch.c:488 msgid " **** invalid ref ****" msgstr " **** referència no vàlida ****" -#: builtin/branch.c:587 +#: builtin/branch.c:579 #, c-format msgid "(no branch, rebasing %s)" msgstr "(cap branca, rebasant %s)" -#: builtin/branch.c:590 +#: builtin/branch.c:582 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(cap branca, bisecció començada en %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:588 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD separat a %s)" -#: builtin/branch.c:599 +#: builtin/branch.c:591 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD separat de %s)" -#: builtin/branch.c:603 +#: builtin/branch.c:595 msgid "(no branch)" msgstr "(cap branca)" -#: builtin/branch.c:650 +#: builtin/branch.c:642 #, c-format msgid "object '%s' does not point to a commit" msgstr "l'objecte '%s' no assenyala cap comissió" -#: builtin/branch.c:698 +#: builtin/branch.c:690 msgid "some refs could not be read" msgstr "no s'han pogut llegir algunes referències" -#: builtin/branch.c:711 +#: builtin/branch.c:703 msgid "cannot rename the current branch while not on any." msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap." -#: builtin/branch.c:721 +#: builtin/branch.c:713 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branca no vàlid: '%s'" -#: builtin/branch.c:736 +#: builtin/branch.c:728 msgid "Branch rename failed" msgstr "El canvi de nom de branca ha fallat" -#: builtin/branch.c:740 +#: builtin/branch.c:732 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "S'ha canviat el nom de la branca malanomenada '%s'" -#: builtin/branch.c:744 +#: builtin/branch.c:736 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!" -#: builtin/branch.c:751 +#: builtin/branch.c:743 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branca està canviada de nom, però l'actualització del fitxer de " "configuració ha fallat" -#: builtin/branch.c:766 +#: builtin/branch.c:758 #, c-format msgid "malformed object name %s" msgstr "nom d'objecte %s mal format" -#: builtin/branch.c:790 +#: builtin/branch.c:780 #, c-format msgid "could not write branch description template: %s" msgstr "no s'ha pogut escriure la plantilla de descripció de branca: %s" -#: builtin/branch.c:820 +#: builtin/branch.c:810 msgid "Generic options" msgstr "Opcions genèriques" -#: builtin/branch.c:822 +#: builtin/branch.c:812 msgid "show hash and subject, give twice for upstream branch" msgstr "mostra el hash i el tema, doneu dues vegades per la branca font" -#: builtin/branch.c:823 +#: builtin/branch.c:813 msgid "suppress informational messages" msgstr "omet els missatges informatius" -#: builtin/branch.c:824 +#: builtin/branch.c:814 msgid "set up tracking mode (see git-pull(1))" msgstr "configura el mode de seguiment (vegeu git-pull(1))" -#: builtin/branch.c:826 +#: builtin/branch.c:816 msgid "change upstream info" msgstr "canvia la informació de font" -#: builtin/branch.c:830 +#: builtin/branch.c:820 msgid "use colored output" msgstr "usa sortida colorada" -#: builtin/branch.c:831 +#: builtin/branch.c:821 msgid "act on remote-tracking branches" msgstr "actua en branques amb seguiment remot" -#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 -#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 -#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 +#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851 +#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "comissió" -#: builtin/branch.c:835 builtin/branch.c:841 +#: builtin/branch.c:825 builtin/branch.c:831 msgid "print only branches that contain the commit" msgstr "imprimeix només les branques que continguin la comissió" -#: builtin/branch.c:847 +#: builtin/branch.c:837 msgid "Specific git-branch actions:" msgstr "Accions de git-branch específiques:" -#: builtin/branch.c:848 +#: builtin/branch.c:838 msgid "list both remote-tracking and local branches" msgstr "llista les branques amb seguiment remot i les locals" -#: builtin/branch.c:850 +#: builtin/branch.c:840 msgid "delete fully merged branch" msgstr "suprimeix la branca si és completament fusionada" -#: builtin/branch.c:851 +#: builtin/branch.c:841 msgid "delete branch (even if not merged)" msgstr "suprimeix la branca (encara que no estigui fusionada)" -#: builtin/branch.c:852 +#: builtin/branch.c:842 msgid "move/rename a branch and its reflog" msgstr "mou/canvia de nom una branca i el seu registre de referència" -#: builtin/branch.c:853 +#: builtin/branch.c:843 msgid "move/rename a branch, even if target exists" msgstr "mou/canvia de nom una branca, encara que el destí existeixi" -#: builtin/branch.c:854 +#: builtin/branch.c:844 msgid "list branch names" msgstr "llista els noms de branca" -#: builtin/branch.c:855 +#: builtin/branch.c:845 msgid "create the branch's reflog" msgstr "crea el registre de referència de la branca" -#: builtin/branch.c:857 +#: builtin/branch.c:847 msgid "edit the description for the branch" msgstr "edita la descripció de la branca" -#: builtin/branch.c:858 +#: builtin/branch.c:848 msgid "force creation, move/rename, deletion" msgstr "força creació, moviment/canvi de nom, supressió" -#: builtin/branch.c:861 +#: builtin/branch.c:851 msgid "print only not merged branches" msgstr "imprimeix només les branques sense fusionar" -#: builtin/branch.c:867 +#: builtin/branch.c:857 msgid "print only merged branches" msgstr "imprimeix només les branques fusionades" -#: builtin/branch.c:871 +#: builtin/branch.c:861 msgid "list branches in columns" msgstr "llista les branques en columnes" -#: builtin/branch.c:884 +#: builtin/branch.c:874 msgid "Failed to resolve HEAD as a valid ref." msgstr "S'ha fallat en resoldre HEAD com a referència vàlida." -#: builtin/branch.c:888 builtin/clone.c:637 +#: builtin/branch.c:878 builtin/clone.c:629 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" -#: builtin/branch.c:910 +#: builtin/branch.c:900 msgid "--column and --verbose are incompatible" msgstr "--column i --verbose són incompatibles" -#: builtin/branch.c:921 builtin/branch.c:960 +#: builtin/branch.c:911 builtin/branch.c:950 msgid "branch name required" msgstr "cal el nom de branca" -#: builtin/branch.c:936 +#: builtin/branch.c:926 msgid "Cannot give description to detached HEAD" msgstr "No es pot donar descripció a un HEAD separat" -#: builtin/branch.c:941 +#: builtin/branch.c:931 msgid "cannot edit description of more than one branch" msgstr "no es pot editar la descripció de més d'una branca" -#: builtin/branch.c:948 +#: builtin/branch.c:938 #, c-format msgid "No commit on branch '%s' yet." msgstr "Encara no hi ha comissió en la branca '%s'." -#: builtin/branch.c:951 +#: builtin/branch.c:941 #, c-format msgid "No branch named '%s'." msgstr "No hi ha branca amb nom '%s'." -#: builtin/branch.c:966 +#: builtin/branch.c:956 msgid "too many branches for a rename operation" msgstr "hi ha massa branques per a una operació de canvi de nom" -#: builtin/branch.c:971 +#: builtin/branch.c:961 msgid "too many branches to set new upstream" msgstr "hi ha massa branques per a establir una nova font" -#: builtin/branch.c:975 +#: builtin/branch.c:965 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca." -#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 +#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011 #, c-format msgid "no such branch '%s'" msgstr "no hi ha tal branca '%s'" -#: builtin/branch.c:982 +#: builtin/branch.c:972 #, c-format msgid "branch '%s' does not exist" msgstr "la branca '%s' no existeix" -#: builtin/branch.c:994 +#: builtin/branch.c:984 msgid "too many branches to unset upstream" msgstr "hi ha massa branques per a desestablir la font" -#: builtin/branch.c:998 +#: builtin/branch.c:988 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca." -#: builtin/branch.c:1004 +#: builtin/branch.c:994 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branca '%s' no té informació de font" -#: builtin/branch.c:1018 +#: builtin/branch.c:1008 msgid "it does not make sense to create 'HEAD' manually" msgstr "no té sentit crear 'HEAD' manualment" -#: builtin/branch.c:1024 +#: builtin/branch.c:1014 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca" -#: builtin/branch.c:1027 +#: builtin/branch.c:1017 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3216,7 +3266,7 @@ msgstr "" "La bandera --set-upstream està desaprovada i s'eliminarà. Considereu usar --" "track o --set-upstream-to\n" -#: builtin/branch.c:1044 +#: builtin/branch.c:1034 #, c-format msgid "" "\n" @@ -3227,70 +3277,87 @@ msgstr "" "Si volíeu fer '%s' seguir '%s', feu això:\n" "\n" -#: builtin/branch.c:1045 +#: builtin/branch.c:1035 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1046 +#: builtin/branch.c:1036 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" -#: builtin/bundle.c:47 +#: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" msgstr "%s està bé\n" -#: builtin/bundle.c:56 +#: builtin/bundle.c:64 msgid "Need a repository to create a bundle." msgstr "Cal un dipòsit per a fer un farcell." -#: builtin/bundle.c:60 +#: builtin/bundle.c:68 msgid "Need a repository to unbundle." msgstr "Cal un dipòsit per a desfer un farcell." -#: builtin/cat-file.c:326 -msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" -msgstr "git cat-file (-t | -s | -e | -p | <tipus> | --textconv) <objecte>" +#: builtin/cat-file.c:369 +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|" +"<tipus>|--textconv) <objecte>" -#: builtin/cat-file.c:327 -msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" -msgstr "git cat-file (--batch | --batch-check) < <llista-d'objectes>" +#: builtin/cat-file.c:370 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-" +"objects>" +msgstr "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <llista-" +"d'objectes>" -#: builtin/cat-file.c:364 +#: builtin/cat-file.c:407 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipus> pot ser un de: blob, tree, commit, tag" -#: builtin/cat-file.c:365 +#: builtin/cat-file.c:408 msgid "show object type" msgstr "mostra el tipus de l'objecte" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:409 msgid "show object size" msgstr "mostra la mida de l'objecte" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:411 msgid "exit with zero when there's no error" msgstr "surt amb zero quan no hi ha error" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:412 msgid "pretty-print object's content" msgstr "imprimeix bellament el contingut de l'objecte" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:414 msgid "for blob objects, run textconv on object's content" msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:416 +msgid "allow -s and -t to work with broken/corrupt objects" +msgstr "permet que -s i -t funcionin amb objectes trencats/corruptes" + +#: builtin/cat-file.c:418 msgid "show info and content of objects fed from the standard input" msgstr "" "mostra la informació i contingut dels objectes rebuts de l'entrada estàndard" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:421 msgid "show info about objects fed from the standard input" msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard" +#: builtin/cat-file.c:424 +msgid "follow in-tree symlinks (used with --batch or --batch-check)" +msgstr "" +"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)" + #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camí>..." @@ -3308,7 +3375,7 @@ msgstr "informa de tots els atributs establerts en el fitxer" msgid "use .gitattributes only from the index" msgstr "usa .gitattributes només des de l'índex" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96 msgid "read file names from stdin" msgstr "llegeix els noms de fitxer d'stdin" @@ -3316,7 +3383,7 @@ msgstr "llegeix els noms de fitxer d'stdin" msgid "terminate input and output records by a NUL character" msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274 +#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279 msgid "suppress progress reporting" msgstr "omet el reportatge de progrés" @@ -3413,114 +3480,114 @@ msgstr "en crear fitxers, anteposa <cadena>" msgid "copy out the files from named stage" msgstr "copia els fitxers des de l'etapa anomenada" -#: builtin/checkout.c:25 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<opcions>] <branca>" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..." -#: builtin/checkout.c:132 builtin/checkout.c:165 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "el camí '%s' no té la versió nostra" -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "el camí '%s' no té la versió seva" -#: builtin/checkout.c:150 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "el camí '%s' no té totes les versions necessàries" -#: builtin/checkout.c:194 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "el camí '%s' no té les versions necessàries" -#: builtin/checkout.c:211 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "camí '%s': no es pot fusionar" -#: builtin/checkout.c:228 +#: builtin/checkout.c:234 #, c-format msgid "Unable to add merge result for '%s'" msgstr "no s'ha pogut afegir el resultat de fusió per a '%s'" -#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255 -#: builtin/checkout.c:258 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 builtin/checkout.c:277 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no es pot usar amb actualització de camins" -#: builtin/checkout.c:261 builtin/checkout.c:264 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no es pot usar amb %s" -#: builtin/checkout.c:267 +#: builtin/checkout.c:273 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "No es pot actualitzar els camins i canviar a la branca '%s' a la vegada." -#: builtin/checkout.c:278 builtin/checkout.c:467 +#: builtin/checkout.c:287 builtin/checkout.c:481 msgid "corrupt index file" msgstr "fitxer d'índex corrupte" -#: builtin/checkout.c:338 builtin/checkout.c:345 +#: builtin/checkout.c:347 builtin/checkout.c:354 #, c-format msgid "path '%s' is unmerged" msgstr "el camí '%s' està sense fusionar" -#: builtin/checkout.c:489 +#: builtin/checkout.c:503 msgid "you need to resolve your current index first" msgstr "heu de resoldre el vostre índex actual primer" -#: builtin/checkout.c:615 +#: builtin/checkout.c:634 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "No es pot fer reflog per a '%s'\n" -#: builtin/checkout.c:653 +#: builtin/checkout.c:670 msgid "HEAD is now at" msgstr "HEAD ara és a" -#: builtin/checkout.c:660 +#: builtin/checkout.c:677 #, c-format msgid "Reset branch '%s'\n" msgstr "Restableix la branca '%s'\n" -#: builtin/checkout.c:663 +#: builtin/checkout.c:680 #, c-format msgid "Already on '%s'\n" msgstr "Ja en '%s'\n" -#: builtin/checkout.c:667 +#: builtin/checkout.c:684 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "S'ha agafat i restablert la branca '%s'\n" -#: builtin/checkout.c:669 builtin/checkout.c:1050 +#: builtin/checkout.c:686 builtin/checkout.c:1285 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "S'ha agafat la branca nova '%s'\n" -#: builtin/checkout.c:671 +#: builtin/checkout.c:688 #, c-format msgid "Switched to branch '%s'\n" msgstr "S'ha agafat la branca '%s'\n" -#: builtin/checkout.c:723 +#: builtin/checkout.c:740 #, c-format msgid " ... and %d more.\n" msgstr " ... i %d més.\n" -#: builtin/checkout.c:729 +#: builtin/checkout.c:746 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3543,154 +3610,204 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:747 +#: builtin/checkout.c:765 #, c-format msgid "" +"If you want to keep it by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch <new-branch-name> %s\n" +"\n" +msgid_plural "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" " git branch <new-branch-name> %s\n" "\n" -msgstr "" -"Si les voleu retenir creant una branca nova, ara pot ser un bon moment per\n" -"a fer-ho amb:\n" +msgstr[0] "" +"Si la voleu retenir creant una branca nova, ara pot ser un bon moment\n" +"per a fer-ho amb:\n" +"\n" +" git branch <nom-de-branca-nova> %s\n" +"\n" +msgstr[1] "" +"Si les voleu retenir creant una branca nova, ara pot ser un bon moment\n" +"per a fer-ho amb:\n" "\n" " git branch <nom-de-branca-nova> %s\n" "\n" -#: builtin/checkout.c:777 +#: builtin/checkout.c:801 msgid "internal error in revision walk" msgstr "error intern en el passeig per revisions" -#: builtin/checkout.c:781 +#: builtin/checkout.c:805 msgid "Previous HEAD position was" msgstr "La posició de HEAD anterior era" -#: builtin/checkout.c:808 builtin/checkout.c:1045 +#: builtin/checkout.c:832 builtin/checkout.c:1280 msgid "You are on a branch yet to be born" msgstr "Sou en una branca que encara ha de nàixer" -#: builtin/checkout.c:952 +#: builtin/checkout.c:893 +msgid "no branch specified" +msgstr "cap branca especificada" + +#: builtin/checkout.c:895 +#, c-format +msgid "'%s' already exists" +msgstr "'%s' ja existeix" + +#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842 +#: builtin/clone.c:853 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "no s'ha pogut crear els directoris inicials de '%s'" + +#: builtin/checkout.c:924 +#, c-format +msgid "could not create directory of '%s'" +msgstr "no s'ha pogut crear directori de '%s'" + +#: builtin/checkout.c:960 +#, c-format +msgid "Enter %s (identifier %s)" +msgstr "Introduïu %s (identificador %s)" + +#: builtin/checkout.c:1070 +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "'%s' ja s'ha agafat a '%s'" + +#: builtin/checkout.c:1176 #, c-format msgid "only one reference expected, %d given." msgstr "només una referència esperada, %d donades." -#: builtin/checkout.c:991 +#: builtin/checkout.c:1215 #, c-format msgid "invalid reference: %s" msgstr "referència no vàlida: %s" -#: builtin/checkout.c:1020 +#: builtin/checkout.c:1255 #, c-format msgid "reference is not a tree: %s" msgstr "la referència no és un arbre: %s" -#: builtin/checkout.c:1059 +#: builtin/checkout.c:1294 msgid "paths cannot be used with switching branches" msgstr "els camins no es poden usar amb canvi de branca" -#: builtin/checkout.c:1062 builtin/checkout.c:1066 +#: builtin/checkout.c:1297 builtin/checkout.c:1301 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no es pot usar amb canvi de branca" -#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078 -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313 +#: builtin/checkout.c:1316 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no es pot usar amb '%s'" -#: builtin/checkout.c:1086 +#: builtin/checkout.c:1321 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No es pot canviar la branca a una no comissió '%s'" -#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90 +#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "branca" -#: builtin/checkout.c:1109 +#: builtin/checkout.c:1347 msgid "create and checkout a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1349 msgid "create/reset and checkout a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1112 +#: builtin/checkout.c:1350 msgid "create reflog for new branch" msgstr "crea un registre de referència per a la branca nova" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1351 msgid "detach the HEAD at named commit" msgstr "separa el HEAD a la comissió anomenada" -#: builtin/checkout.c:1114 +#: builtin/checkout.c:1352 msgid "set upstream info for new branch" msgstr "estableix la informació de font de la branca nova" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new-branch" msgstr "branca-nova" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new unparented branch" msgstr "branca nova sense mare" -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1355 msgid "checkout our version for unmerged files" msgstr "agafa la versió nostra dels fitxers sense fusionar" -#: builtin/checkout.c:1119 +#: builtin/checkout.c:1357 msgid "checkout their version for unmerged files" msgstr "agafa la versió seva dels fitxers sense fusionar" -#: builtin/checkout.c:1121 +#: builtin/checkout.c:1359 msgid "force checkout (throw away local modifications)" msgstr "agafa a la força (descarta qualsevulles modificacions locals)" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1360 msgid "perform a 3-way merge with the new branch" msgstr "realitza una fusió de 3 vies amb la branca nova" -#: builtin/checkout.c:1123 builtin/merge.c:227 +#: builtin/checkout.c:1361 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" -#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 +#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244 msgid "style" msgstr "estil" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1363 msgid "conflict style (merge or diff3)" msgstr "estil de conflicte (fusió o diff3)" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1366 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camí només a entrades escasses" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1368 msgid "second guess 'git checkout <no-such-branch>'" msgstr "dubta 'git checkout <cap-branca-així>'" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1370 +msgid "check a branch out in a separate working directory" +msgstr "agafa una branca en un directori de treball separat" + +#: builtin/checkout.c:1372 +msgid "do not check if another worktree is holding the given ref" +msgstr "no comprovis si altre arbre de treball té la referència donada" + +#: builtin/checkout.c:1406 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B i --orphan són mutualment exclusius" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1423 msgid "--track needs a branch name" msgstr "--track necessita un nom de branca" -#: builtin/checkout.c:1175 +#: builtin/checkout.c:1428 msgid "Missing branch name; try -b" msgstr "Manca el nom de branca; proveu -b" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1464 msgid "invalid path specification" msgstr "especificació de camí no vàlida" -#: builtin/checkout.c:1219 +#: builtin/checkout.c:1471 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3699,12 +3816,12 @@ msgstr "" "No es poden actualitzar els camins i canviar a la branca '%s' a la vegada.\n" "Volíeu agafar '%s', la qual no es pot resoldre com a comissió?" -#: builtin/checkout.c:1224 +#: builtin/checkout.c:1476 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no accepta un paràmetre de camí '%s'" -#: builtin/checkout.c:1228 +#: builtin/checkout.c:1480 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3775,36 +3892,36 @@ msgstr "" "* - tria tots els ítems\n" " - (buit) finalitza la selecció" -#: builtin/clean.c:517 +#: builtin/clean.c:515 #, c-format msgid "Huh (%s)?" msgstr "Perdó (%s)?" -#: builtin/clean.c:659 +#: builtin/clean.c:657 #, c-format msgid "Input ignore patterns>> " msgstr "Introduïu els patrons a ignorar>> " -#: builtin/clean.c:696 +#: builtin/clean.c:694 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "AVÍS: No es pot trobar ítems que coincideixin amb: %s" -#: builtin/clean.c:717 +#: builtin/clean.c:715 msgid "Select items to delete" msgstr "Selecciona els ítems a suprimir" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:756 #, c-format msgid "Remove %s [y/N]? " msgstr "Voleu eliminar %s [y/N]? " -#: builtin/clean.c:783 +#: builtin/clean.c:781 msgid "Bye." msgstr "Adéu." -#: builtin/clean.c:791 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3822,62 +3939,62 @@ msgstr "" "help - aquesta pantalla\n" "? - ajuda de selecció de l'avís" -#: builtin/clean.c:818 +#: builtin/clean.c:816 msgid "*** Commands ***" msgstr "*** Ordres ***" -#: builtin/clean.c:819 +#: builtin/clean.c:817 msgid "What now" msgstr "Què ara" -#: builtin/clean.c:827 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Eliminaria l'ítem següent:" msgstr[1] "Eliminaria els ítems següents:" -#: builtin/clean.c:844 +#: builtin/clean.c:842 msgid "No more files to clean, exiting." msgstr "No hi ha més fitxers a netejar; sortint." -#: builtin/clean.c:875 +#: builtin/clean.c:873 msgid "do not print names of files removed" msgstr "no imprimeixis els noms dels fitxers eliminats" -#: builtin/clean.c:877 +#: builtin/clean.c:875 msgid "force" msgstr "força" -#: builtin/clean.c:878 +#: builtin/clean.c:876 msgid "interactive cleaning" msgstr "neteja interactiva" -#: builtin/clean.c:880 +#: builtin/clean.c:878 msgid "remove whole directories" msgstr "elimina directoris sencers" -#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 msgid "pattern" msgstr "patró" -#: builtin/clean.c:882 +#: builtin/clean.c:880 msgid "add <pattern> to ignore rules" msgstr "afegiu <patró> per a ignorar les regles" -#: builtin/clean.c:883 +#: builtin/clean.c:881 msgid "remove ignored files, too" msgstr "elimina els fitxers ignorats, també" -#: builtin/clean.c:885 +#: builtin/clean.c:883 msgid "remove only ignored files" msgstr "elimina només els fitxers ignorats" -#: builtin/clean.c:903 +#: builtin/clean.c:901 msgid "-x and -X cannot be used together" msgstr "-x i -X no es poden usar junts" -#: builtin/clean.c:907 +#: builtin/clean.c:905 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3885,7 +4002,7 @@ msgstr "" "clean.requireForce està establerta a veritat i ni -i, -n ni -f s'ha donat; " "refusant netejar" -#: builtin/clean.c:910 +#: builtin/clean.c:908 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3897,150 +4014,150 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]" -#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224 #: builtin/push.c:523 msgid "force progress reporting" msgstr "força l'informe de progrés" -#: builtin/clone.c:68 +#: builtin/clone.c:59 msgid "don't create a checkout" msgstr "no facis cap agafada" -#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503 msgid "create a bare repository" msgstr "crea un dipòsit nu" -#: builtin/clone.c:73 +#: builtin/clone.c:64 msgid "create a mirror repository (implies bare)" msgstr "crea un dipòsit reflectit (implica bare)" -#: builtin/clone.c:75 +#: builtin/clone.c:66 msgid "to clone from a local repository" msgstr "per a clonar des d'un dipòsit local" -#: builtin/clone.c:77 +#: builtin/clone.c:68 msgid "don't use local hardlinks, always copy" msgstr "no usis enllaços durs locals, sempre copia" -#: builtin/clone.c:79 +#: builtin/clone.c:70 msgid "setup as shared repository" msgstr "configura com a dipòsit compartit" -#: builtin/clone.c:81 builtin/clone.c:83 +#: builtin/clone.c:72 builtin/clone.c:74 msgid "initialize submodules in the clone" msgstr "initialitza els submòduls en el clon" -#: builtin/clone.c:84 builtin/init-db.c:493 +#: builtin/clone.c:75 builtin/init-db.c:500 msgid "template-directory" msgstr "directori-de-plantilla" -#: builtin/clone.c:85 builtin/init-db.c:494 +#: builtin/clone.c:76 builtin/init-db.c:501 msgid "directory from which templates will be used" msgstr "directori del qual les plantilles s'usaran" -#: builtin/clone.c:87 +#: builtin/clone.c:78 msgid "reference repository" msgstr "dipòsit de referència" -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:80 +msgid "use --reference only while cloning" +msgstr "usa --reference només en clonar" + +#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "nom" -#: builtin/clone.c:89 +#: builtin/clone.c:82 msgid "use <name> instead of 'origin' to track upstream" msgstr "usa <nom> en lloc de 'origin' per a seguir la font" -#: builtin/clone.c:91 +#: builtin/clone.c:84 msgid "checkout <branch> instead of the remote's HEAD" msgstr "agafa <branca> en lloc del HEAD del remot" -#: builtin/clone.c:93 +#: builtin/clone.c:86 msgid "path to git-upload-pack on the remote" msgstr "camí a git-upload-pack en el remot" -#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 +#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "profunditat" -#: builtin/clone.c:95 +#: builtin/clone.c:88 msgid "create a shallow clone of that depth" msgstr "crea un clon superficial de tal profunditat" -#: builtin/clone.c:97 +#: builtin/clone.c:90 msgid "clone only one branch, HEAD or --branch" msgstr "clona només una branca, HEAD o --branch" -#: builtin/clone.c:99 -msgid "use --reference only while cloning" -msgstr "usa --reference només en clonar" - -#: builtin/clone.c:100 builtin/init-db.c:502 +#: builtin/clone.c:91 builtin/init-db.c:509 msgid "gitdir" msgstr "directori de git" -#: builtin/clone.c:101 builtin/init-db.c:503 +#: builtin/clone.c:92 builtin/init-db.c:510 msgid "separate git dir from working tree" msgstr "separa el directori de git de l'arbre de treball" -#: builtin/clone.c:102 +#: builtin/clone.c:93 msgid "key=value" msgstr "calu=valor" -#: builtin/clone.c:103 +#: builtin/clone.c:94 msgid "set config inside the new repository" msgstr "estableix la configuració dins del dipòsit nou" -#: builtin/clone.c:256 +#: builtin/clone.c:247 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "el dipòsit de referència '%s' no és un dipòsit local." -#: builtin/clone.c:260 +#: builtin/clone.c:251 #, c-format msgid "reference repository '%s' is shallow" msgstr "el dipòsit de referència '%s' és superficial" -#: builtin/clone.c:263 +#: builtin/clone.c:254 #, c-format msgid "reference repository '%s' is grafted" msgstr "el dipòsit de referència '%s' és empeltat" -#: builtin/clone.c:325 +#: builtin/clone.c:317 #, c-format msgid "failed to create directory '%s'" msgstr "s'ha fallat en crear el directori '%s'" -#: builtin/clone.c:327 builtin/diff.c:84 +#: builtin/clone.c:319 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "s'ha fallat en fer stat a '%s'" -#: builtin/clone.c:329 +#: builtin/clone.c:321 #, c-format msgid "%s exists and is not a directory" msgstr "%s existeix i no és un directori" -#: builtin/clone.c:343 +#: builtin/clone.c:335 #, c-format msgid "failed to stat %s\n" msgstr "s'ha fallat en fer stat a '%s'\n" -#: builtin/clone.c:365 +#: builtin/clone.c:357 #, c-format msgid "failed to create link '%s'" msgstr "s'ha fallat en crear l'enllaç '%s'" -#: builtin/clone.c:369 +#: builtin/clone.c:361 #, c-format msgid "failed to copy file to '%s'" msgstr "s'ha fallat en copiar el fitxer a '%s'" -#: builtin/clone.c:392 builtin/clone.c:566 +#: builtin/clone.c:384 builtin/clone.c:558 #, c-format msgid "done.\n" msgstr "fet.\n" -#: builtin/clone.c:404 +#: builtin/clone.c:396 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4050,122 +4167,117 @@ msgstr "" "Podeu inspeccionar què s'ha agafat amb 'git status' i\n" "tornar a intentar l'agafada amb 'git checkout -f HEAD'\n" -#: builtin/clone.c:481 +#: builtin/clone.c:473 #, c-format msgid "Could not find remote branch %s to clone." msgstr "No s'ha pogut trobar la branca remota %s per a clonar." -#: builtin/clone.c:561 +#: builtin/clone.c:553 #, c-format msgid "Checking connectivity... " msgstr "Provant connectivitat... " -#: builtin/clone.c:564 +#: builtin/clone.c:556 msgid "remote did not send all necessary objects" msgstr "el remot no ha enviat tots els objectes necessaris" -#: builtin/clone.c:628 +#: builtin/clone.c:620 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "el HEAD remot es refereix a una referència que no existeix; no s'ha pogut " "agafar.\n" -#: builtin/clone.c:659 +#: builtin/clone.c:651 msgid "unable to checkout working tree" msgstr "no s'ha pogut agafar l'arbre de treball" -#: builtin/clone.c:746 +#: builtin/clone.c:738 msgid "cannot repack to clean up" msgstr "no es pot reempaquetar per a netejar" -#: builtin/clone.c:748 +#: builtin/clone.c:740 msgid "cannot unlink temporary alternates file" msgstr "no es pot desenllaçar el fitxer d'alternatives temporal" -#: builtin/clone.c:778 +#: builtin/clone.c:770 msgid "Too many arguments." msgstr "Hi ha massa paràmetres." -#: builtin/clone.c:782 +#: builtin/clone.c:774 msgid "You must specify a repository to clone." msgstr "Heu d'especificar un dipòsit per a clonar." -#: builtin/clone.c:793 +#: builtin/clone.c:785 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les opcions --bare i --origin %s són incompatibles." -#: builtin/clone.c:796 +#: builtin/clone.c:788 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare i --separate-git-dir són incompatibles." -#: builtin/clone.c:809 +#: builtin/clone.c:801 #, c-format msgid "repository '%s' does not exist" msgstr "el dipòsit '%s' no existeix" -#: builtin/clone.c:815 builtin/fetch.c:1156 +#: builtin/clone.c:807 builtin/fetch.c:1160 #, c-format msgid "depth %s is not a positive number" msgstr "la profunditat %s no és nombre positiu" -#: builtin/clone.c:825 +#: builtin/clone.c:817 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "el camí destí '%s' ja existeix i no és un directori buit." -#: builtin/clone.c:835 +#: builtin/clone.c:827 #, c-format msgid "working tree '%s' already exists." msgstr "l'arbre de treball '%s' ja existeix." -#: builtin/clone.c:850 builtin/clone.c:861 -#, c-format -msgid "could not create leading directories of '%s'" -msgstr "no s'ha pogut crear els directoris inicials de '%s'" - -#: builtin/clone.c:853 +#: builtin/clone.c:845 #, c-format msgid "could not create work tree dir '%s'" msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'" -#: builtin/clone.c:871 +#: builtin/clone.c:863 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonant al dipòsit nu '%s'...\n" -#: builtin/clone.c:873 +#: builtin/clone.c:865 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonant a '%s'...\n" -#: builtin/clone.c:898 +#: builtin/clone.c:890 msgid "--dissociate given, but there is no --reference" msgstr "s'ha donat --dissociate, però no hi ha --reference" -#: builtin/clone.c:913 +#: builtin/clone.c:907 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:916 +#: builtin/clone.c:910 msgid "source repository is shallow, ignoring --local" msgstr "el dipòsit font és superficial, ignorant --local" -#: builtin/clone.c:921 +#: builtin/clone.c:915 msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:925 +#: builtin/clone.c:919 #, c-format msgid "Don't know how to clone %s" msgstr "No es sap com clonar %s" -#: builtin/clone.c:976 builtin/clone.c:984 +#: builtin/clone.c:968 builtin/clone.c:976 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branca remota %s no es troba en la font %s" -#: builtin/clone.c:987 +#: builtin/clone.c:979 msgid "You appear to have cloned an empty repository." msgstr "Sembla que heu clonat un dipòsit buit." @@ -4405,7 +4517,7 @@ msgstr "no s'ha pogut llegir MERGE_MSG" msgid "could not read SQUASH_MSG" msgstr "no s'ha pogur llegir SQUASH_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:738 builtin/merge.c:1079 #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir '%s'" @@ -4567,32 +4679,32 @@ msgstr "Mode de neteja no vàlid %s" msgid "Paths with -a does not make sense." msgstr "-a no té sentit amb camins." -#: builtin/commit.c:1324 builtin/commit.c:1604 +#: builtin/commit.c:1324 builtin/commit.c:1603 msgid "show status concisely" msgstr "mostra l'estat concisament" -#: builtin/commit.c:1326 builtin/commit.c:1606 +#: builtin/commit.c:1326 builtin/commit.c:1605 msgid "show branch information" msgstr "mostra la informació de branca" -#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 +#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509 msgid "machine-readable output" msgstr "sortida llegible per màquina" -#: builtin/commit.c:1331 builtin/commit.c:1610 +#: builtin/commit.c:1331 builtin/commit.c:1609 msgid "show status in long format (default)" msgstr "mostra l'estat en format llarg (per defecte)" -#: builtin/commit.c:1334 builtin/commit.c:1613 +#: builtin/commit.c:1334 builtin/commit.c:1612 msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" -#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "mode" -#: builtin/commit.c:1337 builtin/commit.c:1616 +#: builtin/commit.c:1337 builtin/commit.c:1615 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostra els fitxers no seguits, modes opcional: all, normal, no. (Per " @@ -4602,7 +4714,7 @@ msgstr "" msgid "show ignored files" msgstr "mostra els fitxers ignorats" -#: builtin/commit.c:1341 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:152 msgid "when" msgstr "quan" @@ -4618,206 +4730,206 @@ msgstr "" msgid "list untracked files in columns" msgstr "mostra els fitxers no seguits en columnes" -#: builtin/commit.c:1431 +#: builtin/commit.c:1430 msgid "couldn't look up newly created commit" msgstr "no s'ha pogut trobar la comissió novament creada" -#: builtin/commit.c:1433 +#: builtin/commit.c:1432 msgid "could not parse newly created commit" msgstr "no s'ha pogut analitzar la comissió novament creada" -#: builtin/commit.c:1478 +#: builtin/commit.c:1477 msgid "detached HEAD" msgstr "HEAD separat" -#: builtin/commit.c:1481 +#: builtin/commit.c:1480 msgid " (root-commit)" msgstr " (comissió d'arrel)" -#: builtin/commit.c:1574 +#: builtin/commit.c:1573 msgid "suppress summary after successful commit" msgstr "omet el resum després d'una comissió reeixida" -#: builtin/commit.c:1575 +#: builtin/commit.c:1574 msgid "show diff in commit message template" msgstr "mostra la diferència en la plantilla de missatge de comissió" -#: builtin/commit.c:1577 +#: builtin/commit.c:1576 msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1578 builtin/tag.c:601 +#: builtin/commit.c:1577 builtin/tag.c:601 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "author" msgstr "autor" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "override author for commit" msgstr "autor corregit de la comissió" -#: builtin/commit.c:1580 builtin/gc.c:275 +#: builtin/commit.c:1579 builtin/gc.c:280 msgid "date" msgstr "data" -#: builtin/commit.c:1580 +#: builtin/commit.c:1579 msgid "override date for commit" msgstr "data corregida de la comissió" -#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "missatge" -#: builtin/commit.c:1581 +#: builtin/commit.c:1580 msgid "commit message" msgstr "missatge de comissió" -#: builtin/commit.c:1582 +#: builtin/commit.c:1581 msgid "reuse and edit message from specified commit" msgstr "reusa i edita el missatge de la comissió especificada" -#: builtin/commit.c:1583 +#: builtin/commit.c:1582 msgid "reuse message from specified commit" msgstr "reusa el missatge de la comissió especificada" -#: builtin/commit.c:1584 +#: builtin/commit.c:1583 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usa el missatge formatat d'aixafada automàtica per a arreglar la comissió " "especificada" -#: builtin/commit.c:1585 +#: builtin/commit.c:1584 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usa el missatge formatat d'aixafada automàtica per a aixafar la comissió " "especificada" -#: builtin/commit.c:1586 +#: builtin/commit.c:1585 msgid "the commit is authored by me now (used with -C/-c/--amend)" -msgstr "l'autor de la comissió ja sóc jo (usat amb -C/-c/--amend)" +msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)" -#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" -#: builtin/commit.c:1588 +#: builtin/commit.c:1587 msgid "use specified template file" msgstr "usa el fitxer de plantilla especificat" -#: builtin/commit.c:1589 +#: builtin/commit.c:1588 msgid "force edit of commit" msgstr "força l'edició de la comissió" -#: builtin/commit.c:1590 +#: builtin/commit.c:1589 msgid "default" msgstr "per defecte" -#: builtin/commit.c:1590 builtin/tag.c:604 +#: builtin/commit.c:1589 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "com despullar els espais i #comentaris del missatge" -#: builtin/commit.c:1591 +#: builtin/commit.c:1590 msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissió" -#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "ID de clau" -#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "firma la comissió amb GPG" -#: builtin/commit.c:1596 +#: builtin/commit.c:1595 msgid "Commit contents options" msgstr "Opcions dels continguts de les comissions" -#: builtin/commit.c:1597 +#: builtin/commit.c:1596 msgid "commit all changed files" msgstr "comet tots els fitxers canviats" -#: builtin/commit.c:1598 +#: builtin/commit.c:1597 msgid "add specified files to index for commit" msgstr "afegeix els fitxers especificats a l'índex per a cometre" -#: builtin/commit.c:1599 +#: builtin/commit.c:1598 msgid "interactively add files" msgstr "afegeix els fitxers interactivament" -#: builtin/commit.c:1600 +#: builtin/commit.c:1599 msgid "interactively add changes" msgstr "afegeix els canvis interactivament" -#: builtin/commit.c:1601 +#: builtin/commit.c:1600 msgid "commit only specified files" msgstr "comet només els fitxers especificats" -#: builtin/commit.c:1602 +#: builtin/commit.c:1601 msgid "bypass pre-commit hook" msgstr "evita el ganxo de precomissió" -#: builtin/commit.c:1603 +#: builtin/commit.c:1602 msgid "show what would be committed" msgstr "mostra què es cometria" -#: builtin/commit.c:1614 +#: builtin/commit.c:1613 msgid "amend previous commit" msgstr "esmena la comissió anterior" -#: builtin/commit.c:1615 +#: builtin/commit.c:1614 msgid "bypass post-rewrite hook" msgstr "evita el ganxo de postreescriure" -#: builtin/commit.c:1620 +#: builtin/commit.c:1619 msgid "ok to record an empty change" msgstr "està bé registrar un canvi buit" -#: builtin/commit.c:1622 +#: builtin/commit.c:1621 msgid "ok to record a change with an empty message" msgstr "està bé registrar un canvi amb missatge buit" -#: builtin/commit.c:1651 +#: builtin/commit.c:1650 msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: builtin/commit.c:1690 builtin/merge.c:519 +#: builtin/commit.c:1689 builtin/merge.c:1076 #, c-format msgid "could not open '%s' for reading" msgstr "no s'ha pogut obrir '%s' per a lectura" -#: builtin/commit.c:1697 +#: builtin/commit.c:1696 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fitxer MERGE_HEAD corrupte (%s)" -#: builtin/commit.c:1704 +#: builtin/commit.c:1703 msgid "could not read MERGE_MODE" msgstr "no s'ha pogut llegir MERGE_MODE" -#: builtin/commit.c:1723 +#: builtin/commit.c:1722 #, c-format msgid "could not read commit message: %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: builtin/commit.c:1734 +#: builtin/commit.c:1733 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avortant la comissió; no heu editat el missatge.\n" -#: builtin/commit.c:1739 +#: builtin/commit.c:1738 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avortant la comissió a causa d'un missatge de comissió buit.\n" -#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854 msgid "failed to write commit object" msgstr "s'ha fallat en escriure l'objecte de comissió" -#: builtin/commit.c:1787 +#: builtin/commit.c:1786 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4961,18 +5073,18 @@ msgstr "no s'ha pogut analitzar el valor de color per defecte" #, c-format msgid "" "# This is Git's per-user configuration file.\n" -"[core]\n" +"[user]\n" "# Please adapt and uncomment the following lines:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" msgstr "" "# Això és el fitxer de configuració del Git de l'usuari.\n" -"[core]\n" +"[user]\n" "# Si us plau, adapteu i descomenteu les línies següents:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:589 +#: builtin/config.c:587 #, c-format msgid "cannot create configuration file %s" msgstr "no es pot crear el fitxer de configuració '%s'" @@ -5302,82 +5414,82 @@ msgstr "mapa de referències" msgid "specify fetch refmap" msgstr "mostra el mapa de referències d'obteniment" -#: builtin/fetch.c:375 +#: builtin/fetch.c:377 msgid "Couldn't find remote ref HEAD" msgstr "No s'ha pogut trobar la referència HEAD remota" -#: builtin/fetch.c:455 +#: builtin/fetch.c:457 #, c-format msgid "object %s not found" msgstr "objecte %s no trobat" -#: builtin/fetch.c:460 +#: builtin/fetch.c:462 msgid "[up to date]" msgstr "[al dia]" -#: builtin/fetch.c:474 +#: builtin/fetch.c:476 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (no es pot obtenir en la branca actual)" -#: builtin/fetch.c:475 builtin/fetch.c:561 +#: builtin/fetch.c:477 builtin/fetch.c:563 msgid "[rejected]" msgstr "[rebutjat]" -#: builtin/fetch.c:486 +#: builtin/fetch.c:488 msgid "[tag update]" msgstr "[actualització d'etiqueta]" -#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 +#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543 msgid " (unable to update local ref)" msgstr " (no s'ha pogut actualitzar la referència local)" -#: builtin/fetch.c:506 +#: builtin/fetch.c:508 msgid "[new tag]" msgstr "[etiqueta nova]" -#: builtin/fetch.c:509 +#: builtin/fetch.c:511 msgid "[new branch]" msgstr "[branca nova]" -#: builtin/fetch.c:512 +#: builtin/fetch.c:514 msgid "[new ref]" msgstr "[referència nova]" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "unable to update local ref" msgstr "no s'ha pogut actualitzar la referència local" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "forced update" msgstr "actualització forçada" -#: builtin/fetch.c:563 +#: builtin/fetch.c:565 msgid "(non-fast-forward)" msgstr "(sense avanç ràpid)" -#: builtin/fetch.c:596 builtin/fetch.c:829 +#: builtin/fetch.c:599 builtin/fetch.c:832 #, c-format msgid "cannot open %s: %s\n" msgstr "no es pot obrir %s: %s\n" -#: builtin/fetch.c:605 +#: builtin/fetch.c:608 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no ha enviat tots els objectes necessaris\n" -#: builtin/fetch.c:623 +#: builtin/fetch.c:626 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "rebutja %s perquè no es permet que les arrels superficials s'actualitzin" -#: builtin/fetch.c:711 builtin/fetch.c:794 +#: builtin/fetch.c:714 builtin/fetch.c:797 #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:722 +#: builtin/fetch.c:725 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5387,55 +5499,55 @@ msgstr "" " intenteu executar 'git remote prune %s' per a eliminar\n" " qualsevulla branca antiga o conflictiva" -#: builtin/fetch.c:774 +#: builtin/fetch.c:777 #, c-format msgid " (%s will become dangling)" msgstr " (%s es tornarà penjant)" -#: builtin/fetch.c:775 +#: builtin/fetch.c:778 #, c-format msgid " (%s has become dangling)" msgstr " (%s s'ha tornat penjant)" -#: builtin/fetch.c:799 +#: builtin/fetch.c:802 msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:800 builtin/remote.c:1060 +#: builtin/fetch.c:803 builtin/remote.c:1057 msgid "(none)" msgstr "(cap)" -#: builtin/fetch.c:819 +#: builtin/fetch.c:822 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Refusant obtenir en la branca actual %s d'un dipòsit no nu" -#: builtin/fetch.c:838 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "L'opció \"%s\" amb valor \"%s\" no és vàlida per a %s" -#: builtin/fetch.c:841 +#: builtin/fetch.c:844 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "S'ignora l'opció \"%s\" per a %s\n" -#: builtin/fetch.c:897 +#: builtin/fetch.c:900 #, c-format msgid "Don't know how to fetch from %s" msgstr "No es sap com obtenir de %s" -#: builtin/fetch.c:1059 +#: builtin/fetch.c:1063 #, c-format msgid "Fetching %s\n" msgstr "Obtenint %s\n" -#: builtin/fetch.c:1061 builtin/remote.c:90 +#: builtin/fetch.c:1065 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "No s'ha pogut obtenir %s" -#: builtin/fetch.c:1079 +#: builtin/fetch.c:1083 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5443,32 +5555,32 @@ msgstr "" "Cap dipòsit remot especificat. Si us plau, especifiqueu o un URL o\n" "un nom remot del qual es deuen obtenir les revisions noves." -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1106 msgid "You need to specify a tag name." msgstr "Necessiteu especificar un nom d'etiqueta." -#: builtin/fetch.c:1144 +#: builtin/fetch.c:1148 msgid "--depth and --unshallow cannot be used together" msgstr "--depth i --unshallow no es poden usar junts" -#: builtin/fetch.c:1146 +#: builtin/fetch.c:1150 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow en un dipòsit complet no té sentit" -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1173 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no accepta un paràmetre de dipòsit" -#: builtin/fetch.c:1171 +#: builtin/fetch.c:1175 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no té sentit amb especificacions de referència" -#: builtin/fetch.c:1182 +#: builtin/fetch.c:1186 #, c-format msgid "No such remote or remote group: %s" msgstr "No hi ha tal remot ni tal grup remot: %s" -#: builtin/fetch.c:1190 +#: builtin/fetch.c:1194 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Obtenir un grup i especificar referències no té sentit" @@ -5478,131 +5590,131 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]" -#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 +#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590 -#: parse-options.h:132 parse-options.h:239 +#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590 +#: parse-options.h:131 parse-options.h:238 msgid "n" msgstr "n" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:669 msgid "populate log with at most <n> entries from shortlog" msgstr "emplena el registre amb <n> entrades del registre curt com a màxim" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:672 msgid "alias for --log (deprecated)" msgstr "àlies per --log (desaprovat)" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:675 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:676 msgid "use <text> as start of message" msgstr "usa <text> com a inici de missatge" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:677 msgid "file to read from" msgstr "fitxer del qual llegir" -#: builtin/for-each-ref.c:675 +#: builtin/for-each-ref.c:687 msgid "unable to parse format" msgstr "no s'ha pogut analitzar el format" -#: builtin/for-each-ref.c:1063 +#: builtin/for-each-ref.c:1083 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<opcions>] [<patró>]" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1098 msgid "quote placeholders suitably for shells" msgstr "" "posa els marcadors de posició entre cometes adequades per als terminals" -#: builtin/for-each-ref.c:1080 +#: builtin/for-each-ref.c:1100 msgid "quote placeholders suitably for perl" msgstr "posa els marcadors de posició entre cometes adequades per a perl" -#: builtin/for-each-ref.c:1082 +#: builtin/for-each-ref.c:1102 msgid "quote placeholders suitably for python" msgstr "posa els marcadors de posició entre cometes adequades per a python" -#: builtin/for-each-ref.c:1084 +#: builtin/for-each-ref.c:1104 msgid "quote placeholders suitably for Tcl" msgstr "posa els marcadors de posició entre cometes adequades per a Tcl" -#: builtin/for-each-ref.c:1087 +#: builtin/for-each-ref.c:1107 msgid "show only <n> matched refs" msgstr "mostra només <n> referències coincidents" -#: builtin/for-each-ref.c:1088 builtin/replace.c:438 +#: builtin/for-each-ref.c:1108 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1108 msgid "format to use for the output" msgstr "format a usar en la sortida" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1109 msgid "key" msgstr "clau" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1110 msgid "field name to sort on" msgstr "nom de camp en el qual ordenar" -#: builtin/fsck.c:147 builtin/prune.c:137 +#: builtin/fsck.c:147 builtin/prune.c:236 msgid "Checking connectivity" msgstr "Comprovant connectivitat" -#: builtin/fsck.c:540 +#: builtin/fsck.c:548 msgid "Checking object directories" msgstr "Comprovant els directoris d'objecte" -#: builtin/fsck.c:603 +#: builtin/fsck.c:611 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opcions>] [<objecte>...]" -#: builtin/fsck.c:609 +#: builtin/fsck.c:617 msgid "show unreachable objects" msgstr "mostra els objectes inabastables" -#: builtin/fsck.c:610 +#: builtin/fsck.c:618 msgid "show dangling objects" msgstr "mostra els objectes penjants" -#: builtin/fsck.c:611 +#: builtin/fsck.c:619 msgid "report tags" msgstr "informa de les etiquetes" -#: builtin/fsck.c:612 +#: builtin/fsck.c:620 msgid "report root nodes" msgstr "informa dels nodes d'arrel" -#: builtin/fsck.c:613 +#: builtin/fsck.c:621 msgid "make index objects head nodes" msgstr "fes els objectes d'índex nodes de cap" -#: builtin/fsck.c:614 +#: builtin/fsck.c:622 msgid "make reflogs head nodes (default)" msgstr "fes que els registres de referències siguin nodes de cap (per defecte)" -#: builtin/fsck.c:615 +#: builtin/fsck.c:623 msgid "also consider packs and alternate objects" msgstr "també considera els paquets i els objectes alternatius" -#: builtin/fsck.c:616 +#: builtin/fsck.c:624 msgid "enable more strict checking" msgstr "habilita la comprovació més estricta" -#: builtin/fsck.c:618 +#: builtin/fsck.c:626 msgid "write dangling objects in .git/lost-found" msgstr "escriu objectes penjants a .git/lost-found" -#: builtin/fsck.c:619 builtin/prune.c:108 +#: builtin/fsck.c:627 builtin/prune.c:198 msgid "show progress" msgstr "mostra el progrés" -#: builtin/fsck.c:669 +#: builtin/fsck.c:677 msgid "Checking objects" msgstr "Comprovant els objectes" @@ -5610,56 +5722,56 @@ msgstr "Comprovant els objectes" msgid "git gc [<options>]" msgstr "git gc [<opcions>]" -#: builtin/gc.c:79 +#: builtin/gc.c:67 #, c-format -msgid "Invalid gc.pruneexpire: '%s'" -msgstr "gc.pruneexpire no vàlid: %s" +msgid "Invalid %s: '%s'" +msgstr "%s no vàlid: %s" -#: builtin/gc.c:107 +#: builtin/gc.c:112 #, c-format msgid "insanely long object directory %.*s" msgstr "directori d'objectes increïblement llarg %.*s" -#: builtin/gc.c:276 +#: builtin/gc.c:281 msgid "prune unreferenced objects" msgstr "poda objectes sense referència" -#: builtin/gc.c:278 +#: builtin/gc.c:283 msgid "be more thorough (increased runtime)" msgstr "sigues més exhaustiu (el temps d'execució augmenta)" -#: builtin/gc.c:279 +#: builtin/gc.c:284 msgid "enable auto-gc mode" msgstr "habilita el mode de recollida d'escombraries automàtica" -#: builtin/gc.c:280 +#: builtin/gc.c:285 msgid "force running gc even if there may be another gc running" msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant" -#: builtin/gc.c:321 +#: builtin/gc.c:327 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Empaquetant automàticament el dipòsit en el fons per rendiment òptim.\n" -#: builtin/gc.c:323 +#: builtin/gc.c:329 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Empaquetant automàticament el dipòsit per rendiment òptim.\n" -#: builtin/gc.c:324 +#: builtin/gc.c:330 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vegeu \"git help gc\" per neteja manual.\n" -#: builtin/gc.c:342 +#: builtin/gc.c:348 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "gc ja està executant en la màquina '%s' pid %<PRIuMAX> (useu --force si no)" -#: builtin/gc.c:364 +#: builtin/gc.c:376 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5867,7 +5979,7 @@ msgstr "mostra els fitxers coincidents en el paginador" msgid "allow calling of grep(1) (ignored by this build)" msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)" -#: builtin/grep.c:741 builtin/show-ref.c:187 +#: builtin/grep.c:741 builtin/show-ref.c:189 msgid "show usage" msgstr "mostra l'ús" @@ -5895,7 +6007,7 @@ msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits." msgid "both --cached and trees are given." msgstr "s'han donat ambdós --caches i arbres." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:80 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -5903,38 +6015,38 @@ msgstr "" "git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] " "[--] <fitxer>..." -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:81 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <llista-de-camins>" -#: builtin/hash-object.c:94 builtin/tag.c:612 +#: builtin/hash-object.c:92 builtin/tag.c:612 msgid "type" msgstr "tipus" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:92 msgid "object type" msgstr "tipus d'objecte" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:93 msgid "write the object into the object database" msgstr "escriu l'objecte a la base de dades d'objectes" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:95 msgid "read the object from stdin" msgstr "llegiu l'objecte des d'stdin" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:97 msgid "store file as is without filters" msgstr "emmagatzema el fitxer tal com és sense filtres" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:98 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "només suma qualsevulla brossa aleatòria per a crear objectes corruptes per a " "depurar al Git" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:99 msgid "process file as it were from this path" msgstr "processa el fitxer com si fos d'aquest camí" @@ -6062,291 +6174,291 @@ msgstr "ús: %s%s" msgid "`git %s' is aliased to `%s'" msgstr "`git %s' és un àlies de `%s'" -#: builtin/index-pack.c:150 +#: builtin/index-pack.c:151 #, c-format msgid "unable to open %s" msgstr "no s'ha pogut obrir %s" -#: builtin/index-pack.c:200 +#: builtin/index-pack.c:201 #, c-format msgid "object type mismatch at %s" msgstr "hi ha una discordança de tipus d'objecte a %s" -#: builtin/index-pack.c:220 +#: builtin/index-pack.c:221 #, c-format msgid "did not receive expected object %s" msgstr "no s'ha rebut l'objecte esperat %s" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objecte %s: tipus %s esperat, %s trobat" -#: builtin/index-pack.c:265 +#: builtin/index-pack.c:266 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "no es pot omplir %d octet" msgstr[1] "no es pot omplir %d octets" -#: builtin/index-pack.c:275 +#: builtin/index-pack.c:276 msgid "early EOF" msgstr "EOF prematur" -#: builtin/index-pack.c:276 +#: builtin/index-pack.c:277 msgid "read error on input" msgstr "error de lectura d'entrada" -#: builtin/index-pack.c:288 +#: builtin/index-pack.c:289 msgid "used more bytes than were available" -msgstr "s'han usat més octets dels que hi havia disponibles" +msgstr "s'han usat més octets que hi havia disponibles" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:296 msgid "pack too large for current definition of off_t" msgstr "paquet massa gran per a la definició actual d'off_t" -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:312 #, c-format msgid "unable to create '%s'" msgstr "no es pot crear '%s'" -#: builtin/index-pack.c:316 +#: builtin/index-pack.c:317 #, c-format msgid "cannot open packfile '%s'" msgstr "no es pot obrir el fitxer de paquet '%s'" -#: builtin/index-pack.c:330 +#: builtin/index-pack.c:331 msgid "pack signature mismatch" msgstr "hi ha una discordança de firma de paquet" -#: builtin/index-pack.c:332 +#: builtin/index-pack.c:333 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "la versió de paquet %<PRIu32> no és compatible" -#: builtin/index-pack.c:350 +#: builtin/index-pack.c:351 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "el paquet té un objecte dolent a la posició %lu: %s" -#: builtin/index-pack.c:471 +#: builtin/index-pack.c:472 #, c-format msgid "inflate returned %d" msgstr "la inflació ha retornat %d" -#: builtin/index-pack.c:520 +#: builtin/index-pack.c:521 msgid "offset value overflow for delta base object" msgstr "desbordament de valor de desplaçament per a l'objecte base de delta" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "delta base offset is out of bound" msgstr "el desplaçament de base de delta està fora de límits" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 #, c-format msgid "unknown object type %d" msgstr "tipus d'objecte desconegut %d" -#: builtin/index-pack.c:567 +#: builtin/index-pack.c:568 msgid "cannot pread pack file" msgstr "no es pot fer pread en el fitxer de paquet" -#: builtin/index-pack.c:569 +#: builtin/index-pack.c:570 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "final prematur de fitxer de paquet, manca %lu octet" msgstr[1] "final prematur de fitxer de paquet, manquen %lu octets" -#: builtin/index-pack.c:595 +#: builtin/index-pack.c:596 msgid "serious inflate inconsistency" msgstr "hi ha una inconsistència seriosa d'inflació" -#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715 -#: builtin/index-pack.c:749 builtin/index-pack.c:758 +#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771 +#: builtin/index-pack.c:805 builtin/index-pack.c:814 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/index-pack.c:745 builtin/pack-objects.c:162 #: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" -#: builtin/index-pack.c:755 +#: builtin/index-pack.c:811 #, c-format msgid "cannot read existing object %s" msgstr "no es pot llegir l'objecte existent %s" -#: builtin/index-pack.c:769 +#: builtin/index-pack.c:825 #, c-format msgid "invalid blob object %s" msgstr "objecte de blob no vàlid %s" -#: builtin/index-pack.c:783 +#: builtin/index-pack.c:839 #, c-format msgid "invalid %s" msgstr "%s no vàlid" -#: builtin/index-pack.c:787 +#: builtin/index-pack.c:843 msgid "Error in object" msgstr "Error en objecte" -#: builtin/index-pack.c:789 +#: builtin/index-pack.c:845 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No tots els objectes fills de %s són abastables" -#: builtin/index-pack.c:861 builtin/index-pack.c:890 +#: builtin/index-pack.c:917 builtin/index-pack.c:948 msgid "failed to apply delta" msgstr "s'ha fallat en aplicar la delta" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Rebent objectes" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Indexant objectes" -#: builtin/index-pack.c:1081 +#: builtin/index-pack.c:1150 msgid "pack is corrupted (SHA1 mismatch)" msgstr "el paquet és corromput (discordança SHA1)" -#: builtin/index-pack.c:1086 +#: builtin/index-pack.c:1155 msgid "cannot fstat packfile" msgstr "no es pot fer fstat en el fitxer de paquet" -#: builtin/index-pack.c:1089 +#: builtin/index-pack.c:1158 msgid "pack has junk at the end" msgstr "el paquet té brossa al seu final" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1169 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusió més enllà de la insanitat en parse_pack_objects()" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1194 msgid "Resolving deltas" msgstr "Resolent les deltes" -#: builtin/index-pack.c:1133 +#: builtin/index-pack.c:1205 #, c-format msgid "unable to create thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1247 msgid "confusion beyond insanity" msgstr "confusió més enllà de la insanitat" -#: builtin/index-pack.c:1181 +#: builtin/index-pack.c:1253 #, c-format msgid "completed with %d local objects" msgstr "s'ha completat amb %d objectes locals" -#: builtin/index-pack.c:1191 +#: builtin/index-pack.c:1263 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1267 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "El paquet té %d delta no resolta" msgstr[1] "El paquet té %d deltes no resoltes" -#: builtin/index-pack.c:1219 +#: builtin/index-pack.c:1291 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1367 #, c-format msgid "local object %s is corrupt" msgstr "l'objecte local %s és corrupte" -#: builtin/index-pack.c:1322 +#: builtin/index-pack.c:1391 msgid "error while closing pack file" msgstr "error en tancar el fitxer de paquet" -#: builtin/index-pack.c:1335 +#: builtin/index-pack.c:1404 #, c-format msgid "cannot write keep file '%s'" msgstr "no es pot escriure el fitxer a retenir '%s'" -#: builtin/index-pack.c:1343 +#: builtin/index-pack.c:1412 #, c-format msgid "cannot close written keep file '%s'" msgstr "no es pot tancar el fitxer escrit a retenir '%s'" -#: builtin/index-pack.c:1356 +#: builtin/index-pack.c:1425 msgid "cannot store pack file" msgstr "no es pot emmagatzemar el fitxer de paquet" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1436 msgid "cannot store index file" msgstr "no es pot emmagatzemar el fitxer d'índex" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1469 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> dolent" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1475 #, c-format msgid "invalid number of threads specified (%d)" msgstr "s'ha especificat un nombre de fils no vàlid (%d)" -#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1658 #, c-format msgid "no threads support, ignoring %s" msgstr "no hi ha suport de fils, ignorant %s" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1537 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No es pot obrir el fitxer de paquet existent '%s'" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1539 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No es pot obrir el fitxer d'índex de paquets existent de '%s'" -#: builtin/index-pack.c:1517 +#: builtin/index-pack.c:1586 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "sense delta: %d objecte" msgstr[1] "sense delta: %d objectes" -#: builtin/index-pack.c:1524 +#: builtin/index-pack.c:1593 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longitud de cadena = %d: %lu objecte" msgstr[1] "longitud de cadena = %d: %lu objectes" -#: builtin/index-pack.c:1553 +#: builtin/index-pack.c:1622 msgid "Cannot come back to cwd" msgstr "No es pot tornar al directori de treball actual" -#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 -#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 +#: builtin/index-pack.c:1670 builtin/index-pack.c:1673 +#: builtin/index-pack.c:1685 builtin/index-pack.c:1689 #, c-format msgid "bad %s" msgstr "%s dolent" -#: builtin/index-pack.c:1634 +#: builtin/index-pack.c:1703 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 +#: builtin/index-pack.c:1707 builtin/index-pack.c:1716 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "el nom de fitxer de paquet '%s' no acaba amb '.pack'" -#: builtin/index-pack.c:1655 +#: builtin/index-pack.c:1724 msgid "--verify with no packfile name given" msgstr "s'ha donat --verify sense nom de fitxer de paquet" @@ -6415,22 +6527,22 @@ msgstr "no s'han trobat les plantilles %s" msgid "not copying templates of a wrong format version %d from '%s'" msgstr "no copiant plantilles d'una versió de format errònia %d de '%s'" -#: builtin/init-db.c:197 +#: builtin/init-db.c:211 #, c-format msgid "insane git directory %s" msgstr "directori de git boig %s" -#: builtin/init-db.c:331 builtin/init-db.c:334 +#: builtin/init-db.c:343 builtin/init-db.c:346 #, c-format msgid "%s already exists" msgstr "%s ja existeix" -#: builtin/init-db.c:363 +#: builtin/init-db.c:374 #, c-format msgid "unable to handle file type %d" msgstr "no s'ha pogut gestionar el tipus de fitxer %d" -#: builtin/init-db.c:366 +#: builtin/init-db.c:377 #, c-format msgid "unable to move %s to %s" msgstr "no s'ha pogut moure %s a %s" @@ -6438,24 +6550,24 @@ msgstr "no s'ha pogut moure %s a %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:426 +#: builtin/init-db.c:433 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s dipòsit de Git%s a %s%s\n" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Reinitialized existing" msgstr "S'ha reinicialitzat un existent" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Initialized empty" msgstr "S'ha inicialitzat un buit" -#: builtin/init-db.c:428 +#: builtin/init-db.c:435 msgid " shared" msgstr " compartit" -#: builtin/init-db.c:475 +#: builtin/init-db.c:482 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -6463,29 +6575,29 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--" "shared[=<permisos>]] [<directori>]" -#: builtin/init-db.c:498 +#: builtin/init-db.c:505 msgid "permissions" msgstr "permisos" -#: builtin/init-db.c:499 +#: builtin/init-db.c:506 msgid "specify that the git repository is to be shared amongst several users" msgstr "especifica que el dipòsit de git es compartirà entre diversos usuaris" -#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171 +#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171 msgid "be quiet" msgstr "calla" -#: builtin/init-db.c:533 builtin/init-db.c:538 +#: builtin/init-db.c:540 builtin/init-db.c:545 #, c-format msgid "cannot mkdir %s" msgstr "no es pot mkdir %s" -#: builtin/init-db.c:542 +#: builtin/init-db.c:549 #, c-format msgid "cannot chdir to %s" msgstr "no es pot chdir a %s" -#: builtin/init-db.c:563 +#: builtin/init-db.c:570 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6494,7 +6606,7 @@ msgstr "" "no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-" "dir=<directori>)" -#: builtin/init-db.c:591 +#: builtin/init-db.c:598 #, c-format msgid "Cannot access work tree '%s'" msgstr "No es pot accedir a l'arbre de treball '%s'" @@ -6520,8 +6632,8 @@ msgid "trailer(s) to add" msgstr "remolcs a afegir" #: builtin/log.c:41 -msgid "git log [<options>] [<revision range>] [[--] <path>...]" -msgstr "git log [<opcions>] [<rang de revisions>] [[--] <camí>...]" +msgid "git log [<options>] [<revision-range>] [[--] <path>...]" +msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]" #: builtin/log.c:42 msgid "git show [<options>] <object>..." @@ -6589,7 +6701,7 @@ msgstr "No es pot obrir el fitxer de pedaç %s" msgid "Need exactly one range." msgstr "Cal exactament un rang." -#: builtin/log.c:811 +#: builtin/log.c:813 msgid "Not a range." msgstr "No és un rang." @@ -6791,7 +6903,7 @@ msgstr "S'ha fallat en crear els fitxers de sortida" msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]" -#: builtin/log.c:1638 +#: builtin/log.c:1637 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -6799,7 +6911,7 @@ msgstr "" "No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu " "<font> manualment.\n" -#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 +#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662 #, c-format msgid "Unknown commit %s" msgstr "Comissió desconeguda %s" @@ -7076,40 +7188,40 @@ msgstr "Cap missatge de fusió -- no actualitzant HEAD\n" msgid "'%s' does not point to a commit" msgstr "'%s' no assenyala una comissió" -#: builtin/merge.c:559 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Cadena branch.%s.mergeoptions dolenta: %s" -#: builtin/merge.c:654 +#: builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree ha fallat en escriure un arbre" -#: builtin/merge.c:678 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "No gestionant res a part de la fusió de dos caps." -#: builtin/merge.c:692 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opció desconeguda de merge-recursive: -X%s" -#: builtin/merge.c:705 +#: builtin/merge.c:683 #, c-format msgid "unable to write %s" msgstr "no s'ha pogut escriure %s" -#: builtin/merge.c:794 +#: builtin/merge.c:772 #, c-format msgid "Could not read from '%s'" msgstr "No s'ha pogut llegir de '%s'" -#: builtin/merge.c:803 +#: builtin/merge.c:781 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "No cometent la fusió; useu 'git commit' per a completar la fusió.\n" -#: builtin/merge.c:809 +#: builtin/merge.c:787 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7125,49 +7237,54 @@ msgstr "" "S'ignoraran les línies que comencin amb '%c', i un missatge buit\n" "avorta la comissió.\n" -#: builtin/merge.c:833 +#: builtin/merge.c:811 msgid "Empty commit message." msgstr "Missatge de comissió buit." -#: builtin/merge.c:845 +#: builtin/merge.c:823 #, c-format msgid "Wonderful.\n" msgstr "Meravellós.\n" -#: builtin/merge.c:900 +#: builtin/merge.c:878 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el " "resultat.\n" -#: builtin/merge.c:916 +#: builtin/merge.c:894 #, c-format msgid "'%s' is not a commit" msgstr "'%s' no és una comissió" -#: builtin/merge.c:957 +#: builtin/merge.c:935 msgid "No current branch." msgstr "Cap branca actual." -#: builtin/merge.c:959 +#: builtin/merge.c:937 msgid "No remote for the current branch." msgstr "No hi ha cap remot per a la branca actual." -#: builtin/merge.c:961 +#: builtin/merge.c:939 msgid "No default upstream defined for the current branch." msgstr "No hi ha cap font per defecte definida per a la branca actual." -#: builtin/merge.c:966 +#: builtin/merge.c:944 #, c-format msgid "No remote-tracking branch for %s from %s" -msgstr "No hi ha cap branca de seguiment remot per a %s de %s" +msgstr "No hi ha cap branca amb seguiment remot per a %s de %s" -#: builtin/merge.c:1122 +#: builtin/merge.c:1081 +#, c-format +msgid "could not close '%s'" +msgstr "no s'ha pogut tancar '%s'" + +#: builtin/merge.c:1208 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)." -#: builtin/merge.c:1138 +#: builtin/merge.c:1224 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7175,11 +7292,11 @@ msgstr "" "No heu completat la vostra fusió (MERGE_HEAD existeix).\n" "Si us plau, cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1141 git-pull.sh:34 +#: builtin/merge.c:1227 git-pull.sh:74 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No heu completat la vostra fusió (MERGE_HEAD existeix)." -#: builtin/merge.c:1145 +#: builtin/merge.c:1231 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7187,103 +7304,103 @@ msgstr "" "No heu completat el vostre recull de cireres (CHERRY_PICK_HEAD existeix).\n" "Si us plau, cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1148 +#: builtin/merge.c:1234 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "No heu completat el vostre recull de cireres (CHERRY_PICK_HEAD existeix)." -#: builtin/merge.c:1157 +#: builtin/merge.c:1243 msgid "You cannot combine --squash with --no-ff." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1166 +#: builtin/merge.c:1251 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hi ha una comissió especificada i merge.defaultToUpstream no està " "establert." -#: builtin/merge.c:1198 -msgid "Can merge only exactly one commit into empty head" -msgstr "Es pot fusionar només exactament una comissió a un cap buit" - -#: builtin/merge.c:1201 +#: builtin/merge.c:1268 msgid "Squash commit into empty head not supported yet" msgstr "Aixafar una comissió a un cap buit encara no es permet" -#: builtin/merge.c:1203 +#: builtin/merge.c:1270 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Una comissió no d'avanç ràpid no té sentit a un cap buit" -#: builtin/merge.c:1208 +#: builtin/merge.c:1276 #, c-format msgid "%s - not something we can merge" msgstr "%s - no és una cosa que puguem fusionar" -#: builtin/merge.c:1259 +#: builtin/merge.c:1278 +msgid "Can merge only exactly one commit into empty head" +msgstr "Es pot fusionar només exactament una comissió a un cap buit" + +#: builtin/merge.c:1333 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La comissió %s té una firma GPG no fiable, suposadament de %s." -#: builtin/merge.c:1262 +#: builtin/merge.c:1336 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La comissió %s té una firma GPG dolenta suposadament de %s." -#: builtin/merge.c:1265 +#: builtin/merge.c:1339 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La comissió %s no té firma GPG." -#: builtin/merge.c:1268 +#: builtin/merge.c:1342 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La comissió %s té una firma GPG bona de %s\n" -#: builtin/merge.c:1349 +#: builtin/merge.c:1423 #, c-format msgid "Updating %s..%s\n" msgstr "Actualitzant %s..%s\n" -#: builtin/merge.c:1388 +#: builtin/merge.c:1462 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentant una fusió molt trivial en l'índex...\n" -#: builtin/merge.c:1395 +#: builtin/merge.c:1469 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1427 +#: builtin/merge.c:1501 msgid "Not possible to fast-forward, aborting." msgstr "No és possible avançar ràpidament, avortant." -#: builtin/merge.c:1450 builtin/merge.c:1529 +#: builtin/merge.c:1524 builtin/merge.c:1603 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rebobinant l'arbre a la pristina...\n" -#: builtin/merge.c:1454 +#: builtin/merge.c:1528 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentant l'estratègia de fusió %s...\n" -#: builtin/merge.c:1520 +#: builtin/merge.c:1594 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Cap estratègia de fusió ha gestionat la fusió.\n" -#: builtin/merge.c:1522 +#: builtin/merge.c:1596 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "L'estratègia de fusió %s ha fallat.\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1605 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Usant el %s per a preparar la resolució a mà.\n" -#: builtin/merge.c:1543 +#: builtin/merge.c:1617 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7476,7 +7593,7 @@ msgstr "%s, origen=%s, destí=%s" msgid "Renaming %s to %s\n" msgstr "Canviant el nom de %s a %s\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 +#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361 #, c-format msgid "renaming '%s' failed" msgstr "el canvi del nom de '%s' ha fallat" @@ -7854,7 +7971,7 @@ msgstr "referència de notes" msgid "use notes from <notes-ref>" msgstr "usa les notes de <referència-de-notes>" -#: builtin/notes.c:989 builtin/remote.c:1621 +#: builtin/notes.c:989 builtin/remote.c:1618 #, c-format msgid "Unknown subcommand: %s" msgstr "Subordre desconegut: %s" @@ -7880,182 +7997,182 @@ msgstr "error de deflació (%d)" msgid "Writing objects" msgstr "Escrivint els objectes" -#: builtin/pack-objects.c:1013 +#: builtin/pack-objects.c:1011 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no " "s'estan empaquetant" -#: builtin/pack-objects.c:2173 +#: builtin/pack-objects.c:2171 msgid "Compressing objects" msgstr "Comprimint objectes" -#: builtin/pack-objects.c:2570 +#: builtin/pack-objects.c:2568 #, c-format msgid "unsupported index version %s" msgstr "versió d'índex no compatible %s" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2572 #, c-format msgid "bad index version '%s'" msgstr "versió d'índex dolenta '%s'" -#: builtin/pack-objects.c:2597 +#: builtin/pack-objects.c:2595 #, c-format msgid "option %s does not accept negative form" msgstr "l'opció %s no accepta la forma negativa" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2599 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "no s'ha pogut analitzar el valor '%s' per a l'opció %s" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2619 msgid "do not show progress meter" msgstr "no mostris l'indicador de progrés" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "show progress meter" msgstr "mostra l'indicador de progrés" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter during object writing phase" msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2626 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress quan l'indicador de progrés es mostra" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:2627 msgid "version[,offset]" msgstr "versió[,desplaçament]" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "write the pack index file in the specified idx format version" msgstr "" "escriu el fitxer d'índex de paquet en la versió de format d'índex " "especificada" -#: builtin/pack-objects.c:2633 +#: builtin/pack-objects.c:2631 msgid "maximum size of each output pack file" msgstr "mida màxima de cada fitxer de paquet de sortida" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "ignore borrowed objects from alternate object store" msgstr "" "ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore packed objects" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "limit pack window by objects" msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by memory in addition to object limit" msgstr "" "limita la finestra d'empaquetament per memòria a més del límit d'objectes" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud màxima de la cadena de deltes permesa en el paquet resultant" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "reuse existing deltas" msgstr "reusa les deltes existents" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing objects" msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use threads when searching for best delta matches" msgstr "usa fils en cercar les millores coincidències de delta" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "do not create an empty pack output" msgstr "no creïs una emissió de paquet buida" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "read revision arguments from standard input" msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "limit the objects to those that are not yet packed" msgstr "limita els objectes als que encara no s'hagin empaquetat" -#: builtin/pack-objects.c:2660 +#: builtin/pack-objects.c:2658 msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevulla referència" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2661 msgid "include objects referred by reflog entries" msgstr "" "inclou els objectes als quals facin referència les entrades del registre de " "referències" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2664 msgid "include objects referred to by the index" msgstr "inclou els objectes als quals faci referència l'índex" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2667 msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "include tag objects that refer to objects to be packed" msgstr "" "inclou els objectes d'etiqueta que facin referència als objectes a empaquetar" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "keep unreachable objects" msgstr "retén els objectes inabastables" -#: builtin/pack-objects.c:2674 parse-options.h:140 +#: builtin/pack-objects.c:2672 parse-options.h:139 msgid "time" msgstr "hora" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "unpack unreachable objects newer than <time>" msgstr "desempaqueta els objectes inabastables més nous que <hora>" -#: builtin/pack-objects.c:2678 +#: builtin/pack-objects.c:2676 msgid "create thin packs" msgstr "crea paquets prims" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create packs suitable for shallow fetches" msgstr "crea paquets adequats per als obteniments superficials" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "ignore packs that have companion .keep file" msgstr "ignora els paquets que tinguin un fitxer .keep corresponent" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "pack compression level" msgstr "nivell de compressió de paquet" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "do not hide commits by grafts" msgstr "no amaguis les comissions per empelt" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usa un índex de mapa de bits, si està disponible, per a accelerar el " "recompte d'objectes" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "write a bitmap index together with the pack index" msgstr "escriu un índex de mapa de bits junt amb l'índex de paquet" -#: builtin/pack-objects.c:2781 +#: builtin/pack-objects.c:2779 msgid "Counting objects" msgstr "Comptant els objectes" @@ -8083,18 +8200,58 @@ msgstr "Eliminant objectes duplicats" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <hora>] [--] [<cap>...]" -#: builtin/prune.c:106 +#: builtin/prune.c:86 +#, c-format +msgid "Removing worktrees/%s: not a valid directory" +msgstr "Eliminació de worktrees/%s: no és un directori vàlid" + +#: builtin/prune.c:92 +#, c-format +msgid "Removing worktrees/%s: gitdir file does not exist" +msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix" + +#: builtin/prune.c:97 +#, c-format +msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)" + +#: builtin/prune.c:108 +#, c-format +msgid "Removing worktrees/%s: invalid gitdir file" +msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid" + +#: builtin/prune.c:124 +#, c-format +msgid "Removing worktrees/%s: gitdir file points to non-existent location" +msgstr "" +"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no " +"existent" + +#: builtin/prune.c:159 +#, c-format +msgid "failed to remove: %s" +msgstr "s'ha fallat en eliminar: %s" + +#: builtin/prune.c:196 msgid "do not remove, show only" msgstr "no eliminis, només mostra" -#: builtin/prune.c:107 +#: builtin/prune.c:197 msgid "report pruned objects" msgstr "informa d'objectes podats" -#: builtin/prune.c:110 +#: builtin/prune.c:199 +msgid "prune .git/worktrees" +msgstr "poda .git/worktrees" + +#: builtin/prune.c:201 msgid "expire objects older than <time>" msgstr "fes caducar els objectes més vells que <hora>" +#: builtin/prune.c:216 +msgid "--worktrees does not take extra arguments" +msgstr "--worktrees no accepta paràmetres extres" + #: builtin/push.c:14 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" @@ -8502,12 +8659,12 @@ msgstr "salta l'aplicació del filtre d'agafament escàs" msgid "debug unpack-trees" msgstr "depura unpack-trees" -#: builtin/reflog.c:429 +#: builtin/reflog.c:430 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "%s' per a '%s' no és una marca de temps vàlida" -#: builtin/reflog.c:546 builtin/reflog.c:551 +#: builtin/reflog.c:547 builtin/reflog.c:552 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' no és una marca de temps vàlida" @@ -8645,12 +8802,12 @@ msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "especificar les branques a seguir té sentit només amb miralls d'obteniment" -#: builtin/remote.c:187 builtin/remote.c:643 +#: builtin/remote.c:187 builtin/remote.c:640 #, c-format msgid "remote %s already exists." msgstr "el remot %s ja existeix." -#: builtin/remote.c:191 builtin/remote.c:647 +#: builtin/remote.c:191 builtin/remote.c:644 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' no és un nom de remot vàlid" @@ -8675,27 +8832,27 @@ msgstr "(coincident)" msgid "(delete)" msgstr "(suprimir)" -#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604 +#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 #, c-format msgid "Could not append '%s' to '%s'" msgstr "No s'ha pogut annexar '%s' a '%s'" -#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895 +#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892 #, c-format msgid "No such remote: %s" msgstr "No hi ha tal remot: %s" -#: builtin/remote.c:653 +#: builtin/remote.c:650 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "No s'ha pogut canviar el nom de la secció de configuració '%s' a '%s'" -#: builtin/remote.c:659 builtin/remote.c:847 +#: builtin/remote.c:656 builtin/remote.c:844 #, c-format msgid "Could not remove config section '%s'" msgstr "No s'ha pogut eliminar la secció de configuració '%s'" -#: builtin/remote.c:674 +#: builtin/remote.c:671 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8706,32 +8863,32 @@ msgstr "" "\t%s\n" "\tSi us plau, actualitzeu la configuració manualment si és necessari." -#: builtin/remote.c:680 +#: builtin/remote.c:677 #, c-format msgid "Could not append '%s'" msgstr "No s'ha pogut annexar '%s'" -#: builtin/remote.c:691 +#: builtin/remote.c:688 #, c-format msgid "Could not set '%s'" msgstr "No s'ha pogut establir '%s'" -#: builtin/remote.c:713 +#: builtin/remote.c:710 #, c-format msgid "deleting '%s' failed" msgstr "la supressió de '%s' ha fallat" -#: builtin/remote.c:747 +#: builtin/remote.c:744 #, c-format msgid "creating '%s' failed" msgstr "la creació de '%s' ha fallat" -#: builtin/remote.c:766 +#: builtin/remote.c:763 #, c-format msgid "Could not remove branch %s" msgstr "No s'ha pogut eliminar la branca %s" -#: builtin/remote.c:833 +#: builtin/remote.c:830 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8746,265 +8903,265 @@ msgstr[1] "" "eliminat;\n" "per a suprimir-les, useu:" -#: builtin/remote.c:948 +#: builtin/remote.c:945 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nou (el pròxim obteniment emmagatzemarà a remotes/%s)" -#: builtin/remote.c:951 +#: builtin/remote.c:948 msgid " tracked" msgstr " seguit" -#: builtin/remote.c:953 +#: builtin/remote.c:950 msgid " stale (use 'git remote prune' to remove)" msgstr " ranci (useu 'git remote prune' per a eliminar)" -#: builtin/remote.c:955 +#: builtin/remote.c:952 msgid " ???" msgstr " ???" -#: builtin/remote.c:996 +#: builtin/remote.c:993 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge no vàlid; no es pot rebasar sobre > 1 branca" -#: builtin/remote.c:1003 +#: builtin/remote.c:1000 #, c-format msgid "rebases onto remote %s" msgstr "es rebasa sobre el remot %s" -#: builtin/remote.c:1006 +#: builtin/remote.c:1003 #, c-format msgid " merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:1007 +#: builtin/remote.c:1004 msgid " and with remote" msgstr " i amb el remot" -#: builtin/remote.c:1009 +#: builtin/remote.c:1006 #, c-format msgid "merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:1010 +#: builtin/remote.c:1007 msgid " and with remote" msgstr " i amb el remot" -#: builtin/remote.c:1056 +#: builtin/remote.c:1053 msgid "create" msgstr "crea" -#: builtin/remote.c:1059 +#: builtin/remote.c:1056 msgid "delete" msgstr "suprimeix" -#: builtin/remote.c:1063 +#: builtin/remote.c:1060 msgid "up to date" msgstr "al dia" -#: builtin/remote.c:1066 +#: builtin/remote.c:1063 msgid "fast-forwardable" msgstr "avanç ràpid possible" -#: builtin/remote.c:1069 +#: builtin/remote.c:1066 msgid "local out of date" msgstr "local no actualitzat" -#: builtin/remote.c:1076 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s força a %-*s (%s)" -#: builtin/remote.c:1079 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s puja a %-*s (%s)" -#: builtin/remote.c:1083 +#: builtin/remote.c:1080 #, c-format msgid " %-*s forces to %s" msgstr " %-*s força a %s" -#: builtin/remote.c:1086 +#: builtin/remote.c:1083 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s puja a %s" -#: builtin/remote.c:1154 +#: builtin/remote.c:1151 msgid "do not query remotes" msgstr "no consultis els remots" -#: builtin/remote.c:1181 +#: builtin/remote.c:1178 #, c-format msgid "* remote %s" msgstr "* remot %s" -#: builtin/remote.c:1182 +#: builtin/remote.c:1179 #, c-format msgid " Fetch URL: %s" msgstr " URL d'obteniment: %s" -#: builtin/remote.c:1183 builtin/remote.c:1334 +#: builtin/remote.c:1180 builtin/remote.c:1331 msgid "(no URL)" msgstr "(sense URL)" -#: builtin/remote.c:1192 builtin/remote.c:1194 +#: builtin/remote.c:1189 builtin/remote.c:1191 #, c-format msgid " Push URL: %s" msgstr " URL de pujada: %s" -#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200 +#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " HEAD branch: %s" msgstr " Branca de HEAD: %s" -#: builtin/remote.c:1202 +#: builtin/remote.c:1199 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " Branca de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n" -#: builtin/remote.c:1214 +#: builtin/remote.c:1211 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branca remota:%s" msgstr[1] " Branques remotes:%s" -#: builtin/remote.c:1217 builtin/remote.c:1244 +#: builtin/remote.c:1214 builtin/remote.c:1241 msgid " (status not queried)" msgstr " (estat no consultat)" -#: builtin/remote.c:1226 +#: builtin/remote.c:1223 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branca local configurada per a 'git pull':" msgstr[1] " Branques locals configurades per a 'git pull':" -#: builtin/remote.c:1234 +#: builtin/remote.c:1231 msgid " Local refs will be mirrored by 'git push'" msgstr " 'git push' reflectirà les referències locals" -#: builtin/remote.c:1241 +#: builtin/remote.c:1238 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Referència local configurada per a 'git push'%s:" msgstr[1] " Referències locals configurades per a 'git push'%s:" -#: builtin/remote.c:1262 +#: builtin/remote.c:1259 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "estableix refs/remotes/<name>/HEAD segons el remot" -#: builtin/remote.c:1264 +#: builtin/remote.c:1261 msgid "delete refs/remotes/<name>/HEAD" msgstr "suprimeix refs/remotes/<name>/HEAD" -#: builtin/remote.c:1279 +#: builtin/remote.c:1276 msgid "Cannot determine remote HEAD" msgstr "No es pot determinar el HEAD remot" -#: builtin/remote.c:1281 +#: builtin/remote.c:1278 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Múltiples branques de HEAD remotes. Si us plau, trieu-ne una explícitament " "amb:" -#: builtin/remote.c:1291 +#: builtin/remote.c:1288 #, c-format msgid "Could not delete %s" msgstr "No s'ha pogut suprimir %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1296 #, c-format msgid "Not a valid ref: %s" msgstr "No és una referència vàlida: %s" -#: builtin/remote.c:1301 +#: builtin/remote.c:1298 #, c-format msgid "Could not setup %s" msgstr "No s'ha pogut configurar %s" -#: builtin/remote.c:1319 +#: builtin/remote.c:1316 #, c-format msgid " %s will become dangling!" msgstr " %s es tornarà penjant!" -#: builtin/remote.c:1320 +#: builtin/remote.c:1317 #, c-format msgid " %s has become dangling!" msgstr " %s s'ha tornat penjant!" -#: builtin/remote.c:1330 +#: builtin/remote.c:1327 #, c-format msgid "Pruning %s" msgstr "Podant %s" -#: builtin/remote.c:1331 +#: builtin/remote.c:1328 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1354 +#: builtin/remote.c:1351 #, c-format msgid " * [would prune] %s" msgstr " * [podaria] %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1354 #, c-format msgid " * [pruned] %s" msgstr " * [podat] %s" -#: builtin/remote.c:1402 +#: builtin/remote.c:1399 msgid "prune remotes after fetching" msgstr "poda els remots després d'obtenir-los" -#: builtin/remote.c:1468 builtin/remote.c:1542 +#: builtin/remote.c:1465 builtin/remote.c:1539 #, c-format msgid "No such remote '%s'" msgstr "No hi ha tal remot '%s'" -#: builtin/remote.c:1488 +#: builtin/remote.c:1485 msgid "add branch" msgstr "afegeix branca" -#: builtin/remote.c:1495 +#: builtin/remote.c:1492 msgid "no remote specified" msgstr "cap remot especificat" -#: builtin/remote.c:1517 +#: builtin/remote.c:1514 msgid "manipulate push URLs" msgstr "manipula els URL de pujada" -#: builtin/remote.c:1519 +#: builtin/remote.c:1516 msgid "add URL" msgstr "afegeix URL" -#: builtin/remote.c:1521 +#: builtin/remote.c:1518 msgid "delete URLs" msgstr "suprimeix URLs" -#: builtin/remote.c:1528 +#: builtin/remote.c:1525 msgid "--add --delete doesn't make sense" msgstr "--add --delete no té sentit" -#: builtin/remote.c:1568 +#: builtin/remote.c:1565 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patró d'URL antic no vàlid: %s" -#: builtin/remote.c:1576 +#: builtin/remote.c:1573 #, c-format msgid "No such URL found: %s" msgstr "No s'ha trobat tal URL: %s" -#: builtin/remote.c:1578 +#: builtin/remote.c:1575 msgid "Will not delete all non-push URLs" msgstr "No se suprimiran tots els URL no de pujada" -#: builtin/remote.c:1592 +#: builtin/remote.c:1589 msgid "be verbose; must be placed before a subcommand" msgstr "sigues detallat; s'ha de col·locar abans d'una subordre" @@ -9078,7 +9235,7 @@ msgstr "mida màxima de cada fitxer de paquet" msgid "repack objects in packs marked with .keep" msgstr "reempaqueta els objectes en paquets marcats amb .keep" -#: builtin/repack.c:375 +#: builtin/repack.c:377 #, c-format msgid "removing '%s' failed" msgstr "la supressió de '%s' ha fallat" @@ -9456,7 +9613,7 @@ msgstr "" "\n" "(useu 'rm -rf' si realment voleu eliminar-lo, inclòs tota la seva història)" -#: builtin/rm.c:231 +#: builtin/rm.c:230 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -9470,7 +9627,7 @@ msgstr[1] "" "els fitxers següents tenen contingut allistat diferent d'ambdós\n" "el fitxer i el HEAD:" -#: builtin/rm.c:236 +#: builtin/rm.c:235 msgid "" "\n" "(use -f to force removal)" @@ -9478,13 +9635,13 @@ msgstr "" "\n" "(useu -f per a forçar la supressió)" -#: builtin/rm.c:240 +#: builtin/rm.c:239 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "el fitxer següent té canvis allistats en l'índex:" msgstr[1] "els fitxers següents tenen canvis allistats en l'índex:" -#: builtin/rm.c:244 builtin/rm.c:255 +#: builtin/rm.c:243 builtin/rm.c:254 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -9492,44 +9649,44 @@ msgstr "" "\n" "(useu --cached per a desar el fitxer, o -f per a forçar la supressió)" -#: builtin/rm.c:252 +#: builtin/rm.c:251 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "el fitxer següent té modificacions locals:" msgstr[1] "els fitxers següents tenen modificacions locals:" -#: builtin/rm.c:270 +#: builtin/rm.c:269 msgid "do not list removed files" msgstr "no llistis els fitxers eliminats" -#: builtin/rm.c:271 +#: builtin/rm.c:270 msgid "only remove from the index" msgstr "només elimina de l'índex" -#: builtin/rm.c:272 +#: builtin/rm.c:271 msgid "override the up-to-date check" msgstr "passa per alt la comprovació d'actualitat" -#: builtin/rm.c:273 +#: builtin/rm.c:272 msgid "allow recursive removal" msgstr "permet la supressió recursiva" -#: builtin/rm.c:275 +#: builtin/rm.c:274 msgid "exit with a zero status even if nothing matched" msgstr "surt amb estat zero encara que res hagi coincidit" -#: builtin/rm.c:318 +#: builtin/rm.c:317 msgid "Please, stage your changes to .gitmodules or stash them to proceed" msgstr "" "Si us plau, allisteu els vostres canvis a .gitmodules o emmagatzemeu-los per " "a procedir" -#: builtin/rm.c:336 +#: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" msgstr "no eliminant '%s' recursivament sense -r" -#: builtin/rm.c:375 +#: builtin/rm.c:374 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: no s'ha pogut eliminar %s" @@ -9580,67 +9737,67 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:659 msgid "show remote-tracking and local branches" msgstr "mostra les branques amb seguiment remot i les locals" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:661 msgid "show remote-tracking branches" msgstr "mostra les branques amb seguiment remot" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:663 msgid "color '*!+-' corresponding to the branch" msgstr "colora '*!+-' corresponent a la branca" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:665 msgid "show <n> more commits after the common ancestor" msgstr "mostra <n> comissions després de l'avantpassat comú" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:667 msgid "synonym to more=-1" msgstr "sinònim de more=-1" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:668 msgid "suppress naming strings" msgstr "omet l'anomenament de cadenes" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:670 msgid "include the current branch" msgstr "inclou la branca actual" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:672 msgid "name commits with their object names" msgstr "anomena les comissions amb els seus noms d'objecte" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:674 msgid "show possible merge bases" msgstr "mostra les bases de fusió possibles" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:676 msgid "show refs unreachable from any other ref" msgstr "mostra les referències inabastables de qualsevulla altra referència" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:678 msgid "show commits in topological order" msgstr "mostra les comissions en ordre topològic" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:681 msgid "show only commits not on the first branch" msgstr "mostra només les comissions que no siguin en la primera branca" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:683 msgid "show merges reachable from only one tip" msgstr "mostra les fusions abastables de només una punta" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:685 msgid "topologically sort, maintaining date order where possible" msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible" -#: builtin/show-branch.c:681 +#: builtin/show-branch.c:688 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:682 +#: builtin/show-branch.c:689 msgid "show <n> most recent ref-log entries starting at base" msgstr "mostra les <n> entrades més recents començant a la base" @@ -9656,37 +9813,37 @@ msgstr "" msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "git show-ref --exclude-existing[=pattern] < llista-de-referències" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:170 msgid "only show tags (can be combined with heads)" msgstr "mostra només les etiquetes (es pot combinar amb heads)" -#: builtin/show-ref.c:169 +#: builtin/show-ref.c:171 msgid "only show heads (can be combined with tags)" msgstr "mostra només els caps (es pot combinar amb tags)" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:172 msgid "stricter reference checking, requires exact ref path" msgstr "" "comprovació de referència més estricta, requereix el camí de referència " "exacte" -#: builtin/show-ref.c:173 builtin/show-ref.c:175 +#: builtin/show-ref.c:175 builtin/show-ref.c:177 msgid "show the HEAD reference, even if it would be filtered out" msgstr "mostra la referència HEAD, encara que es filtrés" -#: builtin/show-ref.c:177 +#: builtin/show-ref.c:179 msgid "dereference tags into object IDs" msgstr "dereferencia les etiquetes a IDs d'objecte" -#: builtin/show-ref.c:179 +#: builtin/show-ref.c:181 msgid "only show SHA1 hash using <n> digits" msgstr "mostra el hash SHA1 usant només <n> xifres" -#: builtin/show-ref.c:183 +#: builtin/show-ref.c:185 msgid "do not print results to stdout (useful with --verify)" msgstr "no imprimeixis els resultats a stdout (útil amb --verify)" -#: builtin/show-ref.c:185 +#: builtin/show-ref.c:187 msgid "show refs from stdin that aren't in local repository" msgstr "mostra les referències d'stdin que no siguin en el dipòsit local" @@ -9946,127 +10103,200 @@ msgstr "Etiqueta '%s' actualitzada (era %s)\n" msgid "Unpacking objects" msgstr "Desempaquetant objectes" -#: builtin/update-index.c:403 +#: builtin/update-index.c:70 +#, c-format +msgid "failed to create directory %s" +msgstr "s'ha fallat en crear el directori %s" + +#: builtin/update-index.c:76 +#, c-format +msgid "failed to stat %s" +msgstr "s'ha fallat en fer stat a %s" + +#: builtin/update-index.c:86 +#, c-format +msgid "failed to create file %s" +msgstr "s'ha fallat en crear el fitxer %s" + +#: builtin/update-index.c:94 +#, c-format +msgid "failed to delete file %s" +msgstr "s'ha fallat en suprimir el fitxer %s" + +#: builtin/update-index.c:101 builtin/update-index.c:203 +#, c-format +msgid "failed to delete directory %s" +msgstr "s'ha fallat en suprimir el directori %s" + +#: builtin/update-index.c:124 +#, c-format +msgid "Testing " +msgstr "Provant " + +#: builtin/update-index.c:136 +msgid "directory stat info does not change after adding a new file" +msgstr "" +"la informació d'stat de directori no canvia després d'afegir un fitxer nou" + +#: builtin/update-index.c:149 +msgid "directory stat info does not change after adding a new directory" +msgstr "" +"la informació d'stat de directori no canvia després d'afegir un directori nou" + +#: builtin/update-index.c:162 +msgid "directory stat info changes after updating a file" +msgstr "" +"la informació d'stat de directori canvia després d'actualitzar un fitxer" + +#: builtin/update-index.c:173 +msgid "directory stat info changes after adding a file inside subdirectory" +msgstr "" +"la informació d'stat de directori canvia després d'afegir un fitxer dins un " +"subdirectori" + +#: builtin/update-index.c:184 +msgid "directory stat info does not change after deleting a file" +msgstr "" +"la informació d'stat de directori no canvia després de suprimir un fitxer" + +#: builtin/update-index.c:197 +msgid "directory stat info does not change after deleting a directory" +msgstr "" +"la informació d'stat de directori no canvia després de suprimir un directori" + +#: builtin/update-index.c:204 +msgid " OK" +msgstr " D'acord" + +#: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opcions>] [--] [<fitxer>...]" -#: builtin/update-index.c:757 +#: builtin/update-index.c:918 msgid "continue refresh even when index needs update" msgstr "" "continua l'actualització encara que l'índex necessiti una actualització" -#: builtin/update-index.c:760 +#: builtin/update-index.c:921 msgid "refresh: ignore submodules" msgstr "actualitza: ignora els submòduls" -#: builtin/update-index.c:763 +#: builtin/update-index.c:924 msgid "do not ignore new files" msgstr "no ignoris els fitxers nous" -#: builtin/update-index.c:765 +#: builtin/update-index.c:926 msgid "let files replace directories and vice-versa" msgstr "deixa que els fitxers reemplacin els directoris i viceversa" -#: builtin/update-index.c:767 +#: builtin/update-index.c:928 msgid "notice files missing from worktree" msgstr "tingues en compte els fitxers absents de l'arbre de treball" -#: builtin/update-index.c:769 +#: builtin/update-index.c:930 msgid "refresh even if index contains unmerged entries" msgstr "actualitza encara que l'índex contingui entrades no fusionades" -#: builtin/update-index.c:772 +#: builtin/update-index.c:933 msgid "refresh stat information" msgstr "actualitza la informació d'estadístiques" -#: builtin/update-index.c:776 +#: builtin/update-index.c:937 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "com --refresh, però ignora l'ajust assume-unchanged" -#: builtin/update-index.c:780 +#: builtin/update-index.c:941 msgid "<mode>,<object>,<path>" msgstr "<mode>,<objecte>,<camí>" -#: builtin/update-index.c:781 +#: builtin/update-index.c:942 msgid "add the specified entry to the index" msgstr "afegeix l'entrada especificada a l'índex" -#: builtin/update-index.c:785 +#: builtin/update-index.c:946 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:786 +#: builtin/update-index.c:947 msgid "override the executable bit of the listed files" msgstr "passa per alt el bit executable dels fitxers llistats" -#: builtin/update-index.c:790 +#: builtin/update-index.c:951 msgid "mark files as \"not changing\"" msgstr "marca els fitxers com a \"not changing\"" -#: builtin/update-index.c:793 +#: builtin/update-index.c:954 msgid "clear assumed-unchanged bit" msgstr "neteja el bit assumed-unchanged" -#: builtin/update-index.c:796 +#: builtin/update-index.c:957 msgid "mark files as \"index-only\"" msgstr "marca els fitxers com a \"index-only\"" -#: builtin/update-index.c:799 +#: builtin/update-index.c:960 msgid "clear skip-worktree bit" msgstr "neteja el bit skip-worktree" -#: builtin/update-index.c:802 +#: builtin/update-index.c:963 msgid "add to index only; do not add content to object database" msgstr "" "només afegeix a l'índex; no afegeixis el contingut a la base de dades " "d'objectes" -#: builtin/update-index.c:804 +#: builtin/update-index.c:965 msgid "remove named paths even if present in worktree" msgstr "" "elimina els camins anomenats encara que estiguin presents en l'arbre de " "treball" -#: builtin/update-index.c:806 +#: builtin/update-index.c:967 msgid "with --stdin: input lines are terminated by null bytes" msgstr "amb --stdin: les línies d'entrada acaben amb octets nuls" -#: builtin/update-index.c:808 +#: builtin/update-index.c:969 msgid "read list of paths to be updated from standard input" msgstr "llegeix la llista de camins a actualitzar des de l'entrada estàndard" -#: builtin/update-index.c:812 +#: builtin/update-index.c:973 msgid "add entries from standard input to the index" msgstr "afegeix les entrades de l'entrada estàndard a l'índex" -#: builtin/update-index.c:816 +#: builtin/update-index.c:977 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "reemplena les etapes #2 i #3 per als camins llistats" -#: builtin/update-index.c:820 +#: builtin/update-index.c:981 msgid "only update entries that differ from HEAD" msgstr "només actualitza les entrades que difereixin de HEAD" -#: builtin/update-index.c:824 +#: builtin/update-index.c:985 msgid "ignore files missing from worktree" msgstr "ignora els fitxers absents de l'arbre de treball" -#: builtin/update-index.c:827 +#: builtin/update-index.c:988 msgid "report actions to standard output" msgstr "informa de les accions en la sortida estàndard" -#: builtin/update-index.c:829 +#: builtin/update-index.c:990 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(per porcellanes) oblida't dels conflictes no resolts ni desats" -#: builtin/update-index.c:833 +#: builtin/update-index.c:994 msgid "write index in this format" msgstr "escriu l'índex en aquest format" -#: builtin/update-index.c:835 +#: builtin/update-index.c:996 msgid "enable or disable split index" msgstr "habilita o inhabilita l'índex dividit" +#: builtin/update-index.c:998 +msgid "enable/disable untracked cache" +msgstr "habilita/inhabilita la memòria cau no seguida" + +#: builtin/update-index.c:1000 +msgid "enable untracked cache without testing the filesystem" +msgstr "habilita la memòria cau no seguida sense provar el sistema de fitxers" + #: builtin/update-ref.c:9 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<opcions>] -d <nom-de-referència> [<valor-antic>]" @@ -10163,110 +10393,130 @@ msgstr "" "'git help <concepte>' per a llegir sobre una subordre o concepte\n" "específic." -#: common-cmds.h:8 +#: common-cmds.h:10 +msgid "start a working area (see also: git help tutorial)" +msgstr "començar un àrea de treball (vegeu també: git help tutorial)" + +#: common-cmds.h:11 +msgid "work on the current change (see also: git help everyday)" +msgstr "treballar en el canvi actual (vegeu també: git help everyday)" + +#: common-cmds.h:12 +msgid "examine the history and state (see also: git help revisions)" +msgstr "examinar la història i l'estat (vegeu també: git help revisions)" + +#: common-cmds.h:13 +msgid "grow, mark and tweak your common history" +msgstr "fer créixer, marcar i ajustar la vostra història comuna" + +#: common-cmds.h:14 +msgid "collaborate (see also: git help workflows)" +msgstr "col·laborar (vegeu també: git help workflow)" + +#: common-cmds.h:18 msgid "Add file contents to the index" msgstr "Afegeix els continguts dels fitxers a l'índex" -#: common-cmds.h:9 +#: common-cmds.h:19 msgid "Find by binary search the change that introduced a bug" msgstr "Troba per cerca binària el canvi que hagi introduït un defecte" -#: common-cmds.h:10 +#: common-cmds.h:20 msgid "List, create, or delete branches" msgstr "Llista, crea o suprimeix branques" -#: common-cmds.h:11 +#: common-cmds.h:21 msgid "Checkout a branch or paths to the working tree" msgstr "Agafa una branca o uns camins a l'arbre de treball" -#: common-cmds.h:12 +#: common-cmds.h:22 msgid "Clone a repository into a new directory" msgstr "Clona un dipòsit a un directori nou" -#: common-cmds.h:13 +#: common-cmds.h:23 msgid "Record changes to the repository" msgstr "Registra els canvis al dipòsit" -#: common-cmds.h:14 +#: common-cmds.h:24 msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc." -#: common-cmds.h:15 +#: common-cmds.h:25 msgid "Download objects and refs from another repository" msgstr "Baixa objectes i referències d'un altre dipòsit" -#: common-cmds.h:16 +#: common-cmds.h:26 msgid "Print lines matching a pattern" msgstr "Imprimeix les línies coincidents amb un patró" -#: common-cmds.h:17 +#: common-cmds.h:27 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Crea un dipòsit de Git buit o reinicialitza un existent" -#: common-cmds.h:18 +#: common-cmds.h:28 msgid "Show commit logs" msgstr "Mostra els registres de comissió" -#: common-cmds.h:19 +#: common-cmds.h:29 msgid "Join two or more development histories together" msgstr "Uneix dues o més històries de desenvolupament" -#: common-cmds.h:20 +#: common-cmds.h:30 msgid "Move or rename a file, a directory, or a symlink" msgstr "Mou o canvia de nom un fitxer, directori o enllaç simbòlic" -#: common-cmds.h:21 +#: common-cmds.h:31 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Obtén de i integra amb un altre dipòsit o una branca local" -#: common-cmds.h:22 +#: common-cmds.h:32 msgid "Update remote refs along with associated objects" msgstr "" "Actualitza les referències remotes juntament amb els objectes associats" -#: common-cmds.h:23 +#: common-cmds.h:33 msgid "Forward-port local commits to the updated upstream head" msgstr "Avança les comissions locals al cap font actualitzat" -#: common-cmds.h:24 +#: common-cmds.h:34 msgid "Reset current HEAD to the specified state" msgstr "Restableix el HEAD actual a l'estat especificat" -#: common-cmds.h:25 +#: common-cmds.h:35 msgid "Remove files from the working tree and from the index" msgstr "Elimina fitxers de l'arbre de treball i de l'índex" -#: common-cmds.h:26 +#: common-cmds.h:36 msgid "Show various types of objects" msgstr "Mostra diversos tipus d'objectes" -#: common-cmds.h:27 +#: common-cmds.h:37 msgid "Show the working tree status" msgstr "Mostra l'estat de l'arbre de treball" -#: common-cmds.h:28 +#: common-cmds.h:38 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" "Crea, llista, suprimeix o verifica un objecte d'etiqueta firmat amb GPG" -#: parse-options.h:143 +#: parse-options.h:142 msgid "expiry-date" msgstr "data-de-caducitat" -#: parse-options.h:158 +#: parse-options.h:157 msgid "no-op (backward compatibility)" msgstr "operació nul·la (per a compatibilitat amb versions anteriors)" -#: parse-options.h:232 +#: parse-options.h:231 msgid "be more verbose" msgstr "sigues més detallat" -#: parse-options.h:234 +#: parse-options.h:233 msgid "be more quiet" msgstr "sigues més callat" -#: parse-options.h:240 +#: parse-options.h:239 msgid "use <n> digits to display SHA-1s" msgstr "usa <n> xifres per presentar els SHA-1" @@ -10279,7 +10529,7 @@ msgstr "" msgid "You need to set your committer info first" msgstr "Cal establir la vostra informació de comitent primer" -#: git-am.sh:98 +#: git-am.sh:100 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10287,7 +10537,7 @@ msgstr "" "Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n" "No rebobinant a ORIG_HEAD" -#: git-am.sh:108 +#: git-am.sh:110 #, sh-format msgid "" "When you have resolved this problem, run \"$cmdline --continue\".\n" @@ -10300,21 +10550,21 @@ msgstr "" "Per a restaurar la branca original i deixar d'apedaçar, executeu \"$cmdline " "--abort\"." -#: git-am.sh:124 +#: git-am.sh:126 msgid "Cannot fall back to three-way merge." msgstr "No es pot retrocedir a una fusió de 3 vies." -#: git-am.sh:140 +#: git-am.sh:142 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 " "vies." -#: git-am.sh:142 +#: git-am.sh:144 msgid "Using index info to reconstruct a base tree..." msgstr "Usant la informació d'índex per a reconstruir un arbre base..." -#: git-am.sh:157 +#: git-am.sh:159 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10322,28 +10572,28 @@ msgstr "" "Heu editat el vostre pedaç a mà?\n" "No s'aplica als blobs recordats en el seu índex." -#: git-am.sh:166 +#: git-am.sh:168 msgid "Falling back to patching base and 3-way merge..." msgstr "Retrocedint a apedaçar la base i fusionar de 3 vies..." -#: git-am.sh:182 +#: git-am.sh:185 msgid "Failed to merge in the changes." msgstr "S'ha fallat en fusionar els canvis." -#: git-am.sh:277 +#: git-am.sh:280 msgid "Only one StGIT patch series can be applied at once" msgstr "només una sèrie de pedaços StGIT es pot aplicar a la vegada" -#: git-am.sh:364 +#: git-am.sh:367 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "El format de pedaç $patch_format no és compatible." -#: git-am.sh:366 +#: git-am.sh:369 msgid "Patch format detection failed." msgstr "La detecció de format de pedaç ha fallat." -#: git-am.sh:398 +#: git-am.sh:407 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." @@ -10351,18 +10601,18 @@ msgstr "" "Fa molt que l'opció -b/--binary no ha fet res, i\n" "s'eliminarà. Si us plau, no l'useu més." -#: git-am.sh:496 +#: git-am.sh:507 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" "un directori de rebase anterior $dotest encara existeix però s'ha donat una " "bústia." -#: git-am.sh:501 +#: git-am.sh:512 msgid "Please make up your mind. --skip or --abort?" msgstr "Si us plau, preneu una decisió. --skip o --abort?" -#: git-am.sh:537 +#: git-am.sh:560 #, sh-format msgid "" "Stray $dotest directory found.\n" @@ -10371,16 +10621,16 @@ msgstr "" "Directori $dotest extraviat trobat.\n" "Useu \"git am --abort\" per a eliminar-lo." -#: git-am.sh:545 +#: git-am.sh:568 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operació de resolució no en curs; no reprenem." -#: git-am.sh:612 +#: git-am.sh:635 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "Índex brut: no es pot aplicar pedaços (bruts: $files)" -#: git-am.sh:722 +#: git-am.sh:747 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -10393,33 +10643,33 @@ msgstr "" "Per a restaurar la branca original i deixar d'empaquetar, executeu " "\"$cmdline --abort\"." -#: git-am.sh:749 +#: git-am.sh:774 msgid "Patch does not have a valid e-mail address." msgstr "El pedaç no té cap adreça de correu electrònic vàlida." -#: git-am.sh:796 +#: git-am.sh:821 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "no es pot ser interactiu sense que stdin sigui connectat a un terminal." -#: git-am.sh:800 +#: git-am.sh:825 msgid "Commit Body is:" msgstr "El cos de la comissió és:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:807 +#: git-am.sh:832 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" "Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls tots " -#: git-am.sh:843 +#: git-am.sh:868 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Aplicant: $FIRSTLINE" -#: git-am.sh:864 +#: git-am.sh:889 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10429,7 +10679,7 @@ msgstr "" "Si no hi ha res a allistar, probablement alguna altra cosa\n" "ja ha introduït els mateixos canvis; potser voleu ometre aquest pedaç." -#: git-am.sh:872 +#: git-am.sh:897 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" @@ -10437,16 +10687,16 @@ msgstr "" "Encara teniu camins sense fusionar en el vostre índex\n" "heu oblidat d'usar 'git add'?" -#: git-am.sh:888 +#: git-am.sh:913 msgid "No changes -- Patch already applied." msgstr "Sense canvis -- El pedaç ja s'ha aplicat." -#: git-am.sh:898 +#: git-am.sh:923 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "El pedaç ha fallat a $msgnum $FIRSTLINE" -#: git-am.sh:901 +#: git-am.sh:926 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" @@ -10455,7 +10705,7 @@ msgstr "" "La còpia del pedaç que ha fallat es troba en:\n" " $dotest/patch" -#: git-am.sh:919 +#: git-am.sh:945 msgid "applying to an empty history" msgstr "aplicant a una història buida" @@ -10614,7 +10864,7 @@ msgstr "" msgid "bisect run success" msgstr "pas de bisecció reeixit" -#: git-pull.sh:21 +#: git-pull.sh:61 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" @@ -10625,11 +10875,11 @@ msgstr "" "'git add/rm <fitxer>' segons sigui apropiat per a marcar resolució i\n" "feu una comissió." -#: git-pull.sh:25 +#: git-pull.sh:65 msgid "Pull is not possible because you have unmerged files." msgstr "Baixar no és possible perquè teniu fitxers sense fusionar." -#: git-pull.sh:31 +#: git-pull.sh:71 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -10637,11 +10887,11 @@ msgstr "" "No heu completat la vostra fusió (MERGE_HEAD existeix).\n" "Si us plau, cometeu els vostres canvis abans de fusionar." -#: git-pull.sh:245 +#: git-pull.sh:285 msgid "updating an unborn branch with changes added to the index" msgstr "actualitzant una branca no nascuda amb canvis afegits a l'índex" -#: git-pull.sh:269 +#: git-pull.sh:311 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -10652,11 +10902,11 @@ msgstr "" "Avís: avançant ràpidament el vostre arbre de treball des de\n" "Avís: la comissió $orig_head." -#: git-pull.sh:294 +#: git-pull.sh:336 msgid "Cannot merge multiple branches into empty head" msgstr "No es pot fusionar múltiples branques a un cap buit" -#: git-pull.sh:298 +#: git-pull.sh:340 msgid "Cannot rebase onto multiple branches" msgstr "No es pot rebasar sobre múltiples branques" @@ -10855,7 +11105,7 @@ msgstr "No es pot actualitzar $ref_stash amb $w_commit" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:238 +#: git-stash.sh:241 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -10864,85 +11114,90 @@ msgstr "" "error: opció desconeguda de 'stash save': $option\n" " Per a proveir un missatge, useu git stash save -- '$option'" -#: git-stash.sh:259 +#: git-stash.sh:262 msgid "No local changes to save" msgstr "No hi ha canvis locals a desar" -#: git-stash.sh:263 +#: git-stash.sh:266 msgid "Cannot initialize stash" msgstr "No es pot inicialitzar el magatzem" -#: git-stash.sh:267 +#: git-stash.sh:270 msgid "Cannot save the current status" msgstr "No es pot desar l'estat actual" -#: git-stash.sh:285 +#: git-stash.sh:288 msgid "Cannot remove worktree changes" msgstr "No es poden elminiar els canvis de l'arbre de treball" -#: git-stash.sh:384 +#: git-stash.sh:389 +#, sh-format +msgid "unknown option: $opt" +msgstr "opció desconeguda: $opt" + +#: git-stash.sh:399 msgid "No stash found." msgstr "Cap magatzem trobat." -#: git-stash.sh:391 +#: git-stash.sh:406 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Massa revisions especificades: $REV" -#: git-stash.sh:397 +#: git-stash.sh:412 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference no és una referència vàlida" -#: git-stash.sh:425 +#: git-stash.sh:440 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' no és una comissió de tipus magatzem" -#: git-stash.sh:436 +#: git-stash.sh:451 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' no és una referència de magatzem" -#: git-stash.sh:444 +#: git-stash.sh:459 msgid "unable to refresh index" msgstr "no s'ha pogut actualitzar l'índex" -#: git-stash.sh:448 +#: git-stash.sh:463 msgid "Cannot apply a stash in the middle of a merge" msgstr "No es pot aplicar un magatzem enmig d'una fusió" -#: git-stash.sh:456 +#: git-stash.sh:471 msgid "Conflicts in index. Try without --index." msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index." -#: git-stash.sh:458 +#: git-stash.sh:473 msgid "Could not save index tree" msgstr "No s'ha pogut desar l'arbre d'índex" -#: git-stash.sh:492 +#: git-stash.sh:507 msgid "Cannot unstage modified files" msgstr "No es pot desallistar fitxers modificats" -#: git-stash.sh:507 +#: git-stash.sh:522 msgid "Index was not unstashed." msgstr "L'índex no estava sense emmagatzemar." -#: git-stash.sh:530 +#: git-stash.sh:545 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} ($s) descartada" -#: git-stash.sh:531 +#: git-stash.sh:546 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem" -#: git-stash.sh:539 +#: git-stash.sh:554 msgid "No branch name specified" msgstr "Cap nom de branca especificat" -#: git-stash.sh:611 +#: git-stash.sh:626 msgid "(To restore them type \"git stash apply\")" msgstr "(Per restaurar-les teclegeu \"git stash apply\")" @@ -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: 2015-04-03 08:13+0800\n" +"POT-Creation-Date: 2015-06-27 19:17+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" @@ -50,7 +50,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <Repository> [--exec <Programm>] --list" -#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" @@ -73,9 +73,9 @@ msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen" #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150 msgid "file" msgstr "Datei" @@ -107,7 +107,7 @@ msgstr "besser komprimieren" msgid "list supported archive formats" msgstr "unterstützte Archivformate auflisten" -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77 msgid "repo" msgstr "Repository" @@ -123,7 +123,7 @@ msgstr "Programm" msgid "path to the remote git-upload-archive command" msgstr "Pfad zum externen \"git-upload-archive\"-Programm" -#: attr.c:264 +#: attr.c:265 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -267,8 +267,8 @@ msgid "Repository lacks these prerequisite commits:" msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:" #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 -#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 +#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330 +#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" @@ -518,16 +518,16 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:2956 +#: diff.c:2997 #, c-format msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" -#: diff.c:3351 +#: diff.c:3393 msgid "--follow requires exactly one pathspec" msgstr "--follow erfordert genau eine Pfadspezifikation" -#: diff.c:3514 +#: diff.c:3556 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -536,11 +536,19 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:3528 +#: diff.c:3570 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" +#: dir.c:1852 +msgid "failed to get kernel name and information" +msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel" + +#: dir.c:1945 +msgid "Untracked cache is disabled on this system." +msgstr "Cache für unversionierte Dateien ist auf diesem System deaktiviert." + #: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "konnte gpg nicht ausführen" @@ -585,13 +593,13 @@ msgstr "Vorhandene Git-Kommandos in '%s'" #: help.c:214 msgid "git commands available from elsewhere on your $PATH" -msgstr "Vorhandene Git-Kommandos irgendwo in Ihrem $PATH" +msgstr "Vorhandene Git-Kommandos anderswo in Ihrem $PATH" -#: help.c:230 -msgid "The most commonly used git commands are:" -msgstr "Die allgemein verwendeten Git-Kommandos sind:" +#: help.c:246 +msgid "These are common Git commands used in various situations:" +msgstr "Allgemeine Git-Kommandos, verwendet in verschiedenen Situationen:" -#: help.c:289 +#: help.c:311 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -600,11 +608,11 @@ msgstr "" "'%s' scheint ein git-Kommando zu sein, konnte aber\n" "nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?" -#: help.c:346 +#: help.c:368 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Uh oh. Keine Git-Kommandos auf Ihrem System vorhanden." -#: help.c:368 +#: help.c:390 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -613,17 +621,17 @@ msgstr "" "Warnung: Sie haben das nicht existierende Git-Kommando '%s' ausgeführt.\n" "Setze fort unter der Annahme, dass Sie '%s' gemeint haben." -#: help.c:373 +#: help.c:395 #, c-format msgid "in %0.1f seconds automatically..." msgstr "Automatische Ausführung in %0.1f Sekunden ..." -#: help.c:380 +#: help.c:402 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' ist kein Git-Kommando. Siehe 'git --help'." -#: help.c:384 help.c:444 +#: help.c:406 help.c:466 msgid "" "\n" "Did you mean this?" @@ -637,16 +645,16 @@ msgstr[1] "" "\n" "Haben Sie eines von diesen gemeint?" -#: help.c:440 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: lockfile.c:283 +#: lockfile.c:345 msgid "BUG: reopen a lockfile that is still open" msgstr "FEHLER: Wiederöffnen einer bereits geöffneten Lock-Datei" -#: lockfile.c:285 +#: lockfile.c:347 msgid "BUG: reopen a lockfile that has been committed" msgstr "FEHLER: Wiederöffnen einer bereits committeten Lock-Datei" @@ -654,10 +662,10 @@ msgstr "FEHLER: Wiederöffnen einer bereits committeten Lock-Datei" msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" -#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580 -#: builtin/clone.c:662 +#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594 +#: builtin/clone.c:654 msgid "unable to write new index file" -msgstr "Konnte neue Staging-Area-Datei nicht schreiben." +msgstr "Konnte neue Index-Datei nicht schreiben." #: merge-recursive.c:189 #, c-format @@ -673,64 +681,64 @@ msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen" msgid "error building trees" msgstr "Fehler beim Erstellen der \"Tree\"-Objekte" -#: merge-recursive.c:688 +#: merge-recursive.c:687 #, c-format msgid "failed to create path '%s'%s" msgstr "Fehler beim Erstellen des Pfades '%s'%s" -#: merge-recursive.c:699 +#: merge-recursive.c:698 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n" -#: merge-recursive.c:713 merge-recursive.c:734 +#: merge-recursive.c:712 merge-recursive.c:733 msgid ": perhaps a D/F conflict?" msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?" -#: merge-recursive.c:724 +#: merge-recursive.c:723 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden" -#: merge-recursive.c:764 +#: merge-recursive.c:763 #, c-format msgid "cannot read object %s '%s'" msgstr "kann Objekt %s '%s' nicht lesen" -#: merge-recursive.c:766 +#: merge-recursive.c:765 #, c-format msgid "blob expected for %s '%s'" msgstr "Blob erwartet für %s '%s'" -#: merge-recursive.c:789 builtin/clone.c:321 +#: merge-recursive.c:788 builtin/clone.c:313 #, c-format msgid "failed to open '%s'" msgstr "Fehler beim Öffnen von '%s'" -#: merge-recursive.c:797 +#: merge-recursive.c:796 #, c-format msgid "failed to symlink '%s'" msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s'" -#: merge-recursive.c:800 +#: merge-recursive.c:799 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "weiß nicht was mit %06o %s '%s' zu machen ist" -#: merge-recursive.c:938 +#: merge-recursive.c:937 msgid "Failed to execute internal merge" msgstr "Fehler bei Ausführung des internen Merges" -#: merge-recursive.c:942 +#: merge-recursive.c:941 #, c-format msgid "Unable to add %s to database" msgstr "Konnte %s nicht zur Datenbank hinzufügen" -#: merge-recursive.c:958 +#: merge-recursive.c:957 msgid "unsupported object type in the tree" msgstr "nicht unterstützter Objekttyp im Verzeichnis" -#: merge-recursive.c:1033 merge-recursive.c:1047 +#: merge-recursive.c:1032 merge-recursive.c:1046 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -739,7 +747,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich gelassen." -#: merge-recursive.c:1039 merge-recursive.c:1052 +#: merge-recursive.c:1038 merge-recursive.c:1051 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -748,20 +756,20 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich bei %s gelassen." -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "rename" msgstr "umbenennen" -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "renamed" msgstr "umbenannt" -#: merge-recursive.c:1149 +#: merge-recursive.c:1148 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu" -#: merge-recursive.c:1171 +#: merge-recursive.c:1170 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -770,150 +778,150 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" " "und \"%s\"->\"%s\" in Branch \"%s\"%s" -#: merge-recursive.c:1176 +#: merge-recursive.c:1175 msgid " (left unresolved)" msgstr " (bleibt unaufgelöst)" -#: merge-recursive.c:1230 +#: merge-recursive.c:1229 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s " "in %s" -#: merge-recursive.c:1260 +#: merge-recursive.c:1259 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Benenne stattdessen %s nach %s und %s nach %s um" -#: merge-recursive.c:1459 +#: merge-recursive.c:1458 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in " "%s" -#: merge-recursive.c:1469 +#: merge-recursive.c:1468 #, c-format msgid "Adding merged %s" msgstr "Füge zusammengeführte Datei %s hinzu" -#: merge-recursive.c:1474 merge-recursive.c:1672 +#: merge-recursive.c:1473 merge-recursive.c:1671 #, c-format msgid "Adding as %s instead" msgstr "Füge stattdessen als %s hinzu" -#: merge-recursive.c:1525 +#: merge-recursive.c:1524 #, c-format msgid "cannot read object %s" msgstr "kann Objekt %s nicht lesen" -#: merge-recursive.c:1528 +#: merge-recursive.c:1527 #, c-format msgid "object %s is not a blob" msgstr "Objekt %s ist kein Blob" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modify" msgstr "ändern" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modified" msgstr "geändert" -#: merge-recursive.c:1586 +#: merge-recursive.c:1585 msgid "content" msgstr "Inhalt" -#: merge-recursive.c:1593 +#: merge-recursive.c:1592 msgid "add/add" msgstr "hinzufügen/hinzufügen" -#: merge-recursive.c:1627 +#: merge-recursive.c:1626 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)" -#: merge-recursive.c:1641 +#: merge-recursive.c:1640 #, c-format msgid "Auto-merging %s" msgstr "automatischer Merge von %s" -#: merge-recursive.c:1645 git-submodule.sh:1150 +#: merge-recursive.c:1644 git-submodule.sh:1150 msgid "submodule" msgstr "Submodul" -#: merge-recursive.c:1646 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Merge-Konflikt in %s" -#: merge-recursive.c:1732 +#: merge-recursive.c:1731 #, c-format msgid "Removing %s" msgstr "Entferne %s" -#: merge-recursive.c:1757 +#: merge-recursive.c:1756 msgid "file/directory" msgstr "Datei/Verzeichnis" -#: merge-recursive.c:1763 +#: merge-recursive.c:1762 msgid "directory/file" msgstr "Verzeichnis/Datei" -#: merge-recursive.c:1768 +#: merge-recursive.c:1767 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s " "hinzu." -#: merge-recursive.c:1778 +#: merge-recursive.c:1777 #, c-format msgid "Adding %s" msgstr "Füge %s hinzu" -#: merge-recursive.c:1795 +#: merge-recursive.c:1794 msgid "Fatal merge failure, shouldn't happen." msgstr "Fataler Merge-Fehler. Sollte nicht passieren." -#: merge-recursive.c:1814 +#: merge-recursive.c:1813 msgid "Already up-to-date!" msgstr "Bereits aktuell!" -#: merge-recursive.c:1823 +#: merge-recursive.c:1822 #, c-format msgid "merging of trees %s and %s failed" msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen" -#: merge-recursive.c:1853 +#: merge-recursive.c:1852 #, c-format msgid "Unprocessed path??? %s" msgstr "unverarbeiteter Pfad??? %s" -#: merge-recursive.c:1901 +#: merge-recursive.c:1900 msgid "Merging:" msgstr "Merge:" -#: merge-recursive.c:1914 +#: merge-recursive.c:1913 #, 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:1951 +#: merge-recursive.c:1950 msgid "merge returned no commit" msgstr "Merge hat keinen Commit zurückgegeben" -#: merge-recursive.c:2008 +#: merge-recursive.c:2007 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:2019 builtin/merge.c:667 +#: merge-recursive.c:2018 builtin/merge.c:645 msgid "Unable to write index." -msgstr "Konnte Staging-Area nicht schreiben." +msgstr "Konnte Index nicht schreiben." #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" @@ -938,7 +946,7 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "Ungültiger %s Wert: '%s'" -#: object.c:241 +#: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "Konnte Objekt '%s' nicht parsen." @@ -1039,11 +1047,11 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "Konnte --pretty Format nicht parsen." -#: progress.c:225 +#: progress.c:236 msgid "done" msgstr "Fertig" -#: read-cache.c:1275 +#: read-cache.c:1295 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1052,7 +1060,7 @@ msgstr "" "index.version gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:1285 +#: read-cache.c:1305 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1061,51 +1069,94 @@ msgstr "" "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: remote.c:782 +#: remote.c:792 #, 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:786 +#: remote.c:796 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s folgt üblicherweise %s, nicht %s" -#: remote.c:790 +#: remote.c:800 #, c-format msgid "%s tracks both %s and %s" msgstr "%s folgt sowohl %s als auch %s" -#: remote.c:798 +#: remote.c:808 msgid "Internal error" msgstr "Interner Fehler" -#: remote.c:1980 +#: remote.c:1723 remote.c:1766 +msgid "HEAD does not point to a branch" +msgstr "HEAD zeigt auf keinen Branch" + +#: remote.c:1732 +#, c-format +msgid "no such branch: '%s'" +msgstr "Kein solcher Branch: '%s'" + +#: remote.c:1735 +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert." + +#: remote.c:1741 +#, 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:1756 +#, 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:1771 +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" + +#: remote.c:1782 +#, c-format +msgid "push refspecs for '%s' do not include '%s'" +msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'" + +#: remote.c:1795 +msgid "push has no destination (push.default is 'nothing')" +msgstr "kein Ziel für \"push\" (push.default ist 'nothing')" + +#: remote.c:1817 +msgid "cannot resolve 'simple' push to a single destination" +msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen" + +#: remote.c:2124 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" -msgstr "Ihr Branch basiert auf '%s', aber Upstream-Branch wurde entfernt.\n" +msgstr "Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n" -#: remote.c:1984 +#: remote.c:2128 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n" -#: remote.c:1987 +#: remote.c:2131 #, 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:1991 +#: remote.c:2135 #, 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:1997 +#: remote.c:2141 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n" -#: remote.c:2000 +#: remote.c:2144 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1115,12 +1166,12 @@ msgstr[0] "" msgstr[1] "" "Ihr Branch ist zu '%s' um %d Commits hinterher, und kann vorgespult werden.\n" -#: remote.c:2008 +#: remote.c:2152 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n" -#: remote.c:2011 +#: remote.c:2155 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1135,13 +1186,13 @@ msgstr[1] "" "Ihr Branch und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Commits.\n" -#: remote.c:2021 +#: remote.c:2165 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:2348 +#: revision.c:2366 msgid "--first-parent is incompatible with --bisect" msgstr "Die Optionen --first-parent und --bisect sind inkompatibel." @@ -1158,24 +1209,23 @@ msgstr "dup2(%d,%d) fehlgeschlagen" msgid "failed to sign the push certificate" msgstr "Fehler beim Signieren des \"push\"-Zertifikates" -#: send-pack.c:356 +#: send-pack.c:378 msgid "the receiving end does not support --signed push" msgstr "" "die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")" -#: send-pack.c:366 +#: send-pack.c:389 msgid "the receiving end does not support --atomic push" -msgstr "" -"die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")" +msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")" -#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 -#: builtin/merge.c:1005 +#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 -#: builtin/merge.c:1010 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 +#: builtin/merge.c:988 #, c-format msgid "Could not write to '%s'" msgstr "Konnte nicht nach '%s' schreiben." @@ -1226,7 +1276,7 @@ msgstr "" #: sequencer.c:321 #, c-format msgid "%s: Unable to write new index file" -msgstr "%s: Konnte neue Staging-Area-Datei nicht schreiben" +msgstr "%s: Konnte neue Index-Datei nicht schreiben" #: sequencer.c:339 msgid "Could not resolve HEAD commit\n" @@ -1248,7 +1298,7 @@ msgstr "Konnte Eltern-Commit %s nicht parsen\n" #: sequencer.c:482 msgid "Your index file is unmerged." -msgstr "Ihre Staging-Area-Datei ist nicht zusammengeführt." +msgstr "Ihre Index-Datei ist nicht zusammengeführt." #: sequencer.c:501 #, c-format @@ -1294,12 +1344,12 @@ msgstr "leere Menge von Commits übergeben" #: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" -msgstr "git %s: Fehler beim Lesen der Staging-Area" +msgstr "git %s: Fehler beim Lesen des Index" #: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" -msgstr "git %s: Fehler beim Aktualisieren der Staging-Area" +msgstr "git %s: Fehler beim Aktualisieren des Index" #: sequencer.c:725 #, c-format @@ -1375,7 +1425,7 @@ 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:908 builtin/apply.c:4288 +#: sequencer.c:908 builtin/apply.c:4291 #, c-format msgid "cannot open %s: %s" msgstr "Kann %s nicht öffnen: %s" @@ -1417,7 +1467,12 @@ msgstr "Kann nicht als allerersten Commit einen Revert ausführen." msgid "Can't cherry-pick into empty head" msgstr "Kann nicht als allerersten Commit einen Cherry-Pick ausführen." -#: sha1_name.c:440 +#: setup.c:243 +#, c-format +msgid "failed to read %s" +msgstr "Fehler beim Lesen von %s" + +#: sha1_name.c:453 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" @@ -1442,25 +1497,6 @@ msgstr "" "indem Sie \"git config advice.objectNameWarning false\"\n" "ausführen." -#: sha1_name.c:1068 -msgid "HEAD does not point to a branch" -msgstr "HEAD zeigt auf keinen Branch" - -#: sha1_name.c:1071 -#, c-format -msgid "No such branch: '%s'" -msgstr "Kein solcher Branch '%s'" - -#: sha1_name.c:1073 -#, c-format -msgid "No upstream configured for branch '%s'" -msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert." - -#: sha1_name.c:1077 -#, c-format -msgid "Upstream branch '%s' not stored as a remote-tracking branch" -msgstr "Upstream-Branch '%s' ist nicht als Remote-Tracking-Branch gespeichert" - #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -1486,12 +1522,7 @@ msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen" msgid "staging updated .gitmodules failed" msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken" -#: submodule.c:1109 builtin/init-db.c:371 -#, c-format -msgid "Could not create git link %s" -msgstr "Konnte git-Verweis %s nicht erstellen" - -#: submodule.c:1120 +#: submodule.c:1115 #, c-format msgid "Could not set core.worktree in %s" msgstr "Konnte core.worktree in '%s' nicht setzen." @@ -1521,7 +1552,7 @@ msgstr "Konnte Eingabe-Datei '%s' nicht lesen" msgid "could not read from stdin" msgstr "konnte nicht von der Standard-Eingabe lesen" -#: unpack-trees.c:202 +#: unpack-trees.c:203 msgid "Checking out files" msgstr "Checke Dateien aus" @@ -1577,6 +1608,21 @@ msgstr "kein solcher Benutzer" msgid "unable to get current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen." +#: wrapper.c:575 +#, c-format +msgid "could not open %s for writing" +msgstr "Konnte '%s' nicht zum Schreiben öffnen." + +#: wrapper.c:587 +#, c-format +msgid "could not write to %s" +msgstr "Konnte nicht nach '%s' schreiben." + +#: wrapper.c:593 +#, c-format +msgid "could not close %s" +msgstr "Konnte '%s' nicht schließen." + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Nicht zusammengeführte Pfade:" @@ -1610,11 +1656,11 @@ msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" -#: wt-status.c:198 wt-status.c:878 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "zum Commit vorgemerkte Änderungen:" -#: wt-status.c:216 wt-status.c:887 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:" @@ -1732,15 +1778,15 @@ msgstr "unversionierter Inhalt, " msgid "bug: unhandled diff status %c" msgstr "Fehler: unbehandelter Differenz-Status %c" -#: wt-status.c:753 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Submodule geändert, aber nicht aktualisiert:" -#: wt-status.c:755 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Änderungen in Submodul zum Committen:" -#: wt-status.c:835 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1748,75 +1794,75 @@ msgstr "" "Ändern Sie nicht die obige Zeile.\n" "Alles unterhalb von ihr wird entfernt." -#: wt-status.c:946 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Sie haben nicht zusammengeführte Pfade." -#: wt-status.c:949 +#: 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:952 +#: wt-status.c:955 msgid "All conflicts fixed but you are still merging." msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge." -#: wt-status.c:955 +#: wt-status.c:958 msgid " (use \"git commit\" to conclude merge)" msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)" -#: wt-status.c:965 +#: wt-status.c:968 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:968 +#: wt-status.c:971 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:972 +#: wt-status.c:975 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:974 +#: wt-status.c:977 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)" -#: wt-status.c:976 +#: wt-status.c:979 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (benutzen Sie \"git am --abort\", um den ursprünglichen Branch " "wiederherzustellen)" -#: wt-status.c:1036 wt-status.c:1053 +#: wt-status.c:1039 wt-status.c:1056 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'." -#: wt-status.c:1041 wt-status.c:1058 +#: wt-status.c:1044 wt-status.c:1061 msgid "You are currently rebasing." msgstr "Sie sind gerade beim Rebase." -#: wt-status.c:1044 +#: wt-status.c:1047 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" " "aus)" -#: wt-status.c:1046 +#: wt-status.c:1049 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1048 +#: wt-status.c:1051 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch " "auszuchecken)" -#: wt-status.c:1061 +#: wt-status.c:1064 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)" -#: wt-status.c:1065 +#: wt-status.c:1068 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1824,130 +1870,130 @@ msgstr "" "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf " "'%s' im Gange ist." -#: wt-status.c:1070 +#: wt-status.c:1073 msgid "You are currently splitting a commit during a rebase." msgstr "Sie teilen gerade einen Commit während eines Rebase auf." -#: wt-status.c:1073 +#: wt-status.c:1076 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --" "continue\" aus)" -#: wt-status.c:1077 +#: wt-status.c:1080 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf " "'%s'." -#: wt-status.c:1082 +#: wt-status.c:1085 msgid "You are currently editing a commit during a rebase." msgstr "Sie editieren gerade einen Commit während eines Rebase." -#: wt-status.c:1085 +#: wt-status.c:1088 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (benutzen Sie \"git commit --amend\", um den aktuellen Commit " "nachzubessern)" -#: wt-status.c:1087 +#: wt-status.c:1090 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen " "abgeschlossen sind)" -#: wt-status.c:1097 +#: wt-status.c:1100 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus." -#: wt-status.c:1102 +#: wt-status.c:1105 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue" "\" aus)" -#: wt-status.c:1105 +#: wt-status.c:1108 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)" -#: wt-status.c:1107 +#: wt-status.c:1110 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation " "abzubrechen)" -#: wt-status.c:1116 +#: wt-status.c:1119 #, c-format msgid "You are currently reverting commit %s." msgstr "Sie sind gerade an einem Revert von Commit '%s'." -#: wt-status.c:1121 +#: wt-status.c:1124 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" " "aus)" -#: wt-status.c:1124 +#: wt-status.c:1127 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)" -#: wt-status.c:1126 +#: wt-status.c:1129 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)" -#: wt-status.c:1137 +#: wt-status.c:1140 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'." -#: wt-status.c:1141 +#: wt-status.c:1144 msgid "You are currently bisecting." msgstr "Sie sind gerade bei einer binären Suche." -#: wt-status.c:1144 +#: wt-status.c:1147 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch " "zurückzukehren)" -#: wt-status.c:1321 +#: wt-status.c:1324 msgid "On branch " msgstr "Auf Branch " -#: wt-status.c:1328 +#: wt-status.c:1331 msgid "rebase in progress; onto " msgstr "Rebase im Gange; auf " -#: wt-status.c:1333 +#: wt-status.c:1336 msgid "HEAD detached at " msgstr "HEAD losgelöst bei " -#: wt-status.c:1335 +#: wt-status.c:1338 msgid "HEAD detached from " msgstr "HEAD losgelöst von " -#: wt-status.c:1338 +#: wt-status.c:1341 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Branch." -#: wt-status.c:1355 +#: wt-status.c:1358 msgid "Initial commit" msgstr "Initialer Commit" -#: wt-status.c:1369 +#: wt-status.c:1372 msgid "Untracked files" msgstr "Unversionierte Dateien" -#: wt-status.c:1371 +#: wt-status.c:1374 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1375 +#: wt-status.c:1378 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1958,32 +2004,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:1381 +#: wt-status.c:1384 #, c-format msgid "Untracked files not listed%s" msgstr "Unversionierte Dateien nicht aufgelistet%s" -#: wt-status.c:1383 +#: wt-status.c:1386 msgid " (use -u option to show untracked files)" msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)" -#: wt-status.c:1389 +#: wt-status.c:1392 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:1394 +#: wt-status.c:1397 #, 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:1397 +#: wt-status.c:1400 #, c-format msgid "no changes added to commit\n" msgstr "keine Änderungen zum Commit vorgemerkt\n" -#: wt-status.c:1400 +#: wt-status.c:1403 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1992,52 +2038,52 @@ msgstr "" "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien (benutzen " "Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1403 +#: wt-status.c:1406 #, 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:1406 +#: wt-status.c:1409 #, 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:1409 wt-status.c:1414 +#: wt-status.c:1412 wt-status.c:1417 #, c-format msgid "nothing to commit\n" msgstr "nichts zu committen\n" -#: wt-status.c:1412 +#: wt-status.c:1415 #, 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:1416 +#: wt-status.c:1419 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n" -#: wt-status.c:1525 +#: wt-status.c:1528 msgid "HEAD (no branch)" msgstr "HEAD (kein Branch)" -#: wt-status.c:1531 +#: wt-status.c:1534 msgid "Initial commit on " msgstr "Initialer Commit auf " -#: wt-status.c:1563 +#: wt-status.c:1561 msgid "gone" msgstr "entfernt" -#: wt-status.c:1565 wt-status.c:1573 +#: wt-status.c:1563 wt-status.c:1571 msgid "behind " msgstr "hinterher " -#: compat/precompose_utf8.c:55 builtin/clone.c:360 +#: compat/precompose_utf8.c:55 builtin/clone.c:352 #, c-format msgid "failed to unlink '%s'" msgstr "Konnte '%s' nicht entfernen." @@ -2065,9 +2111,9 @@ 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:785 +#: builtin/add.c:194 builtin/rev-parse.c:796 msgid "Could not read the index" -msgstr "Konnte die Staging-Area nicht lesen" +msgstr "Konnte den Index nicht lesen" #: builtin/add.c:205 #, c-format @@ -2078,121 +2124,125 @@ msgstr "Konnte '%s' nicht zum Schreiben öffnen." msgid "Could not write patch" msgstr "Konnte Patch nicht schreiben" -#: builtin/add.c:214 +#: builtin/add.c:212 +msgid "editing patch failed" +msgstr "Bearbeitung des Patches fehlgeschlagen" + +#: builtin/add.c:215 #, c-format msgid "Could not stat '%s'" msgstr "Konnte Verzeichnis '%s' nicht lesen" -#: builtin/add.c:216 +#: builtin/add.c:217 msgid "Empty patch. Aborted." msgstr "Leerer Patch. Abgebrochen." -#: builtin/add.c:221 +#: builtin/add.c:222 #, c-format msgid "Could not apply '%s'" msgstr "Konnte '%s' nicht anwenden." -#: builtin/add.c:231 +#: builtin/add.c:232 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien " "ignoriert:\n" -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 -#: builtin/rm.c:269 +#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369 +#: builtin/rm.c:268 msgid "dry run" msgstr "Probelauf" -#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "erweiterte Ausgaben" -#: builtin/add.c:251 +#: builtin/add.c:252 msgid "interactive picking" msgstr "interaktives Auswählen" -#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286 msgid "select hunks interactively" msgstr "Blöcke interaktiv auswählen" -#: builtin/add.c:253 +#: builtin/add.c:254 msgid "edit current diff and apply" msgstr "aktuelle Unterschiede editieren und anwenden" -#: builtin/add.c:254 +#: builtin/add.c:255 msgid "allow adding otherwise ignored files" msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben" -#: builtin/add.c:255 +#: builtin/add.c:256 msgid "update tracked files" msgstr "versionierte Dateien aktualisieren" -#: builtin/add.c:256 +#: builtin/add.c:257 msgid "record only the fact that the path will be added later" msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll" -#: builtin/add.c:257 +#: builtin/add.c:258 msgid "add changes from all tracked and untracked files" msgstr "" "Änderungen von allen versionierten und unversionierten Dateien hinzufügen" -#: builtin/add.c:260 +#: builtin/add.c:261 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)" -#: builtin/add.c:262 +#: builtin/add.c:263 msgid "don't add, only refresh the index" -msgstr "nichts hinzufügen, nur die Staging-Area aktualisieren" +msgstr "nichts hinzufügen, nur den Index aktualisieren" -#: builtin/add.c:263 +#: builtin/add.c:264 msgid "just skip files which cannot be added because of errors" msgstr "" "Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden " "konnten" -#: builtin/add.c:264 +#: builtin/add.c:265 msgid "check if - even missing - files are ignored in dry run" msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden" -#: builtin/add.c:286 +#: builtin/add.c:287 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n" -#: builtin/add.c:293 +#: builtin/add.c:294 msgid "adding files failed" msgstr "Hinzufügen von Dateien fehlgeschlagen" -#: builtin/add.c:329 +#: builtin/add.c:330 msgid "-A and -u are mutually incompatible" msgstr "Die Optionen -A und -u sind zueinander inkompatibel." -#: builtin/add.c:336 +#: builtin/add.c:337 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden." -#: builtin/add.c:357 +#: builtin/add.c:358 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" -#: builtin/add.c:358 +#: builtin/add.c:359 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Meinten Sie vielleicht 'git add .'?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 msgid "index file corrupt" -msgstr "Staging-Area-Datei beschädigt" +msgstr "Index-Datei beschädigt" -#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 msgid "Unable to write new index file" -msgstr "Konnte neue Staging-Area-Datei nicht schreiben." +msgstr "Konnte neue Index-Datei nicht schreiben." #: builtin/apply.c:59 msgid "git apply [<options>] [<patch>...]" @@ -2272,65 +2322,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:1656 +#: builtin/apply.c:1659 msgid "new file depends on old contents" msgstr "neue Datei hängt von alten Inhalten ab" -#: builtin/apply.c:1658 +#: builtin/apply.c:1661 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: builtin/apply.c:1684 +#: builtin/apply.c:1687 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: builtin/apply.c:1720 +#: builtin/apply.c:1723 #, c-format msgid "new file %s depends on old contents" msgstr "neue Datei %s hängt von alten Inhalten ab" -#: builtin/apply.c:1722 +#: builtin/apply.c:1725 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: builtin/apply.c:1725 +#: builtin/apply.c:1728 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." -#: builtin/apply.c:1871 +#: builtin/apply.c:1874 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s" -#: builtin/apply.c:1900 +#: builtin/apply.c:1903 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter Binär-Patch bei Zeile %d" -#: builtin/apply.c:2051 +#: builtin/apply.c:2054 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: builtin/apply.c:2141 +#: builtin/apply.c:2144 #, c-format msgid "unable to read symlink %s" msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: builtin/apply.c:2145 +#: builtin/apply.c:2148 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht öffnen oder lesen" -#: builtin/apply.c:2778 +#: builtin/apply.c:2781 #, c-format msgid "invalid start of line: '%c'" msgstr "Ungültiger Zeilenanfang: '%c'" -#: builtin/apply.c:2897 +#: builtin/apply.c:2900 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -2338,12 +2388,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:2909 +#: builtin/apply.c:2912 #, 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:2915 +#: builtin/apply.c:2918 #, c-format msgid "" "while searching for:\n" @@ -2352,355 +2402,354 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: builtin/apply.c:2935 +#: builtin/apply.c:2938 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in Binär-Patch für '%s'" -#: builtin/apply.c:3036 +#: builtin/apply.c:3039 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" -#: builtin/apply.c:3042 +#: builtin/apply.c:3045 #, 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:3063 +#: builtin/apply.c:3066 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: builtin/apply.c:3187 +#: builtin/apply.c:3190 #, c-format msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 +#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291 #, c-format msgid "read of %s failed" msgstr "Konnte %s nicht lesen" -#: builtin/apply.c:3240 +#: builtin/apply.c:3243 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "'%s' ist hinter einer symbolischen Verknüpfung" -#: builtin/apply.c:3268 builtin/apply.c:3490 +#: builtin/apply.c:3271 builtin/apply.c:3493 #, c-format msgid "path %s has been renamed/deleted" msgstr "Pfad %s wurde umbenannt/gelöscht" -#: builtin/apply.c:3349 builtin/apply.c:3504 +#: builtin/apply.c:3352 builtin/apply.c:3507 #, c-format msgid "%s: does not exist in index" -msgstr "%s ist nicht in der Staging-Area" +msgstr "%s ist nicht im Index" -#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 +#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3358 builtin/apply.c:3512 +#: builtin/apply.c:3361 builtin/apply.c:3515 #, c-format msgid "%s: does not match index" -msgstr "%s entspricht nicht der Version in der Staging-Area" +msgstr "%s entspricht nicht der Version im Index" -#: builtin/apply.c:3460 +#: builtin/apply.c:3463 msgid "removal patch leaves file contents" msgstr "Lösch-Patch hinterlässt Dateiinhalte" -#: builtin/apply.c:3529 +#: builtin/apply.c:3532 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: builtin/apply.c:3531 +#: builtin/apply.c:3534 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: builtin/apply.c:3690 builtin/apply.c:3692 +#: builtin/apply.c:3693 builtin/apply.c:3695 #, c-format msgid "invalid path '%s'" msgstr "Ungültiger Pfad '%s'" -#: builtin/apply.c:3747 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: builtin/apply.c:3750 +#: builtin/apply.c:3753 #, c-format msgid "%s: already exists in working directory" msgstr "%s existiert bereits im Arbeitsverzeichnis" -#: builtin/apply.c:3770 +#: builtin/apply.c:3773 #, 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:3775 +#: builtin/apply.c:3778 #, 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:3795 +#: builtin/apply.c:3798 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung" -#: builtin/apply.c:3799 +#: builtin/apply.c:3802 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: builtin/apply.c:3813 +#: builtin/apply.c:3816 #, c-format msgid "Checking patch %s..." msgstr "Prüfe Patch %s ..." -#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3909 builtin/checkout.c:237 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:4049 +#: builtin/apply.c:4052 #, c-format msgid "unable to remove %s from index" -msgstr "konnte %s nicht aus der Staging-Area entfernen" +msgstr "konnte %s nicht aus dem Index entfernen" -#: builtin/apply.c:4078 +#: builtin/apply.c:4081 #, c-format msgid "corrupt patch for submodule %s" msgstr "fehlerhafter Patch für Submodul %s" -#: builtin/apply.c:4082 +#: builtin/apply.c:4085 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: builtin/apply.c:4087 +#: builtin/apply.c:4090 #, 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:4090 builtin/apply.c:4198 +#: builtin/apply.c:4093 builtin/apply.c:4201 #, 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:4123 +#: builtin/apply.c:4126 #, c-format msgid "closing file '%s'" msgstr "schließe Datei '%s'" -#: builtin/apply.c:4172 +#: builtin/apply.c:4175 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: builtin/apply.c:4259 +#: builtin/apply.c:4262 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: builtin/apply.c:4267 +#: builtin/apply.c:4270 msgid "internal error" msgstr "interner Fehler" -#: builtin/apply.c:4270 +#: builtin/apply.c:4273 #, 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:4280 +#: builtin/apply.c:4283 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: builtin/apply.c:4301 +#: builtin/apply.c:4304 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: builtin/apply.c:4304 +#: builtin/apply.c:4307 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Block #%d zurückgewiesen." -#: builtin/apply.c:4394 +#: builtin/apply.c:4397 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: builtin/apply.c:4405 +#: builtin/apply.c:4408 msgid "unable to read index file" -msgstr "Konnte Staging-Area-Datei nicht lesen" +msgstr "Konnte Index-Datei nicht lesen" -#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85 #: builtin/fetch.c:92 msgid "path" msgstr "Pfad" -#: builtin/apply.c:4523 +#: builtin/apply.c:4526 msgid "don't apply changes matching the given path" msgstr "keine Änderungen im angegebenen Pfad anwenden" -#: builtin/apply.c:4526 +#: builtin/apply.c:4529 msgid "apply changes matching the given path" msgstr "Änderungen nur im angegebenen Pfad anwenden" -#: builtin/apply.c:4528 +#: builtin/apply.c:4531 msgid "num" msgstr "Anzahl" -#: builtin/apply.c:4529 +#: builtin/apply.c:4532 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden " "entfernen" -#: builtin/apply.c:4532 +#: builtin/apply.c:4535 msgid "ignore additions made by the patch" msgstr "hinzugefügte Zeilen des Patches ignorieren" -#: builtin/apply.c:4534 +#: builtin/apply.c:4537 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:4538 +#: builtin/apply.c:4541 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:4540 +#: builtin/apply.c:4543 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:4542 +#: builtin/apply.c:4545 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:4544 +#: builtin/apply.c:4547 msgid "make sure the patch is applicable to the current index" msgstr "" -"sicherstellen, dass der Patch in der aktuellen Staging-Area angewendet " -"werden kann" +"sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann" -#: builtin/apply.c:4546 +#: builtin/apply.c:4549 msgid "apply a patch without touching the working tree" msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen" -#: builtin/apply.c:4548 +#: builtin/apply.c:4551 msgid "accept a patch that touches outside the working area" msgstr "" "Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt" -#: builtin/apply.c:4550 +#: builtin/apply.c:4553 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)" -#: builtin/apply.c:4552 +#: builtin/apply.c:4555 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:4554 +#: builtin/apply.c:4557 msgid "build a temporary index based on embedded index information" msgstr "" -"eine temporäre Staging-Area, basierend auf den integrierten Staging-Area-" -"Informationen, erstellen" +"einen temporären Index, basierend auf den integrierten Index-Informationen, " +"erstellen" -#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 +#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: builtin/apply.c:4559 +#: builtin/apply.c:4562 msgid "ensure at least <n> lines of context match" msgstr "" "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen" -#: builtin/apply.c:4560 +#: builtin/apply.c:4563 msgid "action" msgstr "Aktion" -#: builtin/apply.c:4561 +#: builtin/apply.c:4564 msgid "detect new or modified lines that have whitespace errors" msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln" -#: builtin/apply.c:4564 builtin/apply.c:4567 +#: builtin/apply.c:4567 builtin/apply.c:4570 msgid "ignore changes in whitespace when finding context" msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren" -#: builtin/apply.c:4570 +#: builtin/apply.c:4573 msgid "apply the patch in reverse" msgstr "den Patch in umgekehrter Reihenfolge anwenden" -#: builtin/apply.c:4572 +#: builtin/apply.c:4575 msgid "don't expect at least one line of context" msgstr "keinen Kontext erwarten" -#: builtin/apply.c:4574 +#: builtin/apply.c:4577 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen" -#: builtin/apply.c:4576 +#: builtin/apply.c:4579 msgid "allow overlapping hunks" msgstr "sich überlappende Patch-Blöcke erlauben" -#: builtin/apply.c:4579 +#: builtin/apply.c:4582 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren" -#: builtin/apply.c:4582 +#: builtin/apply.c:4585 msgid "do not trust the line counts in the hunk headers" msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen" -#: builtin/apply.c:4584 +#: builtin/apply.c:4587 msgid "root" msgstr "Wurzelverzeichnis" -#: builtin/apply.c:4585 +#: builtin/apply.c:4588 msgid "prepend <root> to all filenames" msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen" -#: builtin/apply.c:4607 +#: builtin/apply.c:4610 msgid "--3way outside a repository" msgstr "" "Die Option --3way kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4615 +#: builtin/apply.c:4618 msgid "--index outside a repository" msgstr "" "Die Option --index kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4618 +#: builtin/apply.c:4621 msgid "--cached outside a repository" msgstr "" "Die Option --cached kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4637 +#: builtin/apply.c:4640 #, c-format msgid "can't open patch '%s'" msgstr "kann Patch '%s' nicht öffnen" -#: builtin/apply.c:4651 +#: builtin/apply.c:4654 #, 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:4657 builtin/apply.c:4667 +#: builtin/apply.c:4660 builtin/apply.c:4670 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2754,11 +2803,11 @@ msgstr "'git bisect next' ausführen" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "BISECT_HEAD aktualisieren, anstatt den aktuellen Commit auszuchecken" -#: builtin/blame.c:30 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" -msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] Datei" +#: builtin/blame.c:31 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>" -#: builtin/blame.c:35 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)" @@ -2883,7 +2932,7 @@ msgstr "git branch [<Optionen>] [-r] (-d | -D) <Branchname>..." msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>" -#: builtin/branch.c:152 +#: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2892,7 +2941,7 @@ msgstr "" "entferne Branch '%s', der zusammengeführt wurde mit\n" " '%s', aber noch nicht mit HEAD zusammengeführt wurde." -#: builtin/branch.c:156 +#: builtin/branch.c:154 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2901,12 +2950,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:170 +#: builtin/branch.c:168 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen." -#: builtin/branch.c:174 +#: builtin/branch.c:172 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2916,311 +2965,311 @@ msgstr "" "Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D " "%s' aus." -#: builtin/branch.c:187 +#: builtin/branch.c:185 msgid "Update of config-file failed" msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen." -#: builtin/branch.c:215 +#: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "kann -a nicht mit -d benutzen" -#: builtin/branch.c:221 +#: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen." -#: builtin/branch.c:229 +#: builtin/branch.c:227 #, 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." -#: builtin/branch.c:245 +#: builtin/branch.c:243 #, c-format -msgid "remote branch '%s' not found." -msgstr "Remote-Branch '%s' nicht gefunden" +msgid "remote-tracking branch '%s' not found." +msgstr "Remote-Tracking-Branch '%s' nicht gefunden" -#: builtin/branch.c:246 +#: builtin/branch.c:244 #, c-format msgid "branch '%s' not found." msgstr "Branch '%s' nicht gefunden." -#: builtin/branch.c:260 +#: builtin/branch.c:258 #, c-format -msgid "Error deleting remote branch '%s'" -msgstr "Fehler beim Entfernen des Remote-Branches '%s'" +msgid "Error deleting remote-tracking branch '%s'" +msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'" -#: builtin/branch.c:261 +#: builtin/branch.c:259 #, c-format msgid "Error deleting branch '%s'" msgstr "Fehler beim Entfernen des Branches '%s'" -#: builtin/branch.c:268 +#: builtin/branch.c:266 #, c-format -msgid "Deleted remote branch %s (was %s).\n" -msgstr "Remote-Branch %s entfernt (war %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" +msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n" -#: builtin/branch.c:269 +#: builtin/branch.c:267 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branch %s entfernt (war %s).\n" -#: builtin/branch.c:370 +#: builtin/branch.c:368 #, c-format msgid "branch '%s' does not point at a commit" msgstr "Branch '%s' zeigt auf keinen Commit" -#: builtin/branch.c:459 +#: builtin/branch.c:451 #, c-format msgid "[%s: gone]" msgstr "[%s: entfernt]" -#: builtin/branch.c:464 +#: builtin/branch.c:456 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:469 +#: builtin/branch.c:461 #, c-format msgid "[%s: behind %d]" msgstr "[%s: %d hinterher]" -#: builtin/branch.c:471 +#: builtin/branch.c:463 #, c-format msgid "[behind %d]" msgstr "[%d hinterher]" -#: builtin/branch.c:475 +#: builtin/branch.c:467 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: %d voraus]" -#: builtin/branch.c:477 +#: builtin/branch.c:469 #, c-format msgid "[ahead %d]" msgstr "[%d voraus]" -#: builtin/branch.c:480 +#: builtin/branch.c:472 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: %d voraus, %d hinterher]" -#: builtin/branch.c:483 +#: builtin/branch.c:475 #, c-format msgid "[ahead %d, behind %d]" msgstr "[%d voraus, %d hinterher]" -#: builtin/branch.c:496 +#: builtin/branch.c:488 msgid " **** invalid ref ****" msgstr " **** ungültige Referenz ****" -#: builtin/branch.c:587 +#: builtin/branch.c:579 #, c-format msgid "(no branch, rebasing %s)" msgstr "(kein Branch, Rebase von Branch %s im Gange)" -#: builtin/branch.c:590 +#: builtin/branch.c:582 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(kein Branch, binäre Suche begonnen bei %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:588 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD losgelöst bei %s)" -#: builtin/branch.c:599 +#: builtin/branch.c:591 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD losgelöst von %s)" -#: builtin/branch.c:603 +#: builtin/branch.c:595 msgid "(no branch)" msgstr "(kein Branch)" -#: builtin/branch.c:650 +#: builtin/branch.c:642 #, c-format msgid "object '%s' does not point to a commit" msgstr "Objekt '%s' zeigt auf keinen Commit" -#: builtin/branch.c:698 +#: builtin/branch.c:690 msgid "some refs could not be read" msgstr "Konnte einige Referenzen nicht lesen" -#: builtin/branch.c:711 +#: builtin/branch.c:703 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:721 +#: builtin/branch.c:713 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Branchname: '%s'" -#: builtin/branch.c:736 +#: builtin/branch.c:728 msgid "Branch rename failed" msgstr "Umbenennung des Branches fehlgeschlagen" -#: builtin/branch.c:740 +#: builtin/branch.c:732 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Branch '%s' umbenannt" -#: builtin/branch.c:744 +#: builtin/branch.c:736 #, 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:751 +#: builtin/branch.c:743 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:766 +#: builtin/branch.c:758 #, c-format msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" -#: builtin/branch.c:790 +#: builtin/branch.c:780 #, c-format msgid "could not write branch description template: %s" msgstr "Konnte Beschreibungsvorlage für Branch nicht schreiben: %s" -#: builtin/branch.c:820 +#: builtin/branch.c:810 msgid "Generic options" msgstr "Allgemeine Optionen" -#: builtin/branch.c:822 +#: builtin/branch.c:812 msgid "show hash and subject, give twice for upstream branch" msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch" -#: builtin/branch.c:823 +#: builtin/branch.c:813 msgid "suppress informational messages" msgstr "Informationsmeldungen unterdrücken" -#: builtin/branch.c:824 +#: builtin/branch.c:814 msgid "set up tracking mode (see git-pull(1))" msgstr "den Übernahmemodus einstellen (siehe git-pull(1))" -#: builtin/branch.c:826 +#: builtin/branch.c:816 msgid "change upstream info" msgstr "Informationen zum Upstream-Branch ändern" -#: builtin/branch.c:830 +#: builtin/branch.c:820 msgid "use colored output" msgstr "farbige Ausgaben verwenden" -#: builtin/branch.c:831 +#: builtin/branch.c:821 msgid "act on remote-tracking branches" msgstr "auf Remote-Tracking-Branches wirken" -#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 -#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 -#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 +#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851 +#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "Commit" -#: builtin/branch.c:835 builtin/branch.c:841 +#: builtin/branch.c:825 builtin/branch.c:831 msgid "print only branches that contain the commit" msgstr "nur Branches ausgeben, welche diesen Commit beinhalten" -#: builtin/branch.c:847 +#: builtin/branch.c:837 msgid "Specific git-branch actions:" msgstr "spezifische Aktionen für \"git-branch\":" -#: builtin/branch.c:848 +#: builtin/branch.c:838 msgid "list both remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches auflisten" -#: builtin/branch.c:850 +#: builtin/branch.c:840 msgid "delete fully merged branch" msgstr "vollständig zusammengeführten Branch entfernen" -#: builtin/branch.c:851 +#: builtin/branch.c:841 msgid "delete branch (even if not merged)" msgstr "Branch löschen (auch wenn nicht zusammengeführt)" -#: builtin/branch.c:852 +#: builtin/branch.c:842 msgid "move/rename a branch and its reflog" msgstr "einen Branch und dessen Reflog verschieben/umbenennen" -#: builtin/branch.c:853 +#: builtin/branch.c:843 msgid "move/rename a branch, even if target exists" msgstr "" "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:854 +#: builtin/branch.c:844 msgid "list branch names" msgstr "Branchnamen auflisten" -#: builtin/branch.c:855 +#: builtin/branch.c:845 msgid "create the branch's reflog" msgstr "das Reflog des Branches erzeugen" -#: builtin/branch.c:857 +#: builtin/branch.c:847 msgid "edit the description for the branch" msgstr "die Beschreibung für den Branch bearbeiten" -#: builtin/branch.c:858 +#: builtin/branch.c:848 msgid "force creation, move/rename, deletion" msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen" -#: builtin/branch.c:861 +#: builtin/branch.c:851 msgid "print only not merged branches" msgstr "nur Branches ausgeben, die nicht zusammengeführt sind" -#: builtin/branch.c:867 +#: builtin/branch.c:857 msgid "print only merged branches" msgstr "nur Branches ausgeben, die zusammengeführt sind" -#: builtin/branch.c:871 +#: builtin/branch.c:861 msgid "list branches in columns" msgstr "Branches in Spalten auflisten" -#: builtin/branch.c:884 +#: builtin/branch.c:874 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenz auflösen." -#: builtin/branch.c:888 builtin/clone.c:637 +#: builtin/branch.c:878 builtin/clone.c:629 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:910 +#: builtin/branch.c:900 msgid "--column and --verbose are incompatible" msgstr "Die Optionen --column und --verbose sind inkompatibel." -#: builtin/branch.c:921 builtin/branch.c:960 +#: builtin/branch.c:911 builtin/branch.c:950 msgid "branch name required" msgstr "Branchname erforderlich" -#: builtin/branch.c:936 +#: builtin/branch.c:926 msgid "Cannot give description to detached HEAD" msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden" -#: builtin/branch.c:941 +#: builtin/branch.c:931 msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#: builtin/branch.c:948 +#: builtin/branch.c:938 #, c-format msgid "No commit on branch '%s' yet." msgstr "Noch kein Commit in Branch '%s'." -#: builtin/branch.c:951 +#: builtin/branch.c:941 #, c-format msgid "No branch named '%s'." msgstr "Branch '%s' nicht vorhanden." -#: builtin/branch.c:966 +#: builtin/branch.c:956 msgid "too many branches for a rename operation" msgstr "zu viele Branches für eine Umbenennen-Operation angegeben" -#: builtin/branch.c:971 +#: builtin/branch.c:961 msgid "too many branches to set new upstream" msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen" -#: builtin/branch.c:975 +#: builtin/branch.c:965 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3228,43 +3277,43 @@ msgstr "" "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n" "keinen Branch zeigt." -#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 +#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011 #, c-format msgid "no such branch '%s'" msgstr "Kein solcher Branch '%s'" -#: builtin/branch.c:982 +#: builtin/branch.c:972 #, c-format msgid "branch '%s' does not exist" msgstr "Branch '%s' existiert nicht" -#: builtin/branch.c:994 +#: builtin/branch.c:984 msgid "too many branches to unset upstream" msgstr "" "zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen" -#: builtin/branch.c:998 +#: builtin/branch.c:988 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:1004 +#: builtin/branch.c:994 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: builtin/branch.c:1018 +#: builtin/branch.c:1008 msgid "it does not make sense to create 'HEAD' manually" msgstr "'HEAD' darf nicht manuell erstellt werden" -#: builtin/branch.c:1024 +#: builtin/branch.c:1014 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:1027 +#: builtin/branch.c:1017 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3273,7 +3322,7 @@ msgstr "" "Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --" "track oder --set-upstream-to\n" -#: builtin/branch.c:1044 +#: builtin/branch.c:1034 #, c-format msgid "" "\n" @@ -3284,72 +3333,89 @@ msgstr "" "Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, führen " "Sie aus:\n" -#: builtin/branch.c:1045 +#: builtin/branch.c:1035 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1046 +#: builtin/branch.c:1036 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" -#: builtin/bundle.c:47 +#: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" msgstr "%s ist in Ordnung\n" -#: builtin/bundle.c:56 +#: builtin/bundle.c:64 msgid "Need a repository to create a bundle." msgstr "Um ein Paket zu erstellen wird ein Repository benötigt." -#: builtin/bundle.c:60 +#: builtin/bundle.c:68 msgid "Need a repository to unbundle." msgstr "Zum Entpacken wird ein Repository benötigt." -#: builtin/cat-file.c:326 -msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" -msgstr "git cat-file (-t | -s | -e | -p | <Art> | --textconv) <Objekt>" +#: builtin/cat-file.c:369 +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|" +"<Art>|--textconv) <Objekt>" -#: builtin/cat-file.c:327 -msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" -msgstr "git cat-file (--batch | --batch-check) < <Liste-von-Objekten>" +#: builtin/cat-file.c:370 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-" +"objects>" +msgstr "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <Liste-von-" +"Objekten" -#: builtin/cat-file.c:364 +#: builtin/cat-file.c:407 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<Art> kann sein: blob, tree, commit, tag" -#: builtin/cat-file.c:365 +#: builtin/cat-file.c:408 msgid "show object type" msgstr "Objektart anzeigen" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:409 msgid "show object size" msgstr "Objektgröße anzeigen" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:411 msgid "exit with zero when there's no error" msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:412 msgid "pretty-print object's content" msgstr "ansprechende Anzeige des Objektinhaltes" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:414 msgid "for blob objects, run textconv on object's content" msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:416 +msgid "allow -s and -t to work with broken/corrupt objects" +msgstr "-s und -t mit beschädigten Objekten erlauben" + +#: builtin/cat-file.c:418 msgid "show info and content of objects fed from the standard input" msgstr "" "Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-" "Eingabe" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:421 msgid "show info about objects fed from the standard input" msgstr "" "Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe" +#: builtin/cat-file.c:424 +msgid "follow in-tree symlinks (used with --batch or --batch-check)" +msgstr "symbolischen Verknüpfungen innerhalb des Repositories folgen " +"(verwendet mit --batch oder --batch-check)" + #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <Attribut>...] [--] <Pfadname>..." @@ -3365,9 +3431,9 @@ msgstr "alle Attribute einer Datei ausgeben" #: builtin/check-attr.c:20 msgid "use .gitattributes only from the index" -msgstr ".gitattributes nur von der Staging-Area verwenden" +msgstr "nur .gitattributes vom Index verwenden" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96 msgid "read file names from stdin" msgstr "Dateinamen von der Standard-Eingabe lesen" @@ -3375,7 +3441,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:1107 builtin/gc.c:274 +#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279 msgid "suppress progress reporting" msgstr "Fortschrittsanzeige unterdrücken" @@ -3385,7 +3451,7 @@ msgstr "Eingabe-Pfade ohne Übereinstimmungen anzeigen" #: builtin/check-ignore.c:28 msgid "ignore index when checking" -msgstr "Staging-Area bei der Prüfung ignorieren" +msgstr "Index bei der Prüfung ignorieren" #: builtin/check-ignore.c:154 msgid "cannot specify pathnames with --stdin" @@ -3435,7 +3501,7 @@ msgstr "git checkout-index [<Optionen>] [--] [<Datei>...]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" -msgstr "alle Dateien in der Staging-Area auschecken" +msgstr "alle Dateien im Index auschecken" #: builtin/checkout-index.c:189 msgid "force overwrite of existing files" @@ -3444,8 +3510,8 @@ msgstr "das Überschreiben bereits existierender Dateien erzwingen" #: builtin/checkout-index.c:191 msgid "no warning for existing files and files not in index" msgstr "" -"keine Warnung für existierende Dateien, und Dateien, die sich nicht in der " -"Staging-Area befinden" +"keine Warnung für existierende Dateien, und Dateien, die sich nicht im Index " +"befinden" #: builtin/checkout-index.c:193 msgid "don't checkout new files" @@ -3453,7 +3519,7 @@ msgstr "keine neuen Dateien auschecken" #: builtin/checkout-index.c:195 msgid "update stat information in the index file" -msgstr "Dateiinformationen in der Staging-Area-Datei aktualisieren" +msgstr "Dateiinformationen in der Index-Datei aktualisieren" #: builtin/checkout-index.c:201 msgid "read list of paths from the standard input" @@ -3476,114 +3542,114 @@ msgstr "" msgid "copy out the files from named stage" msgstr "Dateien von dem benannten Stand kopieren" -#: builtin/checkout.c:25 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<Optionen>] <Branch>" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..." -#: builtin/checkout.c:132 builtin/checkout.c:165 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "Pfad '%s' hat nicht unsere Version." -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "Pfad '%s' hat nicht deren Version." -#: builtin/checkout.c:150 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "Pfad '%s' hat nicht alle notwendigen Versionen." -#: builtin/checkout.c:194 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "Pfad '%s' hat nicht die notwendigen Versionen." -#: builtin/checkout.c:211 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "Pfad '%s': kann nicht zusammenführen" -#: builtin/checkout.c:228 +#: builtin/checkout.c:234 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen." -#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255 -#: builtin/checkout.c:258 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 builtin/checkout.c:277 #, c-format msgid "'%s' cannot be used with updating paths" -msgstr "'%s' kann nicht mit Pfaden verwendet werden" +msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden" -#: builtin/checkout.c:261 builtin/checkout.c:264 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:267 +#: builtin/checkout.c:273 #, 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:278 builtin/checkout.c:467 +#: builtin/checkout.c:287 builtin/checkout.c:481 msgid "corrupt index file" -msgstr "beschädigte Staging-Area-Datei" +msgstr "beschädigte Index-Datei" -#: builtin/checkout.c:338 builtin/checkout.c:345 +#: builtin/checkout.c:347 builtin/checkout.c:354 #, c-format msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengeführt." -#: builtin/checkout.c:489 +#: builtin/checkout.c:503 msgid "you need to resolve your current index first" -msgstr "Sie müssen zuerst Ihre aktuelle Staging-Area auflösen." +msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen." -#: builtin/checkout.c:615 +#: builtin/checkout.c:634 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Konnte \"reflog\" für '%s' nicht durchführen\n" -#: builtin/checkout.c:653 +#: builtin/checkout.c:670 msgid "HEAD is now at" msgstr "HEAD ist jetzt bei" -#: builtin/checkout.c:660 +#: builtin/checkout.c:677 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Branch '%s' neu\n" -#: builtin/checkout.c:663 +#: builtin/checkout.c:680 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:667 +#: builtin/checkout.c:684 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Zu umgesetztem Branch '%s' gewechselt\n" -#: builtin/checkout.c:669 builtin/checkout.c:1050 +#: builtin/checkout.c:686 builtin/checkout.c:1285 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Zu neuem Branch '%s' gewechselt\n" -#: builtin/checkout.c:671 +#: builtin/checkout.c:688 #, c-format msgid "Switched to branch '%s'\n" msgstr "Zu Branch '%s' gewechselt\n" -#: builtin/checkout.c:723 +#: builtin/checkout.c:740 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" -#: builtin/checkout.c:729 +#: builtin/checkout.c:746 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3606,154 +3672,205 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:747 +#: builtin/checkout.c:765 #, c-format msgid "" +"If you want to keep it by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch <new-branch-name> %s\n" +"\n" +msgid_plural "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" " git branch <new-branch-name> %s\n" "\n" -msgstr "" +msgstr[0] "" +"Wenn Sie diese durch einen neuen Branch behalten möchten, dann könnte jetzt\n" +"ein guter Zeitpunkt sein dies zu tun mit:\n" +"\n" +" git branch <neuer-Branchname> %s\n" +"\n" +msgstr[1] "" "Wenn Sie diese durch einen neuen Branch behalten möchten, dann könnte jetzt\n" "ein guter Zeitpunkt sein dies zu tun mit:\n" "\n" " git branch <neuer-Branchname> %s\n" "\n" -#: builtin/checkout.c:777 +#: builtin/checkout.c:801 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:781 +#: builtin/checkout.c:805 msgid "Previous HEAD position was" msgstr "Vorherige Position von HEAD war" -#: builtin/checkout.c:808 builtin/checkout.c:1045 +#: builtin/checkout.c:832 builtin/checkout.c:1280 msgid "You are on a branch yet to be born" msgstr "Sie sind auf einem Branch, der noch geboren wird" -#: builtin/checkout.c:952 +#: builtin/checkout.c:893 +msgid "no branch specified" +msgstr "Kein Branch spezifiziert" + +#: builtin/checkout.c:895 +#, c-format +msgid "'%s' already exists" +msgstr "'%s' existiert bereits" + +#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842 +#: builtin/clone.c:853 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." + +#: builtin/checkout.c:924 +#, c-format +msgid "could not create directory of '%s'" +msgstr "Konnte Verzeichnis '%s' nicht erstellen." + +#: builtin/checkout.c:960 +#, c-format +msgid "Enter %s (identifier %s)" +msgstr "Betrete %s (Identifikation %s)" + +#: builtin/checkout.c:1070 +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "'%s' ist bereits in '%s' ausgecheckt" + +#: builtin/checkout.c:1176 #, c-format msgid "only one reference expected, %d given." msgstr "nur eine Referenz erwartet, %d gegeben." -#: builtin/checkout.c:991 +#: builtin/checkout.c:1215 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" -#: builtin/checkout.c:1020 +#: builtin/checkout.c:1255 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein \"Tree\"-Objekt: %s" -#: builtin/checkout.c:1059 +#: builtin/checkout.c:1294 msgid "paths cannot be used with switching branches" msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1062 builtin/checkout.c:1066 +#: builtin/checkout.c:1297 builtin/checkout.c:1301 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078 -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313 +#: builtin/checkout.c:1316 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:1086 +#: builtin/checkout.c:1321 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln" -#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90 +#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "Branch" -#: builtin/checkout.c:1109 +#: builtin/checkout.c:1347 msgid "create and checkout a new branch" msgstr "einen neuen Branch erzeugen und auschecken" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1349 msgid "create/reset and checkout a branch" msgstr "einen Branch erstellen/umsetzen und auschecken" -#: builtin/checkout.c:1112 +#: builtin/checkout.c:1350 msgid "create reflog for new branch" msgstr "das Reflog für den neuen Branch erzeugen" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1351 msgid "detach the HEAD at named commit" msgstr "HEAD zu benanntem Commit setzen" -#: builtin/checkout.c:1114 +#: builtin/checkout.c:1352 msgid "set upstream info for new branch" msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new-branch" msgstr "neuer Branch" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new unparented branch" msgstr "neuer Branch ohne Eltern-Commit" -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1355 msgid "checkout our version for unmerged files" msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1119 +#: builtin/checkout.c:1357 msgid "checkout their version for unmerged files" msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1121 +#: builtin/checkout.c:1359 msgid "force checkout (throw away local modifications)" msgstr "Auschecken erzwingen (verwirft lokale Änderungen)" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1360 msgid "perform a 3-way merge with the new branch" msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen" -#: builtin/checkout.c:1123 builtin/merge.c:227 +#: builtin/checkout.c:1361 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "ignorierte Dateien aktualisieren (Standard)" -#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 +#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244 msgid "style" msgstr "Stil" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1363 msgid "conflict style (merge or diff3)" msgstr "Konfliktstil (merge oder diff3)" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1366 msgid "do not limit pathspecs to sparse entries only" msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1368 msgid "second guess 'git checkout <no-such-branch>'" msgstr "second guess 'git checkout <no-such-branch>'" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1370 +msgid "check a branch out in a separate working directory" +msgstr "Branch in separatem Arbeitsverzeichnis auschecken" + +#: builtin/checkout.c:1372 +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:1406 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus." -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1423 msgid "--track needs a branch name" msgstr "Bei der Option --track muss ein Branchname angegeben werden." -#: builtin/checkout.c:1175 +#: builtin/checkout.c:1428 msgid "Missing branch name; try -b" msgstr "Vermisse Branchnamen; versuchen Sie -b" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1464 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1219 +#: builtin/checkout.c:1471 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3763,18 +3880,18 @@ msgstr "" "Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelöst " "werden kann?" -#: builtin/checkout.c:1224 +#: builtin/checkout.c:1476 #, 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:1228 +#: builtin/checkout.c:1480 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n" -"Sie aus der Staging-Area auschecken." +"Sie aus dem Index auschecken." #: builtin/clean.c:26 msgid "" @@ -3839,36 +3956,36 @@ msgstr "" "* - alle Elemente auswählen\n" " - (leer) Auswahl beenden" -#: builtin/clean.c:517 +#: builtin/clean.c:515 #, c-format msgid "Huh (%s)?" msgstr "Wie bitte (%s)?" -#: builtin/clean.c:659 +#: builtin/clean.c:657 #, c-format msgid "Input ignore patterns>> " msgstr "Ignorier-Muster eingeben>> " -#: builtin/clean.c:696 +#: builtin/clean.c:694 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s" -#: builtin/clean.c:717 +#: builtin/clean.c:715 msgid "Select items to delete" msgstr "Wählen Sie Einträge zum Löschen" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:756 #, c-format msgid "Remove %s [y/N]? " msgstr "'%s' löschen [y/N]? " -#: builtin/clean.c:783 +#: builtin/clean.c:781 msgid "Bye." msgstr "Tschüss." -#: builtin/clean.c:791 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3886,62 +4003,62 @@ msgstr "" "help - diese Meldung anzeigen\n" "? - Hilfe zur Auswahl mittels Eingabe anzeigen" -#: builtin/clean.c:818 +#: builtin/clean.c:816 msgid "*** Commands ***" msgstr "*** Kommandos ***" -#: builtin/clean.c:819 +#: builtin/clean.c:817 msgid "What now" msgstr "Was nun" -#: builtin/clean.c:827 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Würde das folgende Element entfernen:" msgstr[1] "Würde die folgenden Elemente entfernen:" -#: builtin/clean.c:844 +#: builtin/clean.c:842 msgid "No more files to clean, exiting." msgstr "Keine Dateien mehr zum Löschen, beende." -#: builtin/clean.c:875 +#: builtin/clean.c:873 msgid "do not print names of files removed" msgstr "keine Namen von gelöschten Dateien ausgeben" -#: builtin/clean.c:877 +#: builtin/clean.c:875 msgid "force" msgstr "Aktion erzwingen" -#: builtin/clean.c:878 +#: builtin/clean.c:876 msgid "interactive cleaning" msgstr "interaktives Clean" -#: builtin/clean.c:880 +#: builtin/clean.c:878 msgid "remove whole directories" msgstr "ganze Verzeichnisse löschen" -#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 msgid "pattern" msgstr "Muster" -#: builtin/clean.c:882 +#: builtin/clean.c:880 msgid "add <pattern> to ignore rules" msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen" -#: builtin/clean.c:883 +#: builtin/clean.c:881 msgid "remove ignored files, too" msgstr "auch ignorierte Dateien löschen" -#: builtin/clean.c:885 +#: builtin/clean.c:883 msgid "remove only ignored files" msgstr "nur ignorierte Dateien löschen" -#: builtin/clean.c:903 +#: builtin/clean.c:901 msgid "-x and -X cannot be used together" msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden." -#: builtin/clean.c:907 +#: builtin/clean.c:905 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3949,7 +4066,7 @@ msgstr "" "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; " "\"clean\" verweigert" -#: builtin/clean.c:910 +#: builtin/clean.c:908 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3961,154 +4078,154 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" -#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224 #: builtin/push.c:523 msgid "force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/clone.c:68 +#: builtin/clone.c:59 msgid "don't create a checkout" msgstr "kein Auschecken" -#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503 msgid "create a bare repository" msgstr "ein Bare-Repository erstellen" -#: builtin/clone.c:73 +#: builtin/clone.c:64 msgid "create a mirror repository (implies bare)" msgstr "ein Spiegelarchiv erstellen (impliziert --bare)" -#: builtin/clone.c:75 +#: builtin/clone.c:66 msgid "to clone from a local repository" msgstr "von einem lokalen Repository klonen" -#: builtin/clone.c:77 +#: builtin/clone.c:68 msgid "don't use local hardlinks, always copy" msgstr "lokal keine harten Verweise verwenden, immer Kopien" -#: builtin/clone.c:79 +#: builtin/clone.c:70 msgid "setup as shared repository" msgstr "als verteiltes Repository einrichten" -#: builtin/clone.c:81 builtin/clone.c:83 +#: builtin/clone.c:72 builtin/clone.c:74 msgid "initialize submodules in the clone" msgstr "Submodule im Klon initialisieren" -#: builtin/clone.c:84 builtin/init-db.c:493 +#: builtin/clone.c:75 builtin/init-db.c:500 msgid "template-directory" msgstr "Vorlagenverzeichnis" -#: builtin/clone.c:85 builtin/init-db.c:494 +#: builtin/clone.c:76 builtin/init-db.c:501 msgid "directory from which templates will be used" msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden" -#: builtin/clone.c:87 +#: builtin/clone.c:78 msgid "reference repository" msgstr "Repository referenzieren" -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:80 +msgid "use --reference only while cloning" +msgstr "--reference nur während des Klonens benutzen" + +#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "Name" -#: builtin/clone.c:89 +#: builtin/clone.c:82 msgid "use <name> instead of 'origin' to track upstream" msgstr "<Name> statt 'origin' für Upstream-Repository verwenden" -#: builtin/clone.c:91 +#: builtin/clone.c:84 msgid "checkout <branch> instead of the remote's HEAD" msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories" -#: builtin/clone.c:93 +#: builtin/clone.c:86 msgid "path to git-upload-pack on the remote" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 +#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "Tiefe" -#: builtin/clone.c:95 +#: builtin/clone.c:88 msgid "create a shallow clone of that depth" msgstr "" "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen" -#: builtin/clone.c:97 +#: builtin/clone.c:90 msgid "clone only one branch, HEAD or --branch" msgstr "nur einen Branch klonen, HEAD oder --branch" -#: builtin/clone.c:99 -msgid "use --reference only while cloning" -msgstr "--reference nur während des Klonens benutzen" - -#: builtin/clone.c:100 builtin/init-db.c:502 +#: builtin/clone.c:91 builtin/init-db.c:509 msgid "gitdir" msgstr ".git-Verzeichnis" -#: builtin/clone.c:101 builtin/init-db.c:503 +#: builtin/clone.c:92 builtin/init-db.c:510 msgid "separate git dir from working tree" msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren" -#: builtin/clone.c:102 +#: builtin/clone.c:93 msgid "key=value" msgstr "Schlüssel=Wert" -#: builtin/clone.c:103 +#: builtin/clone.c:94 msgid "set config inside the new repository" msgstr "Konfiguration innerhalb des neuen Repositories setzen" -#: builtin/clone.c:256 +#: builtin/clone.c:247 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "Referenziertes Repository '%s' ist kein lokales Repository." -#: builtin/clone.c:260 +#: builtin/clone.c:251 #, c-format msgid "reference repository '%s' is shallow" msgstr "" "Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)." -#: builtin/clone.c:263 +#: builtin/clone.c:254 #, c-format msgid "reference repository '%s' is grafted" msgstr "" "Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") " "eingehängt." -#: builtin/clone.c:325 +#: builtin/clone.c:317 #, c-format msgid "failed to create directory '%s'" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/clone.c:327 builtin/diff.c:84 +#: builtin/clone.c:319 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "Konnte '%s' nicht lesen" -#: builtin/clone.c:329 +#: builtin/clone.c:321 #, c-format msgid "%s exists and is not a directory" msgstr "%s existiert und ist kein Verzeichnis" -#: builtin/clone.c:343 +#: builtin/clone.c:335 #, c-format msgid "failed to stat %s\n" msgstr "Konnte %s nicht lesen\n" -#: builtin/clone.c:365 +#: builtin/clone.c:357 #, c-format msgid "failed to create link '%s'" msgstr "Konnte Verweis '%s' nicht erstellen" -#: builtin/clone.c:369 +#: builtin/clone.c:361 #, c-format msgid "failed to copy file to '%s'" msgstr "Konnte Datei nicht nach '%s' kopieren" -#: builtin/clone.c:392 builtin/clone.c:566 +#: builtin/clone.c:384 builtin/clone.c:558 #, c-format msgid "done.\n" msgstr "Fertig.\n" -#: builtin/clone.c:404 +#: builtin/clone.c:396 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4118,126 +4235,121 @@ 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:481 +#: builtin/clone.c:473 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." -#: builtin/clone.c:561 +#: builtin/clone.c:553 #, c-format msgid "Checking connectivity... " msgstr "Prüfe Konnektivität ... " -#: builtin/clone.c:564 +#: builtin/clone.c:556 msgid "remote did not send all necessary objects" msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet." -#: builtin/clone.c:628 +#: builtin/clone.c:620 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:659 +#: builtin/clone.c:651 msgid "unable to checkout working tree" msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" -#: builtin/clone.c:746 +#: builtin/clone.c:738 msgid "cannot repack to clean up" msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen" -#: builtin/clone.c:748 +#: builtin/clone.c:740 msgid "cannot unlink temporary alternates file" msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen" -#: builtin/clone.c:778 +#: builtin/clone.c:770 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:782 +#: builtin/clone.c:774 msgid "You must specify a repository to clone." msgstr "Sie müssen ein Repository zum Klonen angeben." -#: builtin/clone.c:793 +#: builtin/clone.c:785 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Die Optionen --bare und --origin %s sind inkompatibel." -#: builtin/clone.c:796 +#: builtin/clone.c:788 msgid "--bare and --separate-git-dir are incompatible." msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:809 +#: builtin/clone.c:801 #, c-format msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht." -#: builtin/clone.c:815 builtin/fetch.c:1156 +#: builtin/clone.c:807 builtin/fetch.c:1160 #, c-format msgid "depth %s is not a positive number" msgstr "Tiefe %s ist keine positive Zahl" -#: builtin/clone.c:825 +#: builtin/clone.c:817 #, 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:835 +#: builtin/clone.c:827 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:850 builtin/clone.c:861 -#, c-format -msgid "could not create leading directories of '%s'" -msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." - -#: builtin/clone.c:853 +#: builtin/clone.c:845 #, c-format msgid "could not create work tree dir '%s'" msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen" -#: builtin/clone.c:871 +#: builtin/clone.c:863 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in Bare-Repository '%s' ...\n" -#: builtin/clone.c:873 +#: builtin/clone.c:865 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s' ...\n" -#: builtin/clone.c:898 +#: builtin/clone.c:890 msgid "--dissociate given, but there is no --reference" msgstr "--dissociate ohne --reference angegeben" -#: builtin/clone.c:913 +#: builtin/clone.c:907 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:916 +#: builtin/clone.c:910 msgid "source repository is shallow, ignoring --local" msgstr "" "Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --" "local" -#: builtin/clone.c:921 +#: builtin/clone.c:915 msgid "--local is ignored" msgstr "--local wird ignoriert" -#: builtin/clone.c:925 +#: builtin/clone.c:919 #, c-format msgid "Don't know how to clone %s" msgstr "Weiß nicht wie %s zu klonen ist." -#: builtin/clone.c:976 builtin/clone.c:984 +#: builtin/clone.c:968 builtin/clone.c:976 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" -#: builtin/clone.c:987 +#: builtin/clone.c:979 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." @@ -4386,7 +4498,7 @@ msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD." #: builtin/commit.c:344 msgid "unable to create temporary index" -msgstr "Konnte temporäre Staging-Area nicht erstellen." +msgstr "Konnte temporären Index nicht erstellen." #: builtin/commit.c:350 msgid "interactive add failed" @@ -4394,11 +4506,11 @@ msgstr "interaktives Hinzufügen fehlgeschlagen" #: builtin/commit.c:361 msgid "unable to write index file" -msgstr "Konnte Staging-Area-Datei nicht schreiben." +msgstr "Konnte Index-Datei nicht schreiben." #: builtin/commit.c:363 msgid "unable to update temporary index" -msgstr "Konnte temporäre Staging-Area nicht aktualisieren." +msgstr "Konnte temporären Index nicht aktualisieren." #: builtin/commit.c:365 msgid "Failed to update main cache tree" @@ -4419,11 +4531,11 @@ msgstr "" #: builtin/commit.c:456 msgid "cannot read the index" -msgstr "Kann Staging-Area nicht lesen" +msgstr "Kann Index nicht lesen" #: builtin/commit.c:475 msgid "unable to write temporary index file" -msgstr "Konnte temporäre Staging-Area-Datei nicht schreiben." +msgstr "Konnte temporäre Index-Datei nicht schreiben." #: builtin/commit.c:580 #, c-format @@ -4479,7 +4591,7 @@ msgstr "Konnte MERGE_MSG nicht lesen" msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:738 +#: builtin/commit.c:738 builtin/merge.c:1079 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" @@ -4558,7 +4670,7 @@ msgstr "%sCommit-Ersteller: %.*s <%.*s>" #: builtin/commit.c:881 msgid "Cannot read index" -msgstr "Kann Staging-Area nicht lesen" +msgstr "Kann Index nicht lesen" #: builtin/commit.c:938 msgid "Error building trees" @@ -4636,8 +4748,7 @@ msgstr "" #: builtin/commit.c:1195 msgid "Clever... amending the last one with dirty index." -msgstr "" -"Klug ... den letzten Commit mit einer geänderten Staging-Area nachbessern." +msgstr "Klug ... den letzten Commit mit einem geänderten Index nachbessern." #: builtin/commit.c:1197 msgid "Explicit paths specified without -i or -o; assuming --only paths..." @@ -4652,32 +4763,32 @@ msgstr "Ungültiger \"cleanup\" Modus %s" 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:1604 +#: builtin/commit.c:1324 builtin/commit.c:1603 msgid "show status concisely" msgstr "Status im Kurzformat anzeigen" -#: builtin/commit.c:1326 builtin/commit.c:1606 +#: builtin/commit.c:1326 builtin/commit.c:1605 msgid "show branch information" msgstr "Branchinformationen anzeigen" -#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 +#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" -#: builtin/commit.c:1331 builtin/commit.c:1610 +#: builtin/commit.c:1331 builtin/commit.c:1609 msgid "show status in long format (default)" msgstr "Status im Langformat anzeigen (Standard)" -#: builtin/commit.c:1334 builtin/commit.c:1613 +#: builtin/commit.c:1334 builtin/commit.c:1612 msgid "terminate entries with NUL" msgstr "Einträge mit NUL-Zeichen abschließen" -#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "Modus" -#: builtin/commit.c:1337 builtin/commit.c:1616 +#: builtin/commit.c:1337 builtin/commit.c:1615 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: " @@ -4687,7 +4798,7 @@ msgstr "" msgid "show ignored files" msgstr "ignorierte Dateien anzeigen" -#: builtin/commit.c:1341 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:152 msgid "when" msgstr "wann" @@ -4703,207 +4814,207 @@ msgstr "" msgid "list untracked files in columns" msgstr "unversionierte Dateien in Spalten auflisten" -#: builtin/commit.c:1431 +#: builtin/commit.c:1430 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellten Commit nicht nachschlagen." -#: builtin/commit.c:1433 +#: builtin/commit.c:1432 msgid "could not parse newly created commit" msgstr "Konnte neulich erstellten Commit nicht analysieren." -#: builtin/commit.c:1478 +#: builtin/commit.c:1477 msgid "detached HEAD" msgstr "losgelöster HEAD" -#: builtin/commit.c:1481 +#: builtin/commit.c:1480 msgid " (root-commit)" msgstr " (Basis-Commit)" -#: builtin/commit.c:1574 +#: builtin/commit.c:1573 msgid "suppress summary after successful commit" msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken" -#: builtin/commit.c:1575 +#: builtin/commit.c:1574 msgid "show diff in commit message template" msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen" -#: builtin/commit.c:1577 +#: builtin/commit.c:1576 msgid "Commit message options" msgstr "Optionen für Commit-Beschreibung" -#: builtin/commit.c:1578 builtin/tag.c:601 +#: builtin/commit.c:1577 builtin/tag.c:601 msgid "read message from file" msgstr "Beschreibung von Datei lesen" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "author" msgstr "Autor" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "override author for commit" msgstr "Autor eines Commits überschreiben" -#: builtin/commit.c:1580 builtin/gc.c:275 +#: builtin/commit.c:1579 builtin/gc.c:280 msgid "date" msgstr "Datum" -#: builtin/commit.c:1580 +#: builtin/commit.c:1579 msgid "override date for commit" msgstr "Datum eines Commits überschreiben" -#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "Beschreibung" -#: builtin/commit.c:1581 +#: builtin/commit.c:1580 msgid "commit message" msgstr "Commit-Beschreibung" -#: builtin/commit.c:1582 +#: builtin/commit.c:1581 msgid "reuse and edit message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren" -#: builtin/commit.c:1583 +#: builtin/commit.c:1582 msgid "reuse message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden" -#: builtin/commit.c:1584 +#: builtin/commit.c:1583 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des " "angegebenen Commits verwenden" -#: builtin/commit.c:1585 +#: builtin/commit.c:1584 msgid "use autosquash formatted message to squash specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des " "angegebenen Commits verwenden" -#: builtin/commit.c:1586 +#: builtin/commit.c:1585 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:1587 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "'Signed-off-by:'-Zeile hinzufügen" -#: builtin/commit.c:1588 +#: builtin/commit.c:1587 msgid "use specified template file" msgstr "angegebene Vorlagendatei verwenden" -#: builtin/commit.c:1589 +#: builtin/commit.c:1588 msgid "force edit of commit" msgstr "Bearbeitung des Commits erzwingen" -#: builtin/commit.c:1590 +#: builtin/commit.c:1589 msgid "default" msgstr "Standard" -#: builtin/commit.c:1590 builtin/tag.c:604 +#: builtin/commit.c:1589 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "" "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" -#: builtin/commit.c:1591 +#: builtin/commit.c:1590 msgid "include status in commit message template" msgstr "Status in die Commit-Beschreibungsvorlage einfügen" -#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "GPG-Schlüsselkennung" -#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "Commit mit GPG signieren" -#: builtin/commit.c:1596 +#: builtin/commit.c:1595 msgid "Commit contents options" msgstr "Optionen für Commit-Inhalt" -#: builtin/commit.c:1597 +#: builtin/commit.c:1596 msgid "commit all changed files" msgstr "alle geänderten Dateien committen" -#: builtin/commit.c:1598 +#: builtin/commit.c:1597 msgid "add specified files to index for commit" msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken" -#: builtin/commit.c:1599 +#: builtin/commit.c:1598 msgid "interactively add files" msgstr "interaktives Hinzufügen von Dateien" -#: builtin/commit.c:1600 +#: builtin/commit.c:1599 msgid "interactively add changes" msgstr "interaktives Hinzufügen von Änderungen" -#: builtin/commit.c:1601 +#: builtin/commit.c:1600 msgid "commit only specified files" msgstr "nur die angegebenen Dateien committen" -#: builtin/commit.c:1602 +#: builtin/commit.c:1601 msgid "bypass pre-commit hook" msgstr "\"pre-commit hook\" umgehen" -#: builtin/commit.c:1603 +#: builtin/commit.c:1602 msgid "show what would be committed" msgstr "anzeigen, was committet werden würde" -#: builtin/commit.c:1614 +#: builtin/commit.c:1613 msgid "amend previous commit" msgstr "vorherigen Commit ändern" -#: builtin/commit.c:1615 +#: builtin/commit.c:1614 msgid "bypass post-rewrite hook" msgstr "\"post-rewrite hook\" umgehen" -#: builtin/commit.c:1620 +#: builtin/commit.c:1619 msgid "ok to record an empty change" msgstr "Aufzeichnung einer leeren Änderung erlauben" -#: builtin/commit.c:1622 +#: builtin/commit.c:1621 msgid "ok to record a change with an empty message" msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben" -#: builtin/commit.c:1651 +#: builtin/commit.c:1650 msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." -#: builtin/commit.c:1690 builtin/merge.c:519 +#: builtin/commit.c:1689 builtin/merge.c:1076 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: builtin/commit.c:1697 +#: builtin/commit.c:1696 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1704 +#: builtin/commit.c:1703 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1723 +#: builtin/commit.c:1722 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Commit-Beschreibung nicht lesen: %s" -#: builtin/commit.c:1734 +#: builtin/commit.c:1733 #, 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:1739 +#: builtin/commit.c:1738 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n" -#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: builtin/commit.c:1787 +#: builtin/commit.c:1786 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5046,18 +5157,18 @@ msgstr "konnte Standard-Farbwert nicht parsen" #, c-format msgid "" "# This is Git's per-user configuration file.\n" -"[core]\n" +"[user]\n" "# Please adapt and uncomment the following lines:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" msgstr "" "# Das ist Git's benutzerspezifische Konfiguraionsdatei.\n" -"[core]\n" +"[user]\n" "# Bitte passen Sie die folgenden Zeilen an und kommentieren Sie diese aus:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:589 +#: builtin/config.c:587 #, c-format msgid "cannot create configuration file %s" msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen." @@ -5392,84 +5503,84 @@ msgstr "Refmap" msgid "specify fetch refmap" msgstr "Refmap für 'fetch' angeben" -#: builtin/fetch.c:375 +#: builtin/fetch.c:377 msgid "Couldn't find remote ref HEAD" msgstr "Konnte Remote-Referenz von HEAD nicht finden." -#: builtin/fetch.c:455 +#: builtin/fetch.c:457 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" -#: builtin/fetch.c:460 +#: builtin/fetch.c:462 msgid "[up to date]" msgstr "[aktuell]" -#: builtin/fetch.c:474 +#: builtin/fetch.c:476 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" "! %-*s %-*s -> %s (kann \"fetch\" im aktuellen Branch nicht ausführen)" -#: builtin/fetch.c:475 builtin/fetch.c:561 +#: builtin/fetch.c:477 builtin/fetch.c:563 msgid "[rejected]" msgstr "[zurückgewiesen]" -#: builtin/fetch.c:486 +#: builtin/fetch.c:488 msgid "[tag update]" msgstr "[Tag Aktualisierung]" -#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 +#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543 msgid " (unable to update local ref)" msgstr " (kann lokale Referenz nicht aktualisieren)" -#: builtin/fetch.c:506 +#: builtin/fetch.c:508 msgid "[new tag]" msgstr "[neues Tag]" -#: builtin/fetch.c:509 +#: builtin/fetch.c:511 msgid "[new branch]" msgstr "[neuer Branch]" -#: builtin/fetch.c:512 +#: builtin/fetch.c:514 msgid "[new ref]" msgstr "[neue Referenz]" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "unable to update local ref" msgstr "kann lokale Referenz nicht aktualisieren" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "forced update" msgstr "Aktualisierung erzwungen" -#: builtin/fetch.c:563 +#: builtin/fetch.c:565 msgid "(non-fast-forward)" msgstr "(kein Vorspulen)" -#: builtin/fetch.c:596 builtin/fetch.c:829 +#: builtin/fetch.c:599 builtin/fetch.c:832 #, c-format msgid "cannot open %s: %s\n" msgstr "kann %s nicht öffnen: %s\n" -#: builtin/fetch.c:605 +#: builtin/fetch.c:608 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" -#: builtin/fetch.c:623 +#: builtin/fetch.c:626 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "%s wurde zurückgewiesen, da Ursprungs-Commits von Repositoriesmit " "unvollständiger Historie (shallow) nicht aktualisiert werden dürfen." -#: builtin/fetch.c:711 builtin/fetch.c:794 +#: builtin/fetch.c:714 builtin/fetch.c:797 #, c-format msgid "From %.*s\n" msgstr "Von %.*s\n" -#: builtin/fetch.c:722 +#: builtin/fetch.c:725 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5478,57 +5589,57 @@ msgstr "" "Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n" "'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen." -#: builtin/fetch.c:774 +#: builtin/fetch.c:777 #, c-format msgid " (%s will become dangling)" msgstr " (%s wird unreferenziert)" -#: builtin/fetch.c:775 +#: builtin/fetch.c:778 #, c-format msgid " (%s has become dangling)" msgstr " (%s wurde unreferenziert)" -#: builtin/fetch.c:799 +#: builtin/fetch.c:802 msgid "[deleted]" msgstr "[gelöscht]" -#: builtin/fetch.c:800 builtin/remote.c:1060 +#: builtin/fetch.c:803 builtin/remote.c:1057 msgid "(none)" msgstr "(nichts)" -#: builtin/fetch.c:819 +#: builtin/fetch.c:822 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Der \"fetch\" in den aktuellen Branch %s von einem nicht-Bare-Repository " "wurde verweigert." -#: builtin/fetch.c:838 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s" -#: builtin/fetch.c:841 +#: builtin/fetch.c:844 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Option \"%s\" wird ignoriert für %s\n" -#: builtin/fetch.c:897 +#: builtin/fetch.c:900 #, c-format msgid "Don't know how to fetch from %s" msgstr "Weiß nicht wie von %s angefordert wird." -#: builtin/fetch.c:1059 +#: builtin/fetch.c:1063 #, c-format msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:1061 builtin/remote.c:90 +#: builtin/fetch.c:1065 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" -#: builtin/fetch.c:1079 +#: builtin/fetch.c:1083 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5537,35 +5648,35 @@ msgstr "" "oder den Namen des Remote-Repositories an, von welchem neue\n" "Commits angefordert werden sollen." -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1106 msgid "You need to specify a tag name." msgstr "Sie müssen den Namen des Tags angeben." -#: builtin/fetch.c:1144 +#: builtin/fetch.c:1148 msgid "--depth and --unshallow cannot be used together" msgstr "" "Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden." -#: builtin/fetch.c:1146 +#: builtin/fetch.c:1150 msgid "--unshallow on a complete repository does not make sense" msgstr "" "Die Option --unshallow kann nicht in einem Repository mit unvollständiger " "Historie verwendet werden." -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1173 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Repository als Argument" -#: builtin/fetch.c:1171 +#: builtin/fetch.c:1175 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kann nicht mit Refspecs verwendet werden." -#: builtin/fetch.c:1182 +#: builtin/fetch.c:1186 #, c-format msgid "No such remote or remote group: %s" msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s" -#: builtin/fetch.c:1190 +#: builtin/fetch.c:1194 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n" @@ -5578,130 +5689,130 @@ msgstr "" "git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file " "<Datei>]" -#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 +#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590 -#: parse-options.h:132 parse-options.h:239 +#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590 +#: parse-options.h:131 parse-options.h:238 msgid "n" msgstr "Anzahl" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:669 msgid "populate log with at most <n> entries from shortlog" msgstr "Historie mit höchstens <n> Einträgen von \"shortlog\" hinzufügen" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:672 msgid "alias for --log (deprecated)" msgstr "Alias für --log (veraltet)" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:675 msgid "text" msgstr "Text" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:676 msgid "use <text> as start of message" msgstr "<Text> als Beschreibungsanfang verwenden" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:677 msgid "file to read from" msgstr "Datei zum Einlesen" -#: builtin/for-each-ref.c:675 +#: builtin/for-each-ref.c:687 msgid "unable to parse format" msgstr "Konnte Format nicht parsen." -#: builtin/for-each-ref.c:1063 +#: builtin/for-each-ref.c:1083 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<Optionen>] [<Muster>]" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1098 msgid "quote placeholders suitably for shells" msgstr "Platzhalter als Shell-String formatieren" -#: builtin/for-each-ref.c:1080 +#: builtin/for-each-ref.c:1100 msgid "quote placeholders suitably for perl" msgstr "Platzhalter als Perl-String formatieren" -#: builtin/for-each-ref.c:1082 +#: builtin/for-each-ref.c:1102 msgid "quote placeholders suitably for python" msgstr "Platzhalter als Python-String formatieren" -#: builtin/for-each-ref.c:1084 +#: builtin/for-each-ref.c:1104 msgid "quote placeholders suitably for Tcl" msgstr "Platzhalter als Tcl-String formatieren" -#: builtin/for-each-ref.c:1087 +#: builtin/for-each-ref.c:1107 msgid "show only <n> matched refs" msgstr "nur <n> passende Referenzen anzeigen" -#: builtin/for-each-ref.c:1088 builtin/replace.c:438 +#: builtin/for-each-ref.c:1108 builtin/replace.c:438 msgid "format" msgstr "Format" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1108 msgid "format to use for the output" msgstr "für die Ausgabe zu verwendendes Format" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1109 msgid "key" msgstr "Schüssel" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1110 msgid "field name to sort on" msgstr "sortiere nach diesem Feld" -#: builtin/fsck.c:147 builtin/prune.c:137 +#: builtin/fsck.c:147 builtin/prune.c:236 msgid "Checking connectivity" msgstr "Prüfe Konnektivität" -#: builtin/fsck.c:540 +#: builtin/fsck.c:548 msgid "Checking object directories" msgstr "Prüfe Objekt-Verzeichnisse" -#: builtin/fsck.c:603 +#: builtin/fsck.c:611 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<Optionen>] [<Objekt>...]" -#: builtin/fsck.c:609 +#: builtin/fsck.c:617 msgid "show unreachable objects" msgstr "unerreichbare Objekte anzeigen" -#: builtin/fsck.c:610 +#: builtin/fsck.c:618 msgid "show dangling objects" msgstr "unreferenzierte Objekte anzeigen" -#: builtin/fsck.c:611 +#: builtin/fsck.c:619 msgid "report tags" msgstr "Tags melden" -#: builtin/fsck.c:612 +#: builtin/fsck.c:620 msgid "report root nodes" msgstr "Hauptwurzeln melden" -#: builtin/fsck.c:613 +#: builtin/fsck.c:621 msgid "make index objects head nodes" -msgstr "Objekte in der Staging-Area prüfen" +msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen" -#: builtin/fsck.c:614 +#: builtin/fsck.c:622 msgid "make reflogs head nodes (default)" -msgstr "die Reflogs prüfen (Standard)" +msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)" -#: builtin/fsck.c:615 +#: builtin/fsck.c:623 msgid "also consider packs and alternate objects" msgstr "ebenso Pakete und alternative Objekte betrachten" -#: builtin/fsck.c:616 +#: builtin/fsck.c:624 msgid "enable more strict checking" msgstr "genauere Prüfung aktivieren" -#: builtin/fsck.c:618 +#: builtin/fsck.c:626 msgid "write dangling objects in .git/lost-found" msgstr "unreferenzierte Objekte nach .git/lost-found schreiben" -#: builtin/fsck.c:619 builtin/prune.c:108 +#: builtin/fsck.c:627 builtin/prune.c:198 msgid "show progress" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/fsck.c:669 +#: builtin/fsck.c:677 msgid "Checking objects" msgstr "Prüfe Objekte" @@ -5709,54 +5820,54 @@ msgstr "Prüfe Objekte" msgid "git gc [<options>]" msgstr "git gc [<Optionen>]" -#: builtin/gc.c:79 +#: builtin/gc.c:67 #, c-format -msgid "Invalid gc.pruneexpire: '%s'" -msgstr "Ungültiges Wert für \"gc.pruneexpire\": '%s'" +msgid "Invalid %s: '%s'" +msgstr "Ungültiger %s: '%s'" -#: builtin/gc.c:107 +#: builtin/gc.c:112 #, c-format msgid "insanely long object directory %.*s" msgstr "zu langes Objekt-Verzeichnis %.*s" -#: builtin/gc.c:276 +#: builtin/gc.c:281 msgid "prune unreferenced objects" msgstr "unreferenzierte Objekte entfernen" -#: builtin/gc.c:278 +#: builtin/gc.c:283 msgid "be more thorough (increased runtime)" msgstr "mehr Gründlichkeit (erhöht Laufzeit)" -#: builtin/gc.c:279 +#: builtin/gc.c:284 msgid "enable auto-gc mode" msgstr "\"auto-gc\" Modus aktivieren" -#: builtin/gc.c:280 +#: builtin/gc.c:285 msgid "force running gc even if there may be another gc running" msgstr "" "Ausführung von \"git gc\" erwzingen, selbst wenn ein anderes\n" "\"git gc\" bereits ausgeführt wird" -#: builtin/gc.c:321 +#: builtin/gc.c:327 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Die Datenbank des Repositories wird für eine optimale Performance im\n" "Hintergrund komprimiert.\n" -#: builtin/gc.c:323 +#: builtin/gc.c:329 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" "Die Datenbank des Projektarchivs wird für eine optimale Performance " "komprimiert.\n" -#: builtin/gc.c:324 +#: builtin/gc.c:330 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Siehe \"git help gc\" für manuelles Aufräumen.\n" -#: builtin/gc.c:342 +#: builtin/gc.c:348 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5764,7 +5875,7 @@ msgstr "" "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n" "(benutzen Sie --force falls nicht)" -#: builtin/gc.c:364 +#: builtin/gc.c:376 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5802,7 +5913,7 @@ msgstr "kann '%s' nicht öffnen" #: builtin/grep.c:638 msgid "search in index instead of in the work tree" -msgstr "in der Staging-Area anstatt im Arbeitsverzeichnis suchen" +msgstr "im Index anstatt im Arbeitsverzeichnis suchen" #: builtin/grep.c:640 msgid "find in contents not managed by git" @@ -5972,7 +6083,7 @@ msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen" msgid "allow calling of grep(1) (ignored by this build)" msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)" -#: builtin/grep.c:741 builtin/show-ref.c:187 +#: builtin/grep.c:741 builtin/show-ref.c:189 msgid "show usage" msgstr "Verwendung anzeigen" @@ -6008,7 +6119,7 @@ msgstr "" msgid "both --cached and trees are given." msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:80 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -6016,38 +6127,38 @@ msgstr "" "git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters] [--stdin] " "[--] <Datei>..." -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:81 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <Liste-von-Pfaden>" -#: builtin/hash-object.c:94 builtin/tag.c:612 +#: builtin/hash-object.c:92 builtin/tag.c:612 msgid "type" msgstr "Art" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:92 msgid "object type" msgstr "Art des Objektes" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:93 msgid "write the object into the object database" msgstr "das Objekt in die Objektdatenbank schreiben" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:95 msgid "read the object from stdin" msgstr "das Objekt von der Standard-Eingabe lesen" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:97 msgid "store file as is without filters" msgstr "Datei wie sie ist speichern, ohne Filter" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:98 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "Hash über zufällige Daten, zur Erzeugung von beschädigten Objekten zur\n" "Fehlersuche in Git, erzeugen" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:99 msgid "process file as it were from this path" msgstr "Datei verarbeiten, als ob sie von diesem Pfad wäre" @@ -6175,292 +6286,292 @@ msgstr "Verwendung: %s%s" msgid "`git %s' is aliased to `%s'" msgstr "für `git %s' wurde der Alias `%s' angelegt" -#: builtin/index-pack.c:150 +#: builtin/index-pack.c:151 #, c-format msgid "unable to open %s" msgstr "kann %s nicht öffnen" -#: builtin/index-pack.c:200 +#: builtin/index-pack.c:201 #, c-format msgid "object type mismatch at %s" msgstr "Objekt-Typen passen bei %s nicht zusammen" -#: builtin/index-pack.c:220 +#: builtin/index-pack.c:221 #, c-format msgid "did not receive expected object %s" msgstr "konnte erwartetes Objekt %s nicht empfangen" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "object %s: expected type %s, found %s" msgstr "Objekt %s: erwarteter Typ %s, %s gefunden" -#: builtin/index-pack.c:265 +#: builtin/index-pack.c:266 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kann %d Byte nicht lesen" msgstr[1] "kann %d Bytes nicht lesen" -#: builtin/index-pack.c:275 +#: builtin/index-pack.c:276 msgid "early EOF" msgstr "zu frühes Dateiende" -#: builtin/index-pack.c:276 +#: builtin/index-pack.c:277 msgid "read error on input" msgstr "Fehler beim Lesen der Eingabe" -#: builtin/index-pack.c:288 +#: builtin/index-pack.c:289 msgid "used more bytes than were available" msgstr "verwendete mehr Bytes als verfügbar waren" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:296 msgid "pack too large for current definition of off_t" msgstr "Paket ist zu groß für die aktuelle Definition von off_t" -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:312 #, c-format msgid "unable to create '%s'" msgstr "konnte '%s' nicht erstellen" -#: builtin/index-pack.c:316 +#: builtin/index-pack.c:317 #, c-format msgid "cannot open packfile '%s'" msgstr "Kann Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:330 +#: builtin/index-pack.c:331 msgid "pack signature mismatch" msgstr "Paketsignatur stimmt nicht überein" -#: builtin/index-pack.c:332 +#: builtin/index-pack.c:333 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "Paketversion %<PRIu32> nicht unterstützt" -#: builtin/index-pack.c:350 +#: builtin/index-pack.c:351 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "Paket hat ein ungültiges Objekt bei Versatz %lu: %s" -#: builtin/index-pack.c:471 +#: builtin/index-pack.c:472 #, c-format msgid "inflate returned %d" msgstr "Dekomprimierung gab %d zurück" -#: builtin/index-pack.c:520 +#: builtin/index-pack.c:521 msgid "offset value overflow for delta base object" msgstr "Wert für Versatz bei Differenzobjekt übergelaufen" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "delta base offset is out of bound" msgstr "" "Wert für Versatz bei Differenzobjekt liegt außerhalb des gültigen Bereichs" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 #, c-format msgid "unknown object type %d" msgstr "Unbekannter Objekt-Typ %d" -#: builtin/index-pack.c:567 +#: builtin/index-pack.c:568 msgid "cannot pread pack file" msgstr "Kann Paketdatei %s nicht lesen" -#: builtin/index-pack.c:569 +#: builtin/index-pack.c:570 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "frühzeitiges Ende der Paketdatei, vermisse %lu Byte" msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %lu Bytes" -#: builtin/index-pack.c:595 +#: builtin/index-pack.c:596 msgid "serious inflate inconsistency" msgstr "ernsthafte Inkonsistenz nach Dekomprimierung" -#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715 -#: builtin/index-pack.c:749 builtin/index-pack.c:758 +#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771 +#: builtin/index-pack.c:805 builtin/index-pack.c:814 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !" -#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/index-pack.c:745 builtin/pack-objects.c:162 #: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "kann %s nicht lesen" -#: builtin/index-pack.c:755 +#: builtin/index-pack.c:811 #, c-format msgid "cannot read existing object %s" msgstr "Kann existierendes Objekt %s nicht lesen." -#: builtin/index-pack.c:769 +#: builtin/index-pack.c:825 #, c-format msgid "invalid blob object %s" msgstr "ungültiges Blob-Objekt %s" -#: builtin/index-pack.c:783 +#: builtin/index-pack.c:839 #, c-format msgid "invalid %s" msgstr "Ungültiger Objekt-Typ %s" -#: builtin/index-pack.c:787 +#: builtin/index-pack.c:843 msgid "Error in object" msgstr "Fehler in Objekt" -#: builtin/index-pack.c:789 +#: builtin/index-pack.c:845 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Nicht alle Kind-Objekte von %s sind erreichbar" -#: builtin/index-pack.c:861 builtin/index-pack.c:890 +#: builtin/index-pack.c:917 builtin/index-pack.c:948 msgid "failed to apply delta" msgstr "Konnte Dateiunterschied nicht anwenden" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Empfange Objekte" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Indiziere Objekte" -#: builtin/index-pack.c:1081 +#: builtin/index-pack.c:1150 msgid "pack is corrupted (SHA1 mismatch)" msgstr "Paket ist beschädigt (SHA1 unterschiedlich)" -#: builtin/index-pack.c:1086 +#: builtin/index-pack.c:1155 msgid "cannot fstat packfile" msgstr "kann Paketdatei nicht lesen" -#: builtin/index-pack.c:1089 +#: builtin/index-pack.c:1158 msgid "pack has junk at the end" msgstr "Paketende enthält nicht verwendbaren Inhalt" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1169 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "Fehler beim Ausführen von \"parse_pack_objects()\"" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1194 msgid "Resolving deltas" msgstr "Löse Unterschiede auf" -#: builtin/index-pack.c:1133 +#: builtin/index-pack.c:1205 #, c-format msgid "unable to create thread: %s" msgstr "kann Thread nicht erzeugen: %s" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1247 msgid "confusion beyond insanity" msgstr "Fehler beim Auflösen der Unterschiede" -#: builtin/index-pack.c:1181 +#: builtin/index-pack.c:1253 #, c-format msgid "completed with %d local objects" msgstr "abgeschlossen mit %d lokalen Objekten" -#: builtin/index-pack.c:1191 +#: builtin/index-pack.c:1263 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1267 #, 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:1219 +#: builtin/index-pack.c:1291 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1367 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschädigt" -#: builtin/index-pack.c:1322 +#: builtin/index-pack.c:1391 msgid "error while closing pack file" msgstr "Fehler beim Schließen der Paketdatei" -#: builtin/index-pack.c:1335 +#: builtin/index-pack.c:1404 #, c-format msgid "cannot write keep file '%s'" msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben" -#: builtin/index-pack.c:1343 +#: builtin/index-pack.c:1412 #, c-format msgid "cannot close written keep file '%s'" msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen" -#: builtin/index-pack.c:1356 +#: builtin/index-pack.c:1425 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1436 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1469 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1475 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ungültige Anzahl von Threads angegeben (%d)" -#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1658 #, c-format msgid "no threads support, ignoring %s" msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1537 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1539 #, 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:1517 +#: builtin/index-pack.c:1586 #, 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:1524 +#: builtin/index-pack.c:1593 #, 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:1553 +#: builtin/index-pack.c:1622 msgid "Cannot come back to cwd" msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln" -#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 -#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 +#: builtin/index-pack.c:1670 builtin/index-pack.c:1673 +#: builtin/index-pack.c:1685 builtin/index-pack.c:1689 #, c-format msgid "bad %s" msgstr "%s ist ungültig" -#: builtin/index-pack.c:1634 +#: builtin/index-pack.c:1703 msgid "--fix-thin cannot be used without --stdin" msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." -#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 +#: builtin/index-pack.c:1707 builtin/index-pack.c:1716 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" -#: builtin/index-pack.c:1655 +#: builtin/index-pack.c:1724 msgid "--verify with no packfile name given" msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." @@ -6529,22 +6640,22 @@ msgstr "keine Vorlagen in '%s' gefunden" msgid "not copying templates of a wrong format version %d from '%s'" msgstr "kopiere keine Vorlagen mit einer falschen Formatversion %d von '%s'" -#: builtin/init-db.c:197 +#: builtin/init-db.c:211 #, c-format msgid "insane git directory %s" msgstr "ungültiges Git-Verzeichnis %s" -#: builtin/init-db.c:331 builtin/init-db.c:334 +#: builtin/init-db.c:343 builtin/init-db.c:346 #, c-format msgid "%s already exists" msgstr "%s existiert bereits" -#: builtin/init-db.c:363 +#: builtin/init-db.c:374 #, c-format msgid "unable to handle file type %d" msgstr "kann nicht mit Dateityp %d umgehen" -#: builtin/init-db.c:366 +#: builtin/init-db.c:377 #, c-format msgid "unable to move %s to %s" msgstr "Konnte %s nicht nach %s verschieben" @@ -6552,24 +6663,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:426 +#: builtin/init-db.c:433 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git-Repository in %s%s\n" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Reinitialized existing" msgstr "Reinitialisierte existierendes" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Initialized empty" msgstr "Initialisierte leeres" -#: builtin/init-db.c:428 +#: builtin/init-db.c:435 msgid " shared" msgstr " gemeinsames" -#: builtin/init-db.c:475 +#: builtin/init-db.c:482 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -6577,29 +6688,29 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--" "shared[=<Berechtigungen>]] [<Verzeichnis>]" -#: builtin/init-db.c:498 +#: builtin/init-db.c:505 msgid "permissions" msgstr "Berechtigungen" -#: builtin/init-db.c:499 +#: builtin/init-db.c:506 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:501 builtin/prune-packed.c:57 builtin/repack.c:171 +#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171 msgid "be quiet" msgstr "weniger Ausgaben" -#: builtin/init-db.c:533 builtin/init-db.c:538 +#: builtin/init-db.c:540 builtin/init-db.c:545 #, c-format msgid "cannot mkdir %s" msgstr "kann Verzeichnis %s nicht erstellen" -#: builtin/init-db.c:542 +#: builtin/init-db.c:549 #, c-format msgid "cannot chdir to %s" msgstr "kann nicht in Verzeichnis %s wechseln" -#: builtin/init-db.c:563 +#: builtin/init-db.c:570 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6608,7 +6719,7 @@ msgstr "" "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s " "(oder --git-dir=<Verzeichnis>)" -#: builtin/init-db.c:591 +#: builtin/init-db.c:598 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen." @@ -6634,7 +6745,7 @@ msgid "trailer(s) to add" msgstr "Anhang/Anhänge hinzufügen" #: builtin/log.c:41 -msgid "git log [<options>] [<revision range>] [[--] <path>...]" +msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]" #: builtin/log.c:42 @@ -6703,7 +6814,7 @@ msgstr "Kann Patch-Datei %s nicht öffnen" msgid "Need exactly one range." msgstr "Brauche genau einen Commit-Bereich." -#: builtin/log.c:811 +#: builtin/log.c:813 msgid "Not a range." msgstr "Kein Commit-Bereich." @@ -6906,7 +7017,7 @@ msgstr "Fehler beim Erstellen der Ausgabedateien." msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]" -#: builtin/log.c:1638 +#: builtin/log.c:1637 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -6914,7 +7025,7 @@ msgstr "" "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> " "manuell an.\n" -#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 +#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662 #, c-format msgid "Unknown commit %s" msgstr "Unbekannter Commit %s" @@ -7000,9 +7111,7 @@ msgstr "Ausgabe relativ zum Projektverzeichnis" #: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" -msgstr "" -"als Fehler behandeln, wenn sich eine <Datei> nicht in der Staging-Area " -"befindet" +msgstr "als Fehler behandeln, wenn sich eine <Datei> nicht im Index befindet" #: builtin/ls-files.c:459 msgid "tree-ish" @@ -7198,42 +7307,42 @@ msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n" msgid "'%s' does not point to a commit" msgstr "'%s' zeigt auf keinen Commit" -#: builtin/merge.c:559 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ungültiger branch.%s.mergeoptions String: %s" -#: builtin/merge.c:654 +#: builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl" -#: builtin/merge.c:678 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "Es wird nur der Merge von zwei Branches behandelt." -#: builtin/merge.c:692 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Unbekannte Option für merge-recursive: -X%s" -#: builtin/merge.c:705 +#: builtin/merge.c:683 #, c-format msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:794 +#: builtin/merge.c:772 #, c-format msgid "Could not read from '%s'" msgstr "konnte nicht von '%s' lesen" -#: builtin/merge.c:803 +#: builtin/merge.c:781 #, 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:809 +#: builtin/merge.c:787 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7249,50 +7358,55 @@ msgstr "" "Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/merge.c:833 +#: builtin/merge.c:811 msgid "Empty commit message." msgstr "Leere Commit-Beschreibung" -#: builtin/merge.c:845 +#: builtin/merge.c:823 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:900 +#: builtin/merge.c:878 #, 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:916 +#: builtin/merge.c:894 #, c-format msgid "'%s' is not a commit" msgstr "'%s' ist kein Commit" -#: builtin/merge.c:957 +#: builtin/merge.c:935 msgid "No current branch." msgstr "Sie befinden sich auf keinem Branch." -#: builtin/merge.c:959 +#: builtin/merge.c:937 msgid "No remote for the current branch." msgstr "Kein Remote-Repository für den aktuellen Branch." -#: builtin/merge.c:961 +#: builtin/merge.c:939 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:966 +#: builtin/merge.c:944 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Kein Remote-Tracking-Branch für %s von %s" -#: builtin/merge.c:1122 +#: builtin/merge.c:1081 +#, c-format +msgid "could not close '%s'" +msgstr "Konnte '%s' nicht schließen" + +#: builtin/merge.c:1208 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Es gibt keinen Merge zum Abbrechen (MERGE_HEAD fehlt)" -#: builtin/merge.c:1138 +#: builtin/merge.c:1224 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7300,11 +7414,11 @@ msgstr "" "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie \"merge\" ausführen." -#: builtin/merge.c:1141 git-pull.sh:34 +#: builtin/merge.c:1227 git-pull.sh:74 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)." -#: builtin/merge.c:1145 +#: builtin/merge.c:1231 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7312,105 +7426,105 @@ msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie \"merge\" ausführen." -#: builtin/merge.c:1148 +#: builtin/merge.c:1234 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:1157 +#: builtin/merge.c:1243 msgid "You cannot combine --squash with --no-ff." msgstr "Sie können --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1166 +#: builtin/merge.c:1251 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1198 -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:1201 +#: builtin/merge.c:1268 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:1203 +#: builtin/merge.c:1270 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:1208 +#: builtin/merge.c:1276 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenführen können" -#: builtin/merge.c:1259 +#: builtin/merge.c:1278 +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:1333 #, 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:1262 +#: builtin/merge.c:1336 #, 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:1265 +#: builtin/merge.c:1339 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s hat keine GPG-Signatur." -#: builtin/merge.c:1268 +#: builtin/merge.c:1342 #, 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:1349 +#: builtin/merge.c:1423 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1388 +#: builtin/merge.c:1462 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n" -#: builtin/merge.c:1395 +#: builtin/merge.c:1469 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1427 +#: builtin/merge.c:1501 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1450 builtin/merge.c:1529 +#: builtin/merge.c:1524 builtin/merge.c:1603 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n" -#: builtin/merge.c:1454 +#: builtin/merge.c:1528 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s ...\n" -#: builtin/merge.c:1520 +#: builtin/merge.c:1594 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie behandelt diesen Merge.\n" -#: builtin/merge.c:1522 +#: builtin/merge.c:1596 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1605 #, 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:1543 +#: builtin/merge.c:1617 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7602,7 +7716,7 @@ msgstr "%s, Quelle=%s, Ziel=%s" msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 +#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" @@ -7981,7 +8095,7 @@ msgstr "Notiz-Referenz" msgid "use notes from <notes-ref>" msgstr "Notizen von <Notiz-Referenz> verwenden" -#: builtin/notes.c:989 builtin/remote.c:1621 +#: builtin/notes.c:989 builtin/remote.c:1618 #, c-format msgid "Unknown subcommand: %s" msgstr "Unbekanntes Unterkommando: %s" @@ -8005,182 +8119,182 @@ msgstr "Fehler beim Komprimieren (%d)" msgid "Writing objects" msgstr "Schreibe Objekte" -#: builtin/pack-objects.c:1013 +#: builtin/pack-objects.c:1011 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" -#: builtin/pack-objects.c:2173 +#: builtin/pack-objects.c:2171 msgid "Compressing objects" msgstr "Komprimiere Objekte" -#: builtin/pack-objects.c:2570 +#: builtin/pack-objects.c:2568 #, c-format msgid "unsupported index version %s" -msgstr "Nicht unterstützte Staging-Area-Version %s" +msgstr "Nicht unterstützte Index-Version %s" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2572 #, c-format msgid "bad index version '%s'" -msgstr "Ungültige Staging-Area-Version '%s'" +msgstr "Ungültige Index-Version '%s'" -#: builtin/pack-objects.c:2597 +#: builtin/pack-objects.c:2595 #, c-format msgid "option %s does not accept negative form" msgstr "Option %s akzeptiert keine negative Form" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2599 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "konnte Wert '%s' für Option %s nicht parsen" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2619 msgid "do not show progress meter" msgstr "keine Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "show progress meter" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter during object writing phase" msgstr "" "Forschrittsanzeige während der Phase des Schreibens der Objekte anzeigen" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2626 msgid "similar to --all-progress when progress meter is shown" msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:2627 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 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:2633 +#: builtin/pack-objects.c:2631 msgid "maximum size of each output pack file" msgstr "maximale Größe für jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "ignore borrowed objects from alternate object store" msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore packed objects" msgstr "gepackte Objekte ignorieren" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "limit pack window by objects" msgstr "Paketfenster durch Objekte begrenzen" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by memory in addition to object limit" msgstr "" "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 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:2645 +#: builtin/pack-objects.c:2643 msgid "reuse existing deltas" msgstr "existierende Unterschiede wiederverwenden" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing objects" msgstr "existierende Objekte wiederverwenden" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA Objekte verwenden" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 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:2653 +#: builtin/pack-objects.c:2651 msgid "do not create an empty pack output" msgstr "keine leeren Pakete erzeugen" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "read revision arguments from standard input" msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 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:2660 +#: builtin/pack-objects.c:2658 msgid "include objects reachable from any reference" msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2661 msgid "include objects referred by reflog entries" msgstr "" "Objekte einschließen, die von Einträgen des Reflogs referenziert werden" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2664 msgid "include objects referred to by the index" -msgstr "Objekte einschließen, die von der Staging-Area referenziert werden" +msgstr "Objekte einschließen, die vom Index referenziert werden" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2667 msgid "output pack to stdout" msgstr "Paket in die Standard-Ausgabe schreiben" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 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:2673 +#: builtin/pack-objects.c:2671 msgid "keep unreachable objects" msgstr "nicht erreichbare Objekte behalten" -#: builtin/pack-objects.c:2674 parse-options.h:140 +#: builtin/pack-objects.c:2672 parse-options.h:139 msgid "time" msgstr "Zeit" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "unpack unreachable objects newer than <time>" msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:2678 +#: builtin/pack-objects.c:2676 msgid "create thin packs" msgstr "dünnere Pakete erzeugen" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create packs suitable for shallow fetches" msgstr "" "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "ignore packs that have companion .keep file" msgstr "Pakete ignorieren, die .keep Dateien haben" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "pack compression level" msgstr "Komprimierungsgrad für Paketierung" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "do not hide commits by grafts" msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 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:2690 +#: builtin/pack-objects.c:2688 msgid "write a bitmap index together with the pack index" msgstr "Bitmap-Index zusammen mit Pack-Index schreiben" -#: builtin/pack-objects.c:2781 +#: builtin/pack-objects.c:2779 msgid "Counting objects" msgstr "Zähle Objekte" @@ -8208,18 +8322,57 @@ msgstr "Lösche doppelte Objekte" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <Zeit>] [--] [<head>...]" -#: builtin/prune.c:106 +#: builtin/prune.c:86 +#, c-format +msgid "Removing worktrees/%s: not a valid directory" +msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis" + +#: builtin/prune.c:92 +#, c-format +msgid "Removing worktrees/%s: gitdir file does not exist" +msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht" + +#: builtin/prune.c:97 +#, c-format +msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen" + +#: builtin/prune.c:108 +#, c-format +msgid "Removing worktrees/%s: invalid gitdir file" +msgstr "Lösche worktrees/%s: ungültige gitdir-Datei" + +#: builtin/prune.c:124 +#, 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/prune.c:159 +#, c-format +msgid "failed to remove: %s" +msgstr "Fehler beim Löschen: %s" + +#: builtin/prune.c:196 msgid "do not remove, show only" msgstr "nicht löschen, nur anzeigen" -#: builtin/prune.c:107 +#: builtin/prune.c:197 msgid "report pruned objects" msgstr "gelöschte Objekte melden" -#: builtin/prune.c:110 +#: builtin/prune.c:199 +msgid "prune .git/worktrees" +msgstr "Informationen zu nicht mehr existierenden Arbeitsverzeichnissen in " +".git/worktrees entfernen" + +#: builtin/prune.c:201 msgid "expire objects older than <time>" msgstr "Objekte älter als <Zeit> verfallen lassen" +#: builtin/prune.c:216 +msgid "--worktrees does not take extra arguments" +msgstr "--worktrees akzeptiert keine weiteren Argumente" + #: builtin/push.c:14 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]" @@ -8580,11 +8733,11 @@ msgstr "" #: builtin/read-tree.c:110 msgid "write resulting index to <file>" -msgstr "resultierende Staging-Area nach <Datei> schreiben" +msgstr "resultierenden Index nach <Datei> schreiben" #: builtin/read-tree.c:113 msgid "only empty the index" -msgstr "die Staging-Area leeren" +msgstr "nur den Index leeren" #: builtin/read-tree.c:115 msgid "Merging" @@ -8612,7 +8765,7 @@ msgstr "<Unterverzeichnis>/" #: builtin/read-tree.c:125 msgid "read the tree into the index under <subdirectory>/" -msgstr "das Verzeichnis in die Staging-Area unter <Unterverzeichnis>/ lesen" +msgstr "das Verzeichnis in den Index unter <Unterverzeichnis>/ lesen" #: builtin/read-tree.c:128 msgid "update working tree with merge result" @@ -8632,7 +8785,7 @@ msgstr "das Arbeitsverzeichnis nach dem Merge nicht prüfen" #: builtin/read-tree.c:135 msgid "don't update the index or the work tree" -msgstr "weder die Staging-Area, noch das Arbeitsverzeichnis aktualisieren" +msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren" #: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" @@ -8642,12 +8795,12 @@ msgstr "Anwendung des Filters für spärliches Auschecken überspringen" msgid "debug unpack-trees" msgstr "Entpacken der Bäume protokollieren" -#: builtin/reflog.c:429 +#: builtin/reflog.c:430 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "'%s' für '%s' ist kein gültiger Zeitstempel" -#: builtin/reflog.c:546 builtin/reflog.c:551 +#: builtin/reflog.c:547 builtin/reflog.c:552 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' ist kein gültiger Zeitstempel" @@ -8790,12 +8943,12 @@ msgstr "" "Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von " "Spiegelarchiven verwendet werden." -#: builtin/remote.c:187 builtin/remote.c:643 +#: builtin/remote.c:187 builtin/remote.c:640 #, c-format msgid "remote %s already exists." msgstr "externes Repository %s existiert bereits" -#: builtin/remote.c:191 builtin/remote.c:647 +#: builtin/remote.c:191 builtin/remote.c:644 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' ist kein gültiger Name für ein Remote-Repository" @@ -8818,27 +8971,27 @@ msgstr "(übereinstimmend)" msgid "(delete)" msgstr "(lösche)" -#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604 +#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Konnte '%s' nicht an '%s' anhängen." -#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895 +#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892 #, c-format msgid "No such remote: %s" msgstr "Kein solches Remote-Repository: %s" -#: builtin/remote.c:653 +#: builtin/remote.c:650 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen" -#: builtin/remote.c:659 builtin/remote.c:847 +#: builtin/remote.c:656 builtin/remote.c:844 #, c-format msgid "Could not remove config section '%s'" msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen" -#: builtin/remote.c:674 +#: builtin/remote.c:671 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8849,32 +9002,32 @@ msgstr "" "\t%s\n" "\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell." -#: builtin/remote.c:680 +#: builtin/remote.c:677 #, c-format msgid "Could not append '%s'" msgstr "Konnte '%s' nicht anhängen." -#: builtin/remote.c:691 +#: builtin/remote.c:688 #, c-format msgid "Could not set '%s'" msgstr "Konnte '%s' nicht setzen" -#: builtin/remote.c:713 +#: builtin/remote.c:710 #, c-format msgid "deleting '%s' failed" msgstr "Konnte '%s' nicht löschen" -#: builtin/remote.c:747 +#: builtin/remote.c:744 #, c-format msgid "creating '%s' failed" msgstr "Konnte '%s' nicht erstellen" -#: builtin/remote.c:766 +#: builtin/remote.c:763 #, c-format msgid "Could not remove branch %s" msgstr "Konnte Branch %s nicht löschen" -#: builtin/remote.c:833 +#: builtin/remote.c:830 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8890,120 +9043,120 @@ msgstr[1] "" "entfernt;\n" "um diese zu entfernen, benutzen Sie:" -#: builtin/remote.c:948 +#: builtin/remote.c:945 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)" -#: builtin/remote.c:951 +#: builtin/remote.c:948 msgid " tracked" msgstr " gefolgt" -#: builtin/remote.c:953 +#: builtin/remote.c:950 msgid " stale (use 'git remote prune' to remove)" msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)" -#: builtin/remote.c:955 +#: builtin/remote.c:952 msgid " ???" msgstr " ???" -#: builtin/remote.c:996 +#: builtin/remote.c:993 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen" -#: builtin/remote.c:1003 +#: builtin/remote.c:1000 #, c-format msgid "rebases onto remote %s" msgstr "Rebase auf Remote-Branch %s" -#: builtin/remote.c:1006 +#: builtin/remote.c:1003 #, c-format msgid " merges with remote %s" msgstr " führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:1007 +#: builtin/remote.c:1004 msgid " and with remote" msgstr " und mit Remote-Branch" -#: builtin/remote.c:1009 +#: builtin/remote.c:1006 #, c-format msgid "merges with remote %s" msgstr "führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:1010 +#: builtin/remote.c:1007 msgid " and with remote" msgstr " und mit Remote-Branch" -#: builtin/remote.c:1056 +#: builtin/remote.c:1053 msgid "create" msgstr "erstellt" -#: builtin/remote.c:1059 +#: builtin/remote.c:1056 msgid "delete" msgstr "gelöscht" -#: builtin/remote.c:1063 +#: builtin/remote.c:1060 msgid "up to date" msgstr "aktuell" -#: builtin/remote.c:1066 +#: builtin/remote.c:1063 msgid "fast-forwardable" msgstr "vorspulbar" -#: builtin/remote.c:1069 +#: builtin/remote.c:1066 msgid "local out of date" msgstr "lokal nicht aktuell" -#: builtin/remote.c:1076 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s erzwingt Versandt nach %-*s (%s)" -#: builtin/remote.c:1079 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s versendet nach %-*s (%s)" -#: builtin/remote.c:1083 +#: builtin/remote.c:1080 #, c-format msgid " %-*s forces to %s" msgstr " %-*s erzwingt Versand nach %s" -#: builtin/remote.c:1086 +#: builtin/remote.c:1083 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s versendet nach %s" -#: builtin/remote.c:1154 +#: builtin/remote.c:1151 msgid "do not query remotes" msgstr "keine Abfrage von Remote-Repositories" -#: builtin/remote.c:1181 +#: builtin/remote.c:1178 #, c-format msgid "* remote %s" msgstr "* Remote-Repository %s" -#: builtin/remote.c:1182 +#: builtin/remote.c:1179 #, c-format msgid " Fetch URL: %s" msgstr " URL zum Abholen: %s" -#: builtin/remote.c:1183 builtin/remote.c:1334 +#: builtin/remote.c:1180 builtin/remote.c:1331 msgid "(no URL)" msgstr "(keine URL)" -#: builtin/remote.c:1192 builtin/remote.c:1194 +#: builtin/remote.c:1189 builtin/remote.c:1191 #, c-format msgid " Push URL: %s" msgstr " URL zum Versenden: %s" -#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200 +#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " HEAD branch: %s" msgstr " Hauptbranch: %s" -#: builtin/remote.c:1202 +#: builtin/remote.c:1199 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -9011,146 +9164,146 @@ msgstr "" " Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden " "sein):\n" -#: builtin/remote.c:1214 +#: builtin/remote.c:1211 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Remote-Branch:%s" msgstr[1] " Remote-Branches:%s" -#: builtin/remote.c:1217 builtin/remote.c:1244 +#: builtin/remote.c:1214 builtin/remote.c:1241 msgid " (status not queried)" msgstr " (Zustand nicht abgefragt)" -#: builtin/remote.c:1226 +#: builtin/remote.c:1223 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:1234 +#: builtin/remote.c:1231 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokale Referenzen werden von 'git push' gespiegelt" -#: builtin/remote.c:1241 +#: builtin/remote.c:1238 #, 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:1262 +#: builtin/remote.c:1259 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository" -#: builtin/remote.c:1264 +#: builtin/remote.c:1261 msgid "delete refs/remotes/<name>/HEAD" msgstr "entfernt refs/remotes/<Name>/HEAD" -#: builtin/remote.c:1279 +#: builtin/remote.c:1276 msgid "Cannot determine remote HEAD" msgstr "Kann HEAD des Remote-Repositories nicht bestimmen" -#: builtin/remote.c:1281 +#: builtin/remote.c:1278 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:1291 +#: builtin/remote.c:1288 #, c-format msgid "Could not delete %s" msgstr "Konnte %s nicht entfernen" -#: builtin/remote.c:1299 +#: builtin/remote.c:1296 #, c-format msgid "Not a valid ref: %s" msgstr "keine gültige Referenz: %s" -#: builtin/remote.c:1301 +#: builtin/remote.c:1298 #, c-format msgid "Could not setup %s" msgstr "Konnte %s nicht einrichten" -#: builtin/remote.c:1319 +#: builtin/remote.c:1316 #, c-format msgid " %s will become dangling!" msgstr " %s wird unreferenziert!" -#: builtin/remote.c:1320 +#: builtin/remote.c:1317 #, c-format msgid " %s has become dangling!" msgstr " %s wurde unreferenziert!" -#: builtin/remote.c:1330 +#: builtin/remote.c:1327 #, c-format msgid "Pruning %s" msgstr "entferne veraltete Branches von %s" -#: builtin/remote.c:1331 +#: builtin/remote.c:1328 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1354 +#: builtin/remote.c:1351 #, c-format msgid " * [would prune] %s" msgstr " * [würde veralteten Branch entfernen] %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1354 #, c-format msgid " * [pruned] %s" msgstr "* [veralteten Branch entfernt] %s" -#: builtin/remote.c:1402 +#: builtin/remote.c:1399 msgid "prune remotes after fetching" msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\"" -#: builtin/remote.c:1468 builtin/remote.c:1542 +#: builtin/remote.c:1465 builtin/remote.c:1539 #, c-format msgid "No such remote '%s'" msgstr "Kein solches Remote-Repository '%s'" -#: builtin/remote.c:1488 +#: builtin/remote.c:1485 msgid "add branch" msgstr "Branch hinzufügen" -#: builtin/remote.c:1495 +#: builtin/remote.c:1492 msgid "no remote specified" msgstr "kein Remote-Repository angegeben" -#: builtin/remote.c:1517 +#: builtin/remote.c:1514 msgid "manipulate push URLs" msgstr "URLs für \"push\" manipulieren" -#: builtin/remote.c:1519 +#: builtin/remote.c:1516 msgid "add URL" msgstr "URL hinzufügen" -#: builtin/remote.c:1521 +#: builtin/remote.c:1518 msgid "delete URLs" msgstr "URLs löschen" -#: builtin/remote.c:1528 +#: builtin/remote.c:1525 msgid "--add --delete doesn't make sense" msgstr "" "Die Optionen --add und --delete können nicht gemeinsam verwendet werden." -#: builtin/remote.c:1568 +#: builtin/remote.c:1565 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ungültiges altes URL Format: %s" -#: builtin/remote.c:1576 +#: builtin/remote.c:1573 #, c-format msgid "No such URL found: %s" msgstr "Keine solche URL gefunden: %s" -#: builtin/remote.c:1578 +#: builtin/remote.c:1575 msgid "Will not delete all non-push URLs" msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind" -#: builtin/remote.c:1592 +#: builtin/remote.c:1589 msgid "be verbose; must be placed before a subcommand" msgstr "erweiterte Ausgaben; muss vor einem Unterkommando angegeben werden" @@ -9225,7 +9378,7 @@ msgid "repack objects in packs marked with .keep" msgstr "" "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden" -#: builtin/repack.c:375 +#: builtin/repack.c:377 #, c-format msgid "removing '%s' failed" msgstr "Löschen von '%s' fehlgeschlagen" @@ -9322,7 +9475,7 @@ msgstr "git rerere [clean | forget <Pfad>... | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" -msgstr "saubere Auflösungen in der Staging-Area registrieren" +msgstr "saubere Auflösungen im Index registrieren" #: builtin/reset.c:26 msgid "" @@ -9387,7 +9540,7 @@ msgstr "weniger Ausgaben, meldet nur Fehler" #: builtin/reset.c:278 msgid "reset HEAD and index" -msgstr "HEAD und Staging-Area umsetzen" +msgstr "HEAD und Index umsetzen" #: builtin/reset.c:279 msgid "reset only HEAD" @@ -9395,7 +9548,7 @@ msgstr "nur HEAD umsetzen" #: builtin/reset.c:281 builtin/reset.c:283 msgid "reset HEAD, index and working tree" -msgstr "HEAD, Staging-Area und Arbeitsverzeichnis umsetzen" +msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen" #: builtin/reset.c:285 msgid "reset HEAD but keep local changes" @@ -9451,11 +9604,11 @@ msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:" #: builtin/reset.c:370 #, c-format msgid "Could not reset index file to revision '%s'." -msgstr "Konnte Staging-Area-Datei nicht zu Commit '%s' setzen." +msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen." #: builtin/reset.c:374 msgid "Could not write new index file." -msgstr "Konnte neue Staging-Area-Datei nicht schreiben." +msgstr "Konnte neue Index-Datei nicht schreiben." #: builtin/rev-parse.c:361 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -9605,7 +9758,7 @@ msgstr "" "(benutzen Sie 'rm -rf' wenn Sie dieses Submodul wirklich mitsamt\n" "seiner Historie löschen möchten)" -#: builtin/rm.c:231 +#: builtin/rm.c:230 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -9620,7 +9773,7 @@ msgstr[1] "" "unterschiedlich\n" "zu der Datei und HEAD:" -#: builtin/rm.c:236 +#: builtin/rm.c:235 msgid "" "\n" "(use -f to force removal)" @@ -9628,13 +9781,13 @@ msgstr "" "\n" "(benutzen Sie -f, um die Löschung zu erzwingen)" -#: builtin/rm.c:240 +#: builtin/rm.c:239 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "die folgende Datei hat zum Commit vorgemerkte Änderungen:" msgstr[1] "die folgenden Dateien haben zum Commit vorgemerkte Änderungen:" -#: builtin/rm.c:244 builtin/rm.c:255 +#: builtin/rm.c:243 builtin/rm.c:254 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -9643,45 +9796,45 @@ msgstr "" "(benutzen Sie --cached, um die Datei zu behalten, oder -f, um die Entfernung " "zu erzwingen)" -#: builtin/rm.c:252 +#: builtin/rm.c:251 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "die folgende Datei hat lokale Änderungen:" msgstr[1] "die folgenden Dateien haben lokale Änderungen:" -#: builtin/rm.c:270 +#: builtin/rm.c:269 msgid "do not list removed files" msgstr "keine gelöschten Dateien auflisten" -#: builtin/rm.c:271 +#: builtin/rm.c:270 msgid "only remove from the index" -msgstr "nur aus der Staging-Area entfernen" +msgstr "nur aus dem Index entfernen" -#: builtin/rm.c:272 +#: builtin/rm.c:271 msgid "override the up-to-date check" msgstr "die \"up-to-date\" Prüfung überschreiben" -#: builtin/rm.c:273 +#: builtin/rm.c:272 msgid "allow recursive removal" msgstr "rekursive Entfernung erlauben" -#: builtin/rm.c:275 +#: builtin/rm.c:274 msgid "exit with a zero status even if nothing matched" msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde" -#: builtin/rm.c:318 +#: 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:336 +#: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" msgstr "'%s' wird nicht ohne -r rekursiv entfernt" -#: builtin/rm.c:375 +#: builtin/rm.c:374 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: konnte %s nicht löschen" @@ -9731,68 +9884,68 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:659 msgid "show remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches anzeigen" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:661 msgid "show remote-tracking branches" msgstr "Remote-Tracking-Branches anzeigen" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:663 msgid "color '*!+-' corresponding to the branch" msgstr "'*!+-' entsprechend des Branches einfärben" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:665 msgid "show <n> more commits after the common ancestor" msgstr "<n> weitere Commits nach dem gemeinsamen Vorgänger-Commit anzeigen" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:667 msgid "synonym to more=-1" msgstr "Synonym für more=-1" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:668 msgid "suppress naming strings" msgstr "Namen unterdrücken" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:670 msgid "include the current branch" msgstr "den aktuellen Branch einbeziehen" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:672 msgid "name commits with their object names" msgstr "Commits nach ihren Objektnamen benennen" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:674 msgid "show possible merge bases" msgstr "mögliche Merge-Basen anzeigen" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:676 msgid "show refs unreachable from any other ref" msgstr "" "Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:678 msgid "show commits in topological order" msgstr "Commits in topologischer Ordnung anzeigen" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:681 msgid "show only commits not on the first branch" msgstr "nur Commits anzeigen, die sich nicht im ersten Branch befinden" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:683 msgid "show merges reachable from only one tip" msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:685 msgid "topologically sort, maintaining date order where possible" msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich" -#: builtin/show-branch.c:681 +#: builtin/show-branch.c:688 msgid "<n>[,<base>]" msgstr "<n>[,<Basis>]" -#: builtin/show-branch.c:682 +#: builtin/show-branch.c:689 msgid "show <n> most recent ref-log entries starting at base" msgstr "die <n> jüngsten Einträge im Reflog, beginnend an der Basis, anzeigen" @@ -9808,37 +9961,37 @@ msgstr "" msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "git show-ref --exclude-existing[=Muster] < ref-list" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:170 msgid "only show tags (can be combined with heads)" msgstr "nur Tags anzeigen (kann mit \"heads\" kombiniert werden)" -#: builtin/show-ref.c:169 +#: builtin/show-ref.c:171 msgid "only show heads (can be combined with tags)" msgstr "nur Branches anzeigen (kann mit \"tags\" kombiniert werden)" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:172 msgid "stricter reference checking, requires exact ref path" msgstr "strengere Referenzprüfung, erfordert exakten Referenzpfad" -#: builtin/show-ref.c:173 builtin/show-ref.c:175 +#: builtin/show-ref.c:175 builtin/show-ref.c:177 msgid "show the HEAD reference, even if it would be filtered out" msgstr "" "die HEAD-Referenz anzeigen, selbst wenn diese ausgefiltert werden würde" -#: builtin/show-ref.c:177 +#: builtin/show-ref.c:179 msgid "dereference tags into object IDs" msgstr "Tags in Objekt-Identifikationen dereferenzieren" -#: builtin/show-ref.c:179 +#: builtin/show-ref.c:181 msgid "only show SHA1 hash using <n> digits" msgstr "nur SHA1 Hash mit <n> Ziffern anzeigen" -#: builtin/show-ref.c:183 +#: builtin/show-ref.c:185 msgid "do not print results to stdout (useful with --verify)" msgstr "" "keine Ausgabe der Ergebnisse in die Standard-Ausgabe (nützlich mit --verify)" -#: builtin/show-ref.c:185 +#: builtin/show-ref.c:187 msgid "show refs from stdin that aren't in local repository" msgstr "" "Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen " @@ -10101,129 +10254,198 @@ msgstr "Tag '%s' aktualisiert (war %s)\n" msgid "Unpacking objects" msgstr "Entpacke Objekte" -#: builtin/update-index.c:403 +#: builtin/update-index.c:70 +#, c-format +msgid "failed to create directory %s" +msgstr "Fehler beim Erstellen von Verzeichnis '%s'" + +#: builtin/update-index.c:76 +#, c-format +msgid "failed to stat %s" +msgstr "Konnte '%s' nicht lesen" + +#: builtin/update-index.c:86 +#, c-format +msgid "failed to create file %s" +msgstr "Konnte Datei '%s' nicht erstellen" + +#: builtin/update-index.c:94 +#, c-format +msgid "failed to delete file %s" +msgstr "Konnte Datei '%s' nicht löschen" + +#: builtin/update-index.c:101 builtin/update-index.c:203 +#, c-format +msgid "failed to delete directory %s" +msgstr "Konnte Verzeichnis '%s' nicht löschen" + +#: builtin/update-index.c:124 +#, c-format +msgid "Testing " +msgstr "Prüfe " + +#: builtin/update-index.c:136 +msgid "directory stat info does not change after adding a new file" +msgstr "Verzeichnisinformationen haben sich nach Hinzufügen einer neuen Datei " +"nicht geändert" + +#: builtin/update-index.c:149 +msgid "directory stat info does not change after adding a new directory" +msgstr "Verzeichnisinformationen haben sich nach Hinzufügen eines neuen " +"Verzeichnisses nicht geändert" + +#: builtin/update-index.c:162 +msgid "directory stat info changes after updating a file" +msgstr "Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert" + +#: builtin/update-index.c:173 +msgid "directory stat info changes after adding a file inside subdirectory" +msgstr "Verzeichnisinformationen haben sich nach Hinzufügen einer Datei in ein " +"Unterverzeichnis geändert" + +#: builtin/update-index.c:184 +msgid "directory stat info does not change after deleting a file" +msgstr "Verzeichnisinformationen haben sich nach dem Löschen einer Datei nicht " +"geändert" + +#: builtin/update-index.c:197 +msgid "directory stat info does not change after deleting a directory" +msgstr "Verzeichnisinformationen haben sich nach dem Löschen eines " +"Verzeichnisses nicht geändert" + +#: builtin/update-index.c:204 +msgid " OK" +msgstr " OK" + +#: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<Optionen>] [--] [<Datei>...]" -#: builtin/update-index.c:757 +#: builtin/update-index.c:918 msgid "continue refresh even when index needs update" msgstr "" -"Aktualisierung fortsetzen, auch wenn die Staging-Area aktualisiert werden " -"muss" +"Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss" -#: builtin/update-index.c:760 +#: builtin/update-index.c:921 msgid "refresh: ignore submodules" msgstr "Aktualisierung: ignoriert Submodule" -#: builtin/update-index.c:763 +#: builtin/update-index.c:924 msgid "do not ignore new files" msgstr "keine neuen Dateien ignorieren" -#: builtin/update-index.c:765 +#: builtin/update-index.c:926 msgid "let files replace directories and vice-versa" msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht" -#: builtin/update-index.c:767 +#: builtin/update-index.c:928 msgid "notice files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis beachten" -#: builtin/update-index.c:769 +#: builtin/update-index.c:930 msgid "refresh even if index contains unmerged entries" msgstr "" -"aktualisieren, auch wenn die Staging-Area nicht zusammengeführte Einträge " -"beinhaltet" +"aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet" -#: builtin/update-index.c:772 +#: builtin/update-index.c:933 msgid "refresh stat information" msgstr "Dateiinformationen aktualisieren" -#: builtin/update-index.c:776 +#: builtin/update-index.c:937 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung" -#: builtin/update-index.c:780 +#: builtin/update-index.c:941 msgid "<mode>,<object>,<path>" msgstr "<Modus>,<Objekt>,<Pfad>" -#: builtin/update-index.c:781 +#: builtin/update-index.c:942 msgid "add the specified entry to the index" msgstr "den angegebenen Eintrag zum Commit vormerken" -#: builtin/update-index.c:785 +#: builtin/update-index.c:946 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:786 +#: builtin/update-index.c:947 msgid "override the executable bit of the listed files" msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben" -#: builtin/update-index.c:790 +#: builtin/update-index.c:951 msgid "mark files as \"not changing\"" msgstr "diese Datei immer als unverändert betrachten" -#: builtin/update-index.c:793 +#: builtin/update-index.c:954 msgid "clear assumed-unchanged bit" msgstr "\"assumed-unchanged\"-Bit löschen" -#: builtin/update-index.c:796 +#: builtin/update-index.c:957 msgid "mark files as \"index-only\"" msgstr "Dateien als \"index-only\" markieren" -#: builtin/update-index.c:799 +#: builtin/update-index.c:960 msgid "clear skip-worktree bit" msgstr "\"skip-worktree\"-Bit löschen" -#: builtin/update-index.c:802 +#: builtin/update-index.c:963 msgid "add to index only; do not add content to object database" msgstr "" "die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-" "Datenbank hinzugefügt" -#: builtin/update-index.c:804 +#: builtin/update-index.c:965 msgid "remove named paths even if present in worktree" msgstr "" "benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden" -#: builtin/update-index.c:806 +#: builtin/update-index.c:967 msgid "with --stdin: input lines are terminated by null bytes" msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen" -#: builtin/update-index.c:808 +#: builtin/update-index.c:969 msgid "read list of paths to be updated from standard input" msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen" -#: builtin/update-index.c:812 +#: builtin/update-index.c:973 msgid "add entries from standard input to the index" msgstr "Einträge von der Standard-Eingabe zum Commit vormerken" -#: builtin/update-index.c:816 +#: builtin/update-index.c:977 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade" -#: builtin/update-index.c:820 +#: builtin/update-index.c:981 msgid "only update entries that differ from HEAD" msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind" -#: builtin/update-index.c:824 +#: builtin/update-index.c:985 msgid "ignore files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren" -#: builtin/update-index.c:827 +#: builtin/update-index.c:988 msgid "report actions to standard output" msgstr "die Aktionen in der Standard-Ausgabe ausgeben" -#: builtin/update-index.c:829 +#: builtin/update-index.c:990 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte" -#: builtin/update-index.c:833 +#: builtin/update-index.c:994 msgid "write index in this format" -msgstr "Staging-Area-Datei in diesem Format schreiben" +msgstr "Index-Datei in diesem Format schreiben" -#: builtin/update-index.c:835 +#: builtin/update-index.c:996 msgid "enable or disable split index" -msgstr "Aktivierung oder Deaktivierung des Splittings der Staging-Area" +msgstr "Splitting des Index aktivieren oder deaktivieren" + +#: builtin/update-index.c:998 +msgid "enable/disable untracked cache" +msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren" + +#: builtin/update-index.c:1000 +msgid "enable untracked cache without testing the filesystem" +msgstr "Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren" #: builtin/update-ref.c:9 msgid "git update-ref [<options>] -d <refname> [<old-val>]" @@ -10321,130 +10543,149 @@ msgstr "" "oder 'git help <Konzept>', um mehr über ein spezifisches Kommando oder\n" "Konzept zu erfahren." -#: common-cmds.h:8 +#: common-cmds.h:10 +msgid "start a working area (see also: git help tutorial)" +msgstr "Arbeitsverzeichnis anlegen (siehe auch: git help tutorial)" + +#: common-cmds.h:11 +msgid "work on the current change (see also: git help everyday)" +msgstr "an aktuellen Änderungen arbeiten (siehe auch: git help everyday)" + +#: common-cmds.h:12 +msgid "examine the history and state (see also: git help revisions)" +msgstr "Historie und Status untersuchen (siehe auch: git help revisions)" + +#: common-cmds.h:13 +msgid "grow, mark and tweak your common history" +msgstr "Historie erweitern und bearbeiten" + +#: common-cmds.h:14 +msgid "collaborate (see also: git help workflows)" +msgstr "mit anderen zusammenarbeiten (siehe auch: git help workflows)" + +#: common-cmds.h:18 msgid "Add file contents to the index" msgstr "Dateiinhalte zum Commit vormerken" -#: common-cmds.h:9 +#: common-cmds.h:19 msgid "Find by binary search the change that introduced a bug" msgstr "" "über eine Binärsuche die Änderungen finden, die einen Fehler verursacht haben" -#: common-cmds.h:10 +#: common-cmds.h:20 msgid "List, create, or delete branches" msgstr "Branches anzeigen, erstellen oder entfernen" -#: common-cmds.h:11 +#: common-cmds.h:21 msgid "Checkout a branch or paths to the working tree" msgstr "Branches oder Pfade im Arbeitsverzeichnis auschecken" -#: common-cmds.h:12 +#: common-cmds.h:22 msgid "Clone a repository into a new directory" msgstr "ein Repository in einem neuen Verzeichnis klonen" -#: common-cmds.h:13 +#: common-cmds.h:23 msgid "Record changes to the repository" msgstr "Änderungen in das Repository eintragen" -#: common-cmds.h:14 +#: common-cmds.h:24 msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Änderungen zwischen Commits, Commit und Arbeitsverzeichnis, etc. anzeigen" -#: common-cmds.h:15 +#: common-cmds.h:25 msgid "Download objects and refs from another repository" msgstr "Objekte und Referenzen von einem anderen Repository herunterladen" -#: common-cmds.h:16 +#: common-cmds.h:26 msgid "Print lines matching a pattern" msgstr "Zeilen darstellen, die einem Muster entsprechen" -#: common-cmds.h:17 +#: common-cmds.h:27 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" "ein leeres Git-Repository erstellen oder ein bestehendes neuinitialisieren" -#: common-cmds.h:18 +#: common-cmds.h:28 msgid "Show commit logs" msgstr "Commit-Historie anzeigen" -#: common-cmds.h:19 +#: common-cmds.h:29 msgid "Join two or more development histories together" msgstr "zwei oder mehr Entwicklungszweige zusammenführen" -#: common-cmds.h:20 +#: common-cmds.h:30 msgid "Move or rename a file, a directory, or a symlink" msgstr "" "eine Datei, ein Verzeichnis, oder eine symbolische Verknüpfung verschieben " "oder umbenennen" -#: common-cmds.h:21 +#: common-cmds.h:31 msgid "Fetch from and integrate with another repository or a local branch" msgstr "" "Objekte von einem externen Repository anfordern und sie mit einem anderen " "Repository oder einem lokalen Branch zusammenführen" -#: common-cmds.h:22 +#: common-cmds.h:32 msgid "Update remote refs along with associated objects" msgstr "Remote-Referenzen mitsamt den verbundenen Objekten aktualisieren" -#: common-cmds.h:23 +#: common-cmds.h:33 msgid "Forward-port local commits to the updated upstream head" msgstr "lokale Commits auf einem aktuellerem Upstream-Branch neu aufbauen" -#: common-cmds.h:24 +#: common-cmds.h:34 msgid "Reset current HEAD to the specified state" msgstr "aktuellen HEAD zu einem spezifizierten Zustand setzen" -#: common-cmds.h:25 +#: common-cmds.h:35 msgid "Remove files from the working tree and from the index" -msgstr "Dateien im Arbeitsverzeichnis und von der Staging-Area löschen" +msgstr "Dateien im Arbeitsverzeichnis und vom Index löschen" -#: common-cmds.h:26 +#: common-cmds.h:36 msgid "Show various types of objects" msgstr "verschiedene Arten von Objekten anzeigen" -#: common-cmds.h:27 +#: common-cmds.h:37 msgid "Show the working tree status" msgstr "den Zustand des Arbeitsverzeichnisses anzeigen" -#: common-cmds.h:28 +#: common-cmds.h:38 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" "ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, löschen oder " "verifizieren." -#: parse-options.h:143 +#: parse-options.h:142 msgid "expiry-date" msgstr "Verfallsdatum" -#: parse-options.h:158 +#: parse-options.h:157 msgid "no-op (backward compatibility)" msgstr "Kein Effekt (Rückwärtskompatibilität)" -#: parse-options.h:232 +#: parse-options.h:231 msgid "be more verbose" msgstr "erweiterte Ausgaben" -#: parse-options.h:234 +#: parse-options.h:233 msgid "be more quiet" msgstr "weniger Ausgaben" -#: parse-options.h:240 +#: parse-options.h:239 msgid "use <n> digits to display SHA-1s" msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" #: rerere.h:27 msgid "update the index with reused conflict resolution if possible" msgstr "" -"Staging-Area, wenn möglich, mit wiederverwendeter Konfliktauflösung " -"aktualisieren" +"Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren" #: git-am.sh:53 msgid "You need to set your committer info first" msgstr "Sie müssen zuerst die Informationen zum Commit-Ersteller setzen." -#: git-am.sh:98 +#: git-am.sh:100 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10452,7 +10693,7 @@ msgstr "" "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n" "Keine Zurücksetzung zu ORIG_HEAD." -#: git-am.sh:108 +#: git-am.sh:110 #, sh-format msgid "" "When you have resolved this problem, run \"$cmdline --continue\".\n" @@ -10465,23 +10706,23 @@ msgstr "" "Um den ursprünglichen Branch wiederherzustellen und die Anwendung der\n" "Patches abzubrechen, führen Sie \"$cmdline --abort\" aus." -#: git-am.sh:124 +#: git-am.sh:126 msgid "Cannot fall back to three-way merge." msgstr "Kann nicht zu 3-Wege-Merge zurückfallen." -#: git-am.sh:140 +#: git-am.sh:142 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." -#: git-am.sh:142 +#: git-am.sh:144 msgid "Using index info to reconstruct a base tree..." msgstr "" "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen ..." -#: git-am.sh:157 +#: git-am.sh:159 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10489,28 +10730,28 @@ msgstr "" "Haben Sie den Patch per Hand editiert?\n" "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden." -#: git-am.sh:166 +#: git-am.sh:168 msgid "Falling back to patching base and 3-way merge..." msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..." -#: git-am.sh:182 +#: git-am.sh:185 msgid "Failed to merge in the changes." msgstr "Merge der Änderungen fehlgeschlagen." -#: git-am.sh:277 +#: git-am.sh:280 msgid "Only one StGIT patch series can be applied at once" msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden." -#: git-am.sh:364 +#: git-am.sh:367 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "Patch-Format $patch_format wird nicht unterstützt." -#: git-am.sh:366 +#: git-am.sh:369 msgid "Patch format detection failed." msgstr "Patch-Formaterkennung fehlgeschlagen." -#: git-am.sh:398 +#: git-am.sh:407 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." @@ -10518,17 +10759,17 @@ msgstr "" "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n" "entfernt. Bitte nicht mehr verwenden." -#: git-am.sh:496 +#: git-am.sh:507 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" "Vorheriges Rebase-Verzeichnis $dotest existiert noch, aber mbox gegeben." -#: git-am.sh:501 +#: git-am.sh:512 msgid "Please make up your mind. --skip or --abort?" msgstr "Bitte werden Sie sich klar. --skip oder --abort?" -#: git-am.sh:537 +#: git-am.sh:560 #, sh-format msgid "" "Stray $dotest directory found.\n" @@ -10537,16 +10778,16 @@ msgstr "" "Stray $dotest Verzeichnis gefunden.\n" "Benutzen Sie \"git am --abort\", um es zu entfernen." -#: git-am.sh:545 +#: git-am.sh:568 msgid "Resolve operation not in progress, we are not resuming." msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt." -#: git-am.sh:612 +#: git-am.sh:635 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" -msgstr "Geänderte Staging-Area: kann Patches nicht anwenden (geändert: $files)" +msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: $files)" -#: git-am.sh:722 +#: git-am.sh:747 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -10560,33 +10801,33 @@ msgstr "" "Patches\n" "abzubrechen, führen Sie \"$cmdline --abort\" aus." -#: git-am.sh:749 +#: git-am.sh:774 msgid "Patch does not have a valid e-mail address." msgstr "Patch enthält keine gültige E-Mail-Adresse." -#: git-am.sh:796 +#: git-am.sh:821 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." -#: git-am.sh:800 +#: git-am.sh:825 msgid "Commit Body is:" msgstr "Commit-Beschreibung ist:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:807 +#: git-am.sh:832 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 " -#: git-am.sh:843 +#: git-am.sh:868 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Wende an: $FIRSTLINE" -#: git-am.sh:864 +#: git-am.sh:889 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10597,24 +10838,24 @@ msgstr "" "diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n" "auslassen." -#: git-am.sh:872 +#: git-am.sh:897 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "" -"Sie haben immer noch nicht zusammengeführte Pfade in der Staging-Area.\n" +"Sie haben immer noch nicht zusammengeführte Pfade im Index.\n" "Haben Sie vergessen 'git add' zu benutzen?" -#: git-am.sh:888 +#: git-am.sh:913 msgid "No changes -- Patch already applied." msgstr "Keine Änderungen -- Patches bereits angewendet." -#: git-am.sh:898 +#: git-am.sh:923 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Anwendung des Patches fehlgeschlagen bei $msgnum $FIRSTLINE" -#: git-am.sh:901 +#: git-am.sh:926 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" @@ -10623,7 +10864,7 @@ msgstr "" "Die Kopie des fehlgeschlagenen Patches befindet sich in:\n" " $dotest/patch" -#: git-am.sh:919 +#: git-am.sh:945 msgid "applying to an empty history" msgstr "auf leere Historie anwenden" @@ -10785,7 +11026,7 @@ msgstr "" msgid "bisect run success" msgstr "'bisect run' erfolgreich ausgeführt" -#: git-pull.sh:21 +#: git-pull.sh:61 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" @@ -10796,12 +11037,12 @@ msgstr "" "'git add/rm <Datei>', um die Auflösung entsprechend zu markieren und zu\n" "committen." -#: git-pull.sh:25 +#: git-pull.sh:65 msgid "Pull is not possible because you have unmerged files." msgstr "" "\"pull\" ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: git-pull.sh:31 +#: git-pull.sh:71 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -10809,13 +11050,13 @@ msgstr "" "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie \"merge\" ausführen können." -#: git-pull.sh:245 +#: git-pull.sh:285 msgid "updating an unborn branch with changes added to the index" msgstr "" "Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit " "vorgemerkt sind" -#: git-pull.sh:269 +#: git-pull.sh:311 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -10825,11 +11066,11 @@ msgstr "" "Warnung: \"fetch\" aktualisierte die Spitze des aktuellen Branches.\n" "Warnung: Spule Ihr Arbeitsverzeichnis von Commit $orig_head vor." -#: git-pull.sh:294 +#: git-pull.sh:336 msgid "Cannot merge multiple branches into empty head" msgstr "Kann nicht mehrere Branches in einen ungeborenen Branch zusammenführen" -#: git-pull.sh:298 +#: git-pull.sh:340 msgid "Cannot rebase onto multiple branches" msgstr "kann Rebase nicht auf mehrere Branches ausführen" @@ -11001,7 +11242,7 @@ msgstr "Sie haben bisher noch keinen initialen Commit" #: git-stash.sh:89 msgid "Cannot save the current index state" -msgstr "Kann den aktuellen Zustand der Staging-Area nicht speichern" +msgstr "Kann den aktuellen Zustand des Index nicht speichern" #: git-stash.sh:124 git-stash.sh:137 msgid "Cannot save the current worktree state" @@ -11013,7 +11254,7 @@ msgstr "Keine Änderungen ausgewählt" #: git-stash.sh:144 msgid "Cannot remove temporary index (can't happen)" -msgstr "Kann temporäre Staging-Area nicht löschen (kann nicht passieren)" +msgstr "Kann temporären Index nicht löschen (kann nicht passieren)" #: git-stash.sh:157 msgid "Cannot record working tree state" @@ -11034,7 +11275,7 @@ msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren." #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:238 +#: git-stash.sh:241 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -11044,85 +11285,90 @@ msgstr "" " Um eine Beschreibung anzugeben, benutzen Sie \"git stash save -- " "'$option'\"" -#: git-stash.sh:259 +#: git-stash.sh:262 msgid "No local changes to save" msgstr "Keine lokalen Änderungen zum Speichern" -#: git-stash.sh:263 +#: git-stash.sh:266 msgid "Cannot initialize stash" msgstr "Kann \"stash\" nicht initialisieren" -#: git-stash.sh:267 +#: git-stash.sh:270 msgid "Cannot save the current status" msgstr "Kann den aktuellen Status nicht speichern" -#: git-stash.sh:285 +#: git-stash.sh:288 msgid "Cannot remove worktree changes" msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen" -#: git-stash.sh:384 +#: git-stash.sh:389 +#, sh-format +msgid "unknown option: $opt" +msgstr "unbekannte Option: $opt" + +#: git-stash.sh:399 msgid "No stash found." msgstr "Kein \"stash\" gefunden." -#: git-stash.sh:391 +#: git-stash.sh:406 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Zu viele Commits angegeben: $REV" -#: git-stash.sh:397 +#: git-stash.sh:412 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference ist keine gültige Referenz" -#: git-stash.sh:425 +#: git-stash.sh:440 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' ist kein \"stash\"-artiger Commit" -#: git-stash.sh:436 +#: git-stash.sh:451 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' ist keine \"stash\"-Referenz" -#: git-stash.sh:444 +#: git-stash.sh:459 msgid "unable to refresh index" -msgstr "unfähig die Staging-Area zu aktualisieren" +msgstr "unfähig den Index zu aktualisieren" -#: git-stash.sh:448 +#: git-stash.sh:463 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kann \"stash\" nicht anwenden, solang ein Merge im Gange ist" -#: git-stash.sh:456 +#: git-stash.sh:471 msgid "Conflicts in index. Try without --index." -msgstr "Konflikte in der Staging-Area. Versuchen Sie es ohne --index." +msgstr "Konflikte im Index. Versuchen Sie es ohne --index." -#: git-stash.sh:458 +#: git-stash.sh:473 msgid "Could not save index tree" -msgstr "Konnte Staging-Area-Verzeichnis nicht speichern" +msgstr "Konnte Index-Verzeichnis nicht speichern" -#: git-stash.sh:492 +#: git-stash.sh:507 msgid "Cannot unstage modified files" -msgstr "Kann geänderte Dateien nicht aus der Staging-Area entfernen" +msgstr "Kann geänderte Dateien nicht aus dem Index entfernen" -#: git-stash.sh:507 +#: git-stash.sh:522 msgid "Index was not unstashed." -msgstr "Staging-Area wurde nicht aus dem Stash zurückgeladen." +msgstr "Index wurde nicht aus dem Stash zurückgeladen." -#: git-stash.sh:530 +#: git-stash.sh:545 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Gelöscht ${REV} ($s)" -#: git-stash.sh:531 +#: git-stash.sh:546 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen" -#: git-stash.sh:539 +#: git-stash.sh:554 msgid "No branch name specified" msgstr "Kein Branchname spezifiziert" -#: git-stash.sh:611 +#: git-stash.sh:626 msgid "(To restore them type \"git stash apply\")" msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)" @@ -11176,7 +11422,7 @@ msgstr "" #: git-submodule.sh:455 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" -msgstr "Füge existierendes Repository in '$sm_path' der Staging-Area hinzu." +msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu." #: git-submodule.sh:457 #, sh-format @@ -11438,6 +11684,18 @@ msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'" msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisiere Submodul-URL für '$displaypath'" +#~ msgid "The most commonly used git commands are:" +#~ msgstr "Die allgemein verwendeten Git-Kommandos sind:" + +#~ msgid "No such branch: '%s'" +#~ msgstr "Kein solcher Branch '%s'" + +#~ msgid "Could not create git link %s" +#~ msgstr "Konnte git-Verweis %s nicht erstellen" + +#~ msgid "Invalid gc.pruneexpire: '%s'" +#~ msgstr "Ungültiges Wert für \"gc.pruneexpire\": '%s'" + #~ msgid "server does not support --atomic push" #~ msgstr "" #~ "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")" @@ -11487,9 +11745,6 @@ msgstr "Synchronisiere Submodul-URL für '$displaypath'" #~ msgid "cannot update HEAD ref" #~ msgstr "Kann Referenz von HEAD nicht aktualisieren." -#~ msgid "Invalid %s: '%s'" -#~ msgstr "Ungültiger %s: '%s'" - #~ msgid "cannot tell cwd" #~ msgstr "kann aktuelles Arbeitsverzeichnis nicht ermitteln" @@ -1,5 +1,5 @@ # French translations for Git. -# Copyright (C) 2013 Jean-Noël Avila <jn.avila@free.fr> +# Copyright (C) 2015 Jean-Noël Avila <jn.avila@free.fr> # This file is distributed under the same license as the Git package. # Jean-Noël Avila <jn.avila@free.fr>, 2013. # Sébastien Helleu <flashcode@flashtux.org>, 2013. @@ -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: 2015-04-03 08:13+0800\n" -"PO-Revision-Date: 2015-04-04 18:03+0200\n" +"POT-Creation-Date: 2015-06-27 19:17+0800\n" +"PO-Revision-Date: 2015-06-30 21:30+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" @@ -93,9 +93,8 @@ msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "" -"Corrigez-les dans la copie de travail,\n" -"puis utilisez 'git add/rm <fichier>' si\n" -"nécessaire pour marquer la résolution et valider." +"Corrigez-les puis lancez 'git add/rm <fichier>'\n" +"si nécessaire pour marquer la résolution et valider." #: archive.c:11 msgid "git archive [<options>] <tree-ish> [<path>...]" @@ -116,7 +115,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" @@ -139,9 +138,9 @@ msgstr "préfixer chaque chemin de fichier dans l'archive" #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150 msgid "file" msgstr "fichier" @@ -173,7 +172,7 @@ msgstr "compression efficace" msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77 msgid "repo" msgstr "dépôt" @@ -189,7 +188,7 @@ msgstr "commande" msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" -#: attr.c:264 +#: attr.c:265 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -335,8 +334,8 @@ msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 -#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 +#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330 +#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" @@ -586,16 +585,16 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:2956 +#: diff.c:2997 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:3351 +#: diff.c:3393 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:3514 +#: diff.c:3556 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -604,11 +603,19 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:3528 +#: diff.c:3570 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" +#: dir.c:1852 +msgid "failed to get kernel name and information" +msgstr "echec de l'obtention d'information de kernel" + +#: dir.c:1945 +msgid "Untracked cache is disabled on this system." +msgstr "Le cache non suivi est désactivé sur ce système." + #: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "impossible de lancer gpg." @@ -655,11 +662,11 @@ msgstr "commandes git disponibles dans '%s'" msgid "git commands available from elsewhere on your $PATH" msgstr "commandes git disponibles depuis un autre endroit de votre $PATH" -#: help.c:230 -msgid "The most commonly used git commands are:" -msgstr "Les commandes git les plus utilisées sont :" +#: help.c:246 +msgid "These are common Git commands used in various situations:" +msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :" -#: help.c:289 +#: help.c:311 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -668,11 +675,11 @@ msgstr "" "'%s' semble être une commande git, mais elle n'a pas pu\n" "être exécutée. Peut-être git-%s est-elle cassée ?" -#: help.c:346 +#: help.c:368 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ahem. Votre système n'indique aucune commande Git." -#: help.c:368 +#: help.c:390 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -682,17 +689,17 @@ msgstr "" "pas.\n" "Continuons en supposant que vous avez voulu dire '%s'" -#: help.c:373 +#: help.c:395 #, c-format msgid "in %0.1f seconds automatically..." msgstr "dans %0.1f secondes automatiquement..." -#: help.c:380 +#: help.c:402 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'." -#: help.c:384 help.c:444 +#: help.c:406 help.c:466 msgid "" "\n" "Did you mean this?" @@ -706,16 +713,16 @@ msgstr[1] "" "\n" "Vouliez-vous dire un de ceux-là ?" -#: help.c:440 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: lockfile.c:283 +#: lockfile.c:345 msgid "BUG: reopen a lockfile that is still open" msgstr "BUG: réouverture d'un fichier verrou déjà ouvert" -#: lockfile.c:285 +#: lockfile.c:347 msgid "BUG: reopen a lockfile that has been committed" msgstr "BUG: réouverture d'un fichier verrou validé" @@ -723,8 +730,8 @@ msgstr "BUG: réouverture d'un fichier verrou validé" msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580 -#: builtin/clone.c:662 +#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594 +#: builtin/clone.c:654 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" @@ -742,64 +749,64 @@ msgstr "échec de addinfo_cache pour le chemin '%s'" msgid "error building trees" msgstr "erreur de construction des arbres" -#: merge-recursive.c:688 +#: merge-recursive.c:687 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:699 +#: merge-recursive.c:698 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n" -#: merge-recursive.c:713 merge-recursive.c:734 +#: merge-recursive.c:712 merge-recursive.c:733 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:724 +#: merge-recursive.c:723 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:764 +#: merge-recursive.c:763 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:766 +#: merge-recursive.c:765 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:789 builtin/clone.c:321 +#: merge-recursive.c:788 builtin/clone.c:313 #, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" -#: merge-recursive.c:797 +#: merge-recursive.c:796 #, c-format msgid "failed to symlink '%s'" msgstr "échec à la création du lien symbolique '%s'" -#: merge-recursive.c:800 +#: merge-recursive.c:799 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:938 +#: merge-recursive.c:937 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-recursive.c:942 +#: merge-recursive.c:941 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-recursive.c:958 +#: merge-recursive.c:957 msgid "unsupported object type in the tree" msgstr "type d'objet non supporté dans l'arbre" -#: merge-recursive.c:1033 merge-recursive.c:1047 +#: merge-recursive.c:1032 merge-recursive.c:1046 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -808,7 +815,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre." -#: merge-recursive.c:1039 merge-recursive.c:1052 +#: merge-recursive.c:1038 merge-recursive.c:1051 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -817,20 +824,20 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1149 +#: merge-recursive.c:1148 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s est un répertoire dans %s ajouté plutôt comme %s" -#: merge-recursive.c:1171 +#: merge-recursive.c:1170 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -839,146 +846,146 @@ msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1176 +#: merge-recursive.c:1175 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1230 +#: merge-recursive.c:1229 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-" ">'%s' dans %s" -#: merge-recursive.c:1260 +#: merge-recursive.c:1259 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Renommage de %s en %s et de %s en %s à la place" -#: merge-recursive.c:1459 +#: merge-recursive.c:1458 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s" -#: merge-recursive.c:1469 +#: merge-recursive.c:1468 #, c-format msgid "Adding merged %s" msgstr "Ajout de %s fusionné" -#: merge-recursive.c:1474 merge-recursive.c:1672 +#: merge-recursive.c:1473 merge-recursive.c:1671 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:1525 +#: merge-recursive.c:1524 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-recursive.c:1528 +#: merge-recursive.c:1527 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modify" msgstr "modification" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modified" msgstr "modifié" -#: merge-recursive.c:1586 +#: merge-recursive.c:1585 msgid "content" msgstr "contenu" -#: merge-recursive.c:1593 +#: merge-recursive.c:1592 msgid "add/add" msgstr "ajout/ajout" -#: merge-recursive.c:1627 +#: merge-recursive.c:1626 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:1641 +#: merge-recursive.c:1640 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1645 git-submodule.sh:1150 +#: merge-recursive.c:1644 git-submodule.sh:1150 msgid "submodule" msgstr "sous-module" -#: merge-recursive.c:1646 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-recursive.c:1732 +#: merge-recursive.c:1731 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:1757 +#: merge-recursive.c:1756 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:1763 +#: merge-recursive.c:1762 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:1768 +#: merge-recursive.c:1767 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s" -#: merge-recursive.c:1778 +#: merge-recursive.c:1777 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:1795 +#: merge-recursive.c:1794 msgid "Fatal merge failure, shouldn't happen." msgstr "Échec fatal de fusion, qui ne devrait jamais arriver." -#: merge-recursive.c:1814 +#: merge-recursive.c:1813 msgid "Already up-to-date!" msgstr "Déjà à jour !" -#: merge-recursive.c:1823 +#: merge-recursive.c:1822 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:1853 +#: merge-recursive.c:1852 #, c-format msgid "Unprocessed path??? %s" msgstr "Chemin non traité ??? %s" -#: merge-recursive.c:1901 +#: merge-recursive.c:1900 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:1914 +#: merge-recursive.c:1913 #, 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:1951 +#: merge-recursive.c:1950 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:2008 +#: merge-recursive.c:2007 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:2019 builtin/merge.c:667 +#: merge-recursive.c:2018 builtin/merge.c:645 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -1003,7 +1010,7 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Mauvaise valeur de %s : '%s'" -#: object.c:241 +#: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" @@ -1105,11 +1112,11 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: progress.c:225 +#: progress.c:236 msgid "done" msgstr "fait" -#: read-cache.c:1275 +#: read-cache.c:1295 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1118,7 +1125,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1285 +#: read-cache.c:1305 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1127,51 +1134,93 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: remote.c:782 +#: remote.c:792 #, 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:786 +#: remote.c:796 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:790 +#: remote.c:800 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#: remote.c:798 +#: remote.c:808 msgid "Internal error" msgstr "Erreur interne" -#: remote.c:1980 +#: remote.c:1723 remote.c:1766 +msgid "HEAD does not point to a branch" +msgstr "HEAD ne pointe pas sur une branche" + +#: remote.c:1732 +#, c-format +msgid "no such branch: '%s'" +msgstr "pas de branche '%s'" + +#: remote.c:1735 +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "aucune branche amont configurée pour la branche '%s'" + +#: remote.c:1741 +#, 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:1756 +#, 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:1771 +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "la branche '%s' n'a aucune branche distante de poussée" + +#: remote.c:1782 +#, 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:1795 +msgid "push has no destination (push.default is 'nothing')" +msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')" + +#: remote.c:1817 +msgid "cannot resolve 'simple' push to a single destination" +msgstr "impossible de résoudre une poussée 'simple' pour une destination unique" + +#: remote.c:2124 #, 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:1984 +#: remote.c:2128 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:1987 +#: remote.c:2131 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:1991 +#: remote.c:2135 #, 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:1997 +#: remote.c:2141 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2000 +#: remote.c:2144 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1183,11 +1232,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:2008 +#: remote.c:2152 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:2011 +#: remote.c:2155 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1202,12 +1251,12 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:2021 +#: remote.c:2165 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:2348 +#: revision.c:2366 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" @@ -1224,22 +1273,22 @@ msgstr "échec de dup2(%d,%d)" msgid "failed to sign the push certificate" msgstr "impossible de signer le certificat de poussée" -#: send-pack.c:356 +#: send-pack.c:378 msgid "the receiving end does not support --signed push" msgstr "Le receveur ne gère pas les poussées avec --signed" -#: send-pack.c:366 +#: send-pack.c:389 msgid "the receiving end does not support --atomic push" msgstr "Le receveur ne gère pas les poussées avec --atomic" -#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 -#: builtin/merge.c:1005 +#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" msgstr "Impossible d'ouvrir '%s' en écriture" -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 -#: builtin/merge.c:1010 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 +#: builtin/merge.c:988 #, c-format msgid "Could not write to '%s'" msgstr "Impossible d'écrire dans '%s'" @@ -1439,7 +1488,7 @@ 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:908 builtin/apply.c:4288 +#: sequencer.c:908 builtin/apply.c:4291 #, c-format msgid "cannot open %s: %s" msgstr "impossible d'ouvrir %s : %s" @@ -1481,7 +1530,12 @@ msgstr "Impossible d'annuler en tant que commit initial" msgid "Can't cherry-pick into empty head" msgstr "Impossible de picorer vers une HEAD vide" -#: sha1_name.c:440 +#: setup.c:243 +#, c-format +msgid "failed to read %s" +msgstr "échec de la lecture de %s" + +#: sha1_name.c:453 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" @@ -1506,25 +1560,6 @@ msgstr "" "message\n" "en lançant \"git config advice.objectNameWarning false\"" -#: sha1_name.c:1068 -msgid "HEAD does not point to a branch" -msgstr "HEAD ne pointe pas sur une branche" - -#: sha1_name.c:1071 -#, c-format -msgid "No such branch: '%s'" -msgstr "Branche inconnue : '%s'" - -#: sha1_name.c:1073 -#, c-format -msgid "No upstream configured for branch '%s'" -msgstr "Aucune branche amont configurée pour la branche '%s'" - -#: sha1_name.c:1077 -#, 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" - #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -1551,12 +1586,7 @@ msgstr "Impossible de supprimer l'élément de .gitmodules pour %s" msgid "staging updated .gitmodules failed" msgstr "échec de la mise en index du .gitmodules mis à jour" -#: submodule.c:1109 builtin/init-db.c:371 -#, c-format -msgid "Could not create git link %s" -msgstr "Impossible de créer le lien git %s" - -#: submodule.c:1120 +#: submodule.c:1115 #, c-format msgid "Could not set core.worktree in %s" msgstr "Impossible de paramétrer core.worktree dans %s" @@ -1586,7 +1616,7 @@ msgstr "impossible de lire le fichier d'entrée '%s'" msgid "could not read from stdin" msgstr "Impossible de lire depuis l'entrée standard" -#: unpack-trees.c:202 +#: unpack-trees.c:203 msgid "Checking out files" msgstr "Extraction des fichiers" @@ -1644,6 +1674,21 @@ msgstr "utilisateur inconnu" msgid "unable to get current working directory" msgstr "impossible d'accéder au répertoire de travail courant" +#: wrapper.c:575 +#, c-format +msgid "could not open %s for writing" +msgstr "Impossible d'ouvrir '%s' en écriture" + +#: wrapper.c:587 +#, c-format +msgid "could not write to %s" +msgstr "Impossible d'écrire dans %s" + +#: wrapper.c:593 +#, c-format +msgid "could not close %s" +msgstr "impossible de fermer %s" + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Chemins non fusionnés :" @@ -1671,11 +1716,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:198 wt-status.c:878 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:216 wt-status.c:887 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" @@ -1790,15 +1835,15 @@ msgstr "contenu non suivi, " msgid "bug: unhandled diff status %c" msgstr "bogue : état de diff non géré %c" -#: wt-status.c:753 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:755 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:835 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1806,68 +1851,68 @@ msgstr "" "Ne touchez pas à la ligne ci-dessus\n" "Tout se qui suit sera éliminé." -#: wt-status.c:946 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:949 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:952 +#: wt-status.c:955 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:955 +#: wt-status.c:958 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:965 +#: wt-status.c:968 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:968 +#: wt-status.c:971 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:972 +#: wt-status.c:975 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:974 +#: wt-status.c:977 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:976 +#: wt-status.c:979 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1036 wt-status.c:1053 +#: wt-status.c:1039 wt-status.c:1056 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:1041 wt-status.c:1058 +#: wt-status.c:1044 wt-status.c:1061 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1044 +#: wt-status.c:1047 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1046 +#: wt-status.c:1049 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1048 +#: wt-status.c:1051 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" -#: wt-status.c:1061 +#: wt-status.c:1064 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1065 +#: wt-status.c:1068 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1875,120 +1920,120 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1070 +#: wt-status.c:1073 msgid "You are currently splitting a commit during a rebase." msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:1073 +#: wt-status.c:1076 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" -#: wt-status.c:1077 +#: wt-status.c:1080 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la " "branche '%s' sur '%s'." -#: wt-status.c:1082 +#: wt-status.c:1085 msgid "You are currently editing a commit during a rebase." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." -#: wt-status.c:1085 +#: wt-status.c:1088 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1087 +#: wt-status.c:1090 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos " "modifications)" -#: wt-status.c:1097 +#: wt-status.c:1100 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1102 +#: wt-status.c:1105 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1105 +#: wt-status.c:1108 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" -#: wt-status.c:1107 +#: wt-status.c:1110 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" -#: wt-status.c:1116 +#: wt-status.c:1119 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1121 +#: wt-status.c:1124 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1124 +#: wt-status.c:1127 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1126 +#: wt-status.c:1129 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1137 +#: wt-status.c:1140 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1141 +#: wt-status.c:1144 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1144 +#: wt-status.c:1147 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:1321 +#: wt-status.c:1324 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1328 +#: wt-status.c:1331 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1333 +#: wt-status.c:1336 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1335 +#: wt-status.c:1338 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1338 +#: wt-status.c:1341 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1355 +#: wt-status.c:1358 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1369 +#: wt-status.c:1372 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1371 +#: wt-status.c:1374 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1375 +#: wt-status.c:1378 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2000,32 +2045,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1381 +#: wt-status.c:1384 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1383 +#: wt-status.c:1386 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1389 +#: wt-status.c:1392 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1394 +#: wt-status.c:1397 #, 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:1397 +#: wt-status.c:1400 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1400 +#: wt-status.c:1403 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2034,53 +2079,53 @@ 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:1403 +#: wt-status.c:1406 #, 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:1406 +#: wt-status.c:1409 #, 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:1409 wt-status.c:1414 +#: wt-status.c:1412 wt-status.c:1417 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1412 +#: wt-status.c:1415 #, 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:1416 +#: wt-status.c:1419 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1525 +#: wt-status.c:1528 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1531 +#: wt-status.c:1534 msgid "Initial commit on " msgstr "Validation initiale sur " # à priori on parle d'une branche ici -#: wt-status.c:1563 +#: wt-status.c:1561 msgid "gone" msgstr "disparue" -#: wt-status.c:1565 wt-status.c:1573 +#: wt-status.c:1563 wt-status.c:1571 msgid "behind " msgstr "derrière " -#: compat/precompose_utf8.c:55 builtin/clone.c:360 +#: compat/precompose_utf8.c:55 builtin/clone.c:352 #, c-format msgid "failed to unlink '%s'" msgstr "échec lors de l'unlink de '%s'" @@ -2107,7 +2152,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:785 +#: builtin/add.c:194 builtin/rev-parse.c:796 msgid "Could not read the index" msgstr "Impossible de lire l'index" @@ -2120,118 +2165,122 @@ msgstr "Impossible d'ouvrir '%s' en écriture." msgid "Could not write patch" msgstr "Impossible d'écrire le patch" -#: builtin/add.c:214 +#: builtin/add.c:212 +msgid "editing patch failed" +msgstr "échec de l'édition du patch" + +#: builtin/add.c:215 #, c-format msgid "Could not stat '%s'" msgstr "Stat de '%s' impossible" -#: builtin/add.c:216 +#: builtin/add.c:217 msgid "Empty patch. Aborted." msgstr "Patch vide. Abandon." -#: builtin/add.c:221 +#: builtin/add.c:222 #, c-format msgid "Could not apply '%s'" msgstr "Impossible d'appliquer '%s'" -#: builtin/add.c:231 +#: builtin/add.c:232 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 -#: builtin/rm.c:269 +#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369 +#: builtin/rm.c:268 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "mode verbeux" -#: builtin/add.c:251 +#: builtin/add.c:252 msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286 msgid "select hunks interactively" msgstr "sélection interactive des sections" -#: builtin/add.c:253 +#: builtin/add.c:254 msgid "edit current diff and apply" msgstr "édition du diff actuel et application" -#: builtin/add.c:254 +#: builtin/add.c:255 msgid "allow adding otherwise ignored files" msgstr "permettre l'ajout de fichiers ignorés" -#: builtin/add.c:255 +#: builtin/add.c:256 msgid "update tracked files" msgstr "mettre à jour les fichiers suivis" -#: builtin/add.c:256 +#: builtin/add.c:257 msgid "record only the fact that the path will be added later" msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard" -#: builtin/add.c:257 +#: builtin/add.c:258 msgid "add changes from all tracked and untracked files" msgstr "ajouter les modifications de tous les fichiers suivis et non suivis" -#: builtin/add.c:260 +#: builtin/add.c:261 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignorer les chemins effacés dans la copie de travail (identique à --no-all)" -#: builtin/add.c:262 +#: builtin/add.c:263 msgid "don't add, only refresh the index" msgstr "ne pas ajouter, juste rafraîchir l'index" -#: builtin/add.c:263 +#: builtin/add.c:264 msgid "just skip files which cannot be added because of errors" msgstr "" "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait " "d'erreurs" -#: builtin/add.c:264 +#: builtin/add.c:265 msgid "check if - even missing - files are ignored in dry run" msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide" -#: builtin/add.c:286 +#: builtin/add.c:287 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Utilisez -f si vous voulez réellement les ajouter.\n" -#: builtin/add.c:293 +#: builtin/add.c:294 msgid "adding files failed" msgstr "échec de l'ajout de fichiers" -#: builtin/add.c:329 +#: builtin/add.c:330 msgid "-A and -u are mutually incompatible" msgstr "-A et -u sont mutuellement incompatibles" -#: builtin/add.c:336 +#: builtin/add.c:337 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run" -#: builtin/add.c:357 +#: builtin/add.c:358 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Rien de spécifié, rien n'a été ajouté.\n" -#: builtin/add.c:358 +#: builtin/add.c:359 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" @@ -2316,77 +2365,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:1656 +#: builtin/apply.c:1659 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: builtin/apply.c:1658 +#: builtin/apply.c:1661 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: builtin/apply.c:1684 +#: builtin/apply.c:1687 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: builtin/apply.c:1720 +#: builtin/apply.c:1723 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: builtin/apply.c:1722 +#: builtin/apply.c:1725 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: builtin/apply.c:1725 +#: builtin/apply.c:1728 #, 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:1871 +#: builtin/apply.c:1874 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: builtin/apply.c:1900 +#: builtin/apply.c:1903 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: builtin/apply.c:2051 +#: builtin/apply.c:2054 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: builtin/apply.c:2141 +#: builtin/apply.c:2144 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: builtin/apply.c:2145 +#: builtin/apply.c:2148 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: builtin/apply.c:2778 +#: builtin/apply.c:2781 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: builtin/apply.c:2897 +#: builtin/apply.c:2900 #, 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:2909 +#: builtin/apply.c:2912 #, 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:2915 +#: builtin/apply.c:2918 #, c-format msgid "" "while searching for:\n" @@ -2395,347 +2444,347 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: builtin/apply.c:2935 +#: builtin/apply.c:2938 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: builtin/apply.c:3036 +#: builtin/apply.c:3039 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: builtin/apply.c:3042 +#: builtin/apply.c:3045 #, 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:3063 +#: builtin/apply.c:3066 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: builtin/apply.c:3187 +#: builtin/apply.c:3190 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 +#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291 #, c-format msgid "read of %s failed" msgstr "échec de la lecture de %s" -#: builtin/apply.c:3240 +#: builtin/apply.c:3243 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" -#: builtin/apply.c:3268 builtin/apply.c:3490 +#: builtin/apply.c:3271 builtin/apply.c:3493 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: builtin/apply.c:3349 builtin/apply.c:3504 +#: builtin/apply.c:3352 builtin/apply.c:3507 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 +#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521 #, c-format msgid "%s: %s" msgstr "%s : %s" -#: builtin/apply.c:3358 builtin/apply.c:3512 +#: builtin/apply.c:3361 builtin/apply.c:3515 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: builtin/apply.c:3460 +#: builtin/apply.c:3463 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: builtin/apply.c:3529 +#: builtin/apply.c:3532 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: builtin/apply.c:3531 +#: builtin/apply.c:3534 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: builtin/apply.c:3690 builtin/apply.c:3692 +#: builtin/apply.c:3693 builtin/apply.c:3695 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: builtin/apply.c:3747 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: builtin/apply.c:3750 +#: builtin/apply.c:3753 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: builtin/apply.c:3770 +#: builtin/apply.c:3773 #, 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:3775 +#: builtin/apply.c:3778 #, 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:3795 +#: builtin/apply.c:3798 #, 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:3799 +#: builtin/apply.c:3802 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: builtin/apply.c:3813 +#: builtin/apply.c:3816 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3909 builtin/checkout.c:237 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:4049 +#: builtin/apply.c:4052 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: builtin/apply.c:4078 +#: builtin/apply.c:4081 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: builtin/apply.c:4082 +#: builtin/apply.c:4085 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: builtin/apply.c:4087 +#: builtin/apply.c:4090 #, 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:4090 builtin/apply.c:4198 +#: builtin/apply.c:4093 builtin/apply.c:4201 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: builtin/apply.c:4123 +#: builtin/apply.c:4126 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: builtin/apply.c:4172 +#: builtin/apply.c:4175 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: builtin/apply.c:4259 +#: builtin/apply.c:4262 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: builtin/apply.c:4267 +#: builtin/apply.c:4270 msgid "internal error" msgstr "erreur interne" -#: builtin/apply.c:4270 +#: builtin/apply.c:4273 #, 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:4280 +#: builtin/apply.c:4283 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: builtin/apply.c:4301 +#: builtin/apply.c:4304 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: builtin/apply.c:4304 +#: builtin/apply.c:4307 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: builtin/apply.c:4394 +#: builtin/apply.c:4397 msgid "unrecognized input" msgstr "entrée non reconnue" -#: builtin/apply.c:4405 +#: builtin/apply.c:4408 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85 #: builtin/fetch.c:92 msgid "path" msgstr "chemin" -#: builtin/apply.c:4523 +#: builtin/apply.c:4526 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4526 +#: builtin/apply.c:4529 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4528 +#: builtin/apply.c:4531 msgid "num" msgstr "num" -#: builtin/apply.c:4529 +#: builtin/apply.c:4532 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: builtin/apply.c:4532 +#: builtin/apply.c:4535 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: builtin/apply.c:4534 +#: builtin/apply.c:4537 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:4538 +#: builtin/apply.c:4541 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:4540 +#: builtin/apply.c:4543 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:4542 +#: builtin/apply.c:4545 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:4544 +#: builtin/apply.c:4547 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:4546 +#: builtin/apply.c:4549 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: builtin/apply.c:4548 +#: builtin/apply.c:4551 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:4550 +#: builtin/apply.c:4553 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" -#: builtin/apply.c:4552 +#: builtin/apply.c:4555 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:4554 +#: builtin/apply.c:4557 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:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 +#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: builtin/apply.c:4559 +#: builtin/apply.c:4562 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: builtin/apply.c:4560 +#: builtin/apply.c:4563 msgid "action" msgstr "action" -#: builtin/apply.c:4561 +#: builtin/apply.c:4564 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:4564 builtin/apply.c:4567 +#: builtin/apply.c:4567 builtin/apply.c:4570 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: builtin/apply.c:4570 +#: builtin/apply.c:4573 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: builtin/apply.c:4572 +#: builtin/apply.c:4575 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: builtin/apply.c:4574 +#: builtin/apply.c:4577 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: builtin/apply.c:4576 +#: builtin/apply.c:4579 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: builtin/apply.c:4579 +#: builtin/apply.c:4582 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:4582 +#: builtin/apply.c:4585 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:4584 +#: builtin/apply.c:4587 msgid "root" msgstr "racine" -#: builtin/apply.c:4585 +#: builtin/apply.c:4588 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" -#: builtin/apply.c:4607 +#: builtin/apply.c:4610 msgid "--3way outside a repository" msgstr "--3way hors d'un dépôt" -#: builtin/apply.c:4615 +#: builtin/apply.c:4618 msgid "--index outside a repository" msgstr "--index hors d'un dépôt" -#: builtin/apply.c:4618 +#: builtin/apply.c:4621 msgid "--cached outside a repository" msgstr "--cached hors d'un dépôt" -#: builtin/apply.c:4637 +#: builtin/apply.c:4640 #, c-format msgid "can't open patch '%s'" msgstr "ouverture impossible du patch '%s'" -#: builtin/apply.c:4651 +#: builtin/apply.c:4654 #, 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:4657 builtin/apply.c:4667 +#: builtin/apply.c:4660 builtin/apply.c:4670 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2789,11 +2838,11 @@ msgstr "effectuer 'git bisect next'" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel" -#: builtin/blame.c:30 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" -msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] fichier" +#: builtin/blame.c:31 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>" -#: builtin/blame.c:35 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<options-de-révision> sont documentés dans git-rev-list(1)" @@ -2922,7 +2971,7 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>" -#: builtin/branch.c:152 +#: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2931,7 +2980,7 @@ msgstr "" "suppression de la branche '%s' qui a été fusionnée dans\n" " '%s', mais pas dans HEAD." -#: builtin/branch.c:156 +#: builtin/branch.c:154 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2940,12 +2989,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:170 +#: builtin/branch.c:168 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Impossible de rechercher l'objet commit pour '%s'" -#: builtin/branch.c:174 +#: builtin/branch.c:172 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2954,309 +3003,309 @@ 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:187 +#: builtin/branch.c:185 msgid "Update of config-file failed" msgstr "Échec de la mise à jour du fichier de configuration" -#: builtin/branch.c:215 +#: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "impossible d'utiliser -a avec -d" -#: builtin/branch.c:221 +#: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "Impossible de rechercher l'objet commit pour HEAD" -#: builtin/branch.c:229 +#: builtin/branch.c:227 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "Impossible de supprimer la branche '%s' sur laquelle vous êtes." -#: builtin/branch.c:245 +#: builtin/branch.c:243 #, c-format -msgid "remote branch '%s' not found." -msgstr "branche distante %s' non trouvée." +msgid "remote-tracking branch '%s' not found." +msgstr "branche de suivi '%s' non trouvée." -#: builtin/branch.c:246 +#: builtin/branch.c:244 #, c-format msgid "branch '%s' not found." msgstr "branche '%s' non trouvée." -#: builtin/branch.c:260 +#: builtin/branch.c:258 #, c-format -msgid "Error deleting remote branch '%s'" -msgstr "Erreur lors de la suppression de la branche distante '%s'" +msgid "Error deleting remote-tracking branch '%s'" +msgstr "Erreur lors de la suppression de la branche de suivi '%s'" -#: builtin/branch.c:261 +#: builtin/branch.c:259 #, c-format msgid "Error deleting branch '%s'" msgstr "Erreur lors de la suppression de la branche '%s'" -#: builtin/branch.c:268 +#: builtin/branch.c:266 #, c-format -msgid "Deleted remote branch %s (was %s).\n" -msgstr "Branche distante %s supprimée (précédemment %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" +msgstr "Branche de suivi %s supprimée (précédemment %s).\n" -#: builtin/branch.c:269 +#: builtin/branch.c:267 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branche %s supprimée (précédemment %s).\n" -#: builtin/branch.c:370 +#: builtin/branch.c:368 #, c-format msgid "branch '%s' does not point at a commit" msgstr "la branche '%s' ne pointe pas sur un commit" # féminin pour une branche -#: builtin/branch.c:459 +#: builtin/branch.c:451 #, c-format msgid "[%s: gone]" msgstr "[%s: disparue]" -#: builtin/branch.c:464 +#: builtin/branch.c:456 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:469 +#: builtin/branch.c:461 #, c-format msgid "[%s: behind %d]" msgstr "[%s: en retard de %d]" -#: builtin/branch.c:471 +#: builtin/branch.c:463 #, c-format msgid "[behind %d]" msgstr "[en retard de %d]" -#: builtin/branch.c:475 +#: builtin/branch.c:467 #, c-format msgid "[%s: ahead %d]" msgstr "[%s : en avance de %d]" -#: builtin/branch.c:477 +#: builtin/branch.c:469 #, c-format msgid "[ahead %d]" msgstr "[en avance de %d]" -#: builtin/branch.c:480 +#: builtin/branch.c:472 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s : en avance de %d, en retard de %d]" -#: builtin/branch.c:483 +#: builtin/branch.c:475 #, c-format msgid "[ahead %d, behind %d]" msgstr "[en avance de %d, en retard de %d]" -#: builtin/branch.c:496 +#: builtin/branch.c:488 msgid " **** invalid ref ****" msgstr " **** référence invalide ****" -#: builtin/branch.c:587 +#: builtin/branch.c:579 #, c-format msgid "(no branch, rebasing %s)" msgstr "(aucune branche, rebasage de %s)" -#: builtin/branch.c:590 +#: builtin/branch.c:582 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a démarré sur %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:588 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD détachée sur %s)" -#: builtin/branch.c:599 +#: builtin/branch.c:591 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD détachée depuis %s)" -#: builtin/branch.c:603 +#: builtin/branch.c:595 msgid "(no branch)" msgstr "(aucune branche)" -#: builtin/branch.c:650 +#: builtin/branch.c:642 #, c-format msgid "object '%s' does not point to a commit" msgstr "l'objet '%s' ne pointe pas sur un commit" -#: builtin/branch.c:698 +#: builtin/branch.c:690 msgid "some refs could not be read" msgstr "des références n'ont pas pu être lues" -#: builtin/branch.c:711 +#: builtin/branch.c:703 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:721 +#: builtin/branch.c:713 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:736 +#: builtin/branch.c:728 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:740 +#: builtin/branch.c:732 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'un branche mal nommée '%s'" -#: builtin/branch.c:744 +#: builtin/branch.c:736 #, 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:751 +#: builtin/branch.c:743 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:766 +#: builtin/branch.c:758 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: builtin/branch.c:790 +#: builtin/branch.c:780 #, 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:820 +#: builtin/branch.c:810 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:822 +#: builtin/branch.c:812 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:823 +#: builtin/branch.c:813 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:824 +#: builtin/branch.c:814 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:826 +#: builtin/branch.c:816 msgid "change upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:830 +#: builtin/branch.c:820 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:831 +#: builtin/branch.c:821 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 -#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 -#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 +#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851 +#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "commit" -#: builtin/branch.c:835 builtin/branch.c:841 +#: builtin/branch.c:825 builtin/branch.c:831 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:847 +#: builtin/branch.c:837 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:848 +#: builtin/branch.c:838 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:850 +#: builtin/branch.c:840 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:851 +#: builtin/branch.c:841 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:852 +#: builtin/branch.c:842 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:853 +#: builtin/branch.c:843 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:854 +#: builtin/branch.c:844 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:855 +#: builtin/branch.c:845 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:857 +#: builtin/branch.c:847 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:858 +#: builtin/branch.c:848 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:861 +#: builtin/branch.c:851 msgid "print only not merged branches" msgstr "afficher seulement les branches non fusionnées" -#: builtin/branch.c:867 +#: builtin/branch.c:857 msgid "print only merged branches" msgstr "afficher seulement les branches fusionnées" -#: builtin/branch.c:871 +#: builtin/branch.c:861 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:884 +#: builtin/branch.c:874 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: builtin/branch.c:888 builtin/clone.c:637 +#: builtin/branch.c:878 builtin/clone.c:629 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:910 +#: builtin/branch.c:900 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:921 builtin/branch.c:960 +#: builtin/branch.c:911 builtin/branch.c:950 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:936 +#: builtin/branch.c:926 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:941 +#: builtin/branch.c:931 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:948 +#: builtin/branch.c:938 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:951 +#: builtin/branch.c:941 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:966 +#: builtin/branch.c:956 msgid "too many branches for a rename operation" msgstr "trop de branches pour une opération de renommage" -#: builtin/branch.c:971 +#: builtin/branch.c:961 msgid "too many branches to set new upstream" msgstr "trop de branches pour spécifier une branche amont" -#: builtin/branch.c:975 +#: builtin/branch.c:965 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3264,41 +3313,41 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 +#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:982 +#: builtin/branch.c:972 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:994 +#: builtin/branch.c:984 msgid "too many branches to unset upstream" msgstr "trop de branches pour désactiver un amont" -#: builtin/branch.c:998 +#: builtin/branch.c:988 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:1004 +#: builtin/branch.c:994 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:1018 +#: builtin/branch.c:1008 msgid "it does not make sense to create 'HEAD' manually" msgstr "créer manuellement 'HEAD' n'a pas de sens" -#: builtin/branch.c:1024 +#: builtin/branch.c:1014 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:1027 +#: builtin/branch.c:1017 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3307,7 +3356,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:1044 +#: builtin/branch.c:1034 #, c-format msgid "" "\n" @@ -3318,70 +3367,82 @@ msgstr "" "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n" "\n" -#: builtin/branch.c:1045 +#: builtin/branch.c:1035 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1046 +#: builtin/branch.c:1036 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" -#: builtin/bundle.c:47 +#: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" msgstr "%s est correct\n" -#: builtin/bundle.c:56 +#: builtin/bundle.c:64 msgid "Need a repository to create a bundle." msgstr "La création d'un colis requiert un dépôt." -#: builtin/bundle.c:60 +#: builtin/bundle.c:68 msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." -#: builtin/cat-file.c:326 -msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" -msgstr "git cat-file (-t | -s | -e | -p | <type> | --textconv) <objet>" +#: builtin/cat-file.c:369 +msgid "" +"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" +"<type>|--textconv) <object>" +msgstr "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p | <type> | --textconv) <objet>" -#: builtin/cat-file.c:327 -msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" -msgstr "git cat-file (--batch | --batch-check) < <liste-d-objets>" +#: builtin/cat-file.c:370 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-" +"objects>" +msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] < <liste-d-objets>" -#: builtin/cat-file.c:364 +#: builtin/cat-file.c:407 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:365 +#: builtin/cat-file.c:408 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:409 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:411 msgid "exit with zero when there's no error" msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:412 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:414 msgid "for blob objects, run textconv on object's content" msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:416 +msgid "allow -s and -t to work with broken/corrupt objects" +msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus" + +#: builtin/cat-file.c:418 msgid "show info and content of objects fed from the standard input" msgstr "" "afficher l'information et le contenu des objets passés en entrée standard" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:421 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" +#: builtin/cat-file.c:424 +msgid "follow in-tree symlinks (used with --batch or --batch-check)" +msgstr "suivre les liens symbolique internes à la copie de travail (utilisé avec --batch ou --batch-check)" + #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..." @@ -3399,7 +3460,7 @@ msgstr "afficher tous les attributs associés au fichier" msgid "use .gitattributes only from the index" msgstr "utiliser .gitattributes seulement depuis l'index" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96 msgid "read file names from stdin" msgstr "lire les noms de fichier depuis l'entrée standard" @@ -3408,7 +3469,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:1107 builtin/gc.c:274 +#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -3507,115 +3568,115 @@ msgstr "lors de la création de fichiers, préfixer par <chaîne>" msgid "copy out the files from named stage" msgstr "copier les fichiers depuis l'index nommé" -#: builtin/checkout.c:25 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<options>] <branche>" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<options>] [<branche>] -- <fichier>..." -#: builtin/checkout.c:132 builtin/checkout.c:165 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "le chemin '%s' n'a pas notre version" -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "le chemin '%s' n'a pas leur version" -#: builtin/checkout.c:150 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "le chemin '%s' n'a aucune des versions nécessaires" -#: builtin/checkout.c:194 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "le chemin '%s' n'a pas les versions nécessaires" -#: builtin/checkout.c:211 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "chemin '%s' : impossible de fusionner" -#: builtin/checkout.c:228 +#: builtin/checkout.c:234 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" -#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255 -#: builtin/checkout.c:258 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 builtin/checkout.c:277 #, 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:261 builtin/checkout.c:264 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:267 +#: builtin/checkout.c:273 #, 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:278 builtin/checkout.c:467 +#: builtin/checkout.c:287 builtin/checkout.c:481 msgid "corrupt index file" msgstr "fichier d'index corrompu" -#: builtin/checkout.c:338 builtin/checkout.c:345 +#: builtin/checkout.c:347 builtin/checkout.c:354 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:489 +#: builtin/checkout.c:503 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:615 +#: builtin/checkout.c:634 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Impossible de faire un reflog pour '%s'\n" -#: builtin/checkout.c:653 +#: builtin/checkout.c:670 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:660 +#: builtin/checkout.c:677 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:663 +#: builtin/checkout.c:680 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:667 +#: builtin/checkout.c:684 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:669 builtin/checkout.c:1050 +#: builtin/checkout.c:686 builtin/checkout.c:1285 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:671 +#: builtin/checkout.c:688 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:723 +#: builtin/checkout.c:740 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:729 +#: builtin/checkout.c:746 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3638,155 +3699,204 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:747 +#: builtin/checkout.c:765 #, c-format msgid "" +"If you want to keep it by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch <new-branch-name> %s\n" +"\n" +msgid_plural "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" " git branch <new-branch-name> %s\n" "\n" -msgstr "" -"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon " -"moment\n" +msgstr[0] "" +"Si vous souhaitez le garder en créant une nouvelle branche, c'est le bon moment\n" +"pour le faire avec :\n" +"\n" +"git branch <nouvelle-branche> %s\n" +"\n" +msgstr[1] "" +"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon moment\n" "pour le faire avec :\n" "\n" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:777 +#: builtin/checkout.c:801 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:781 +#: builtin/checkout.c:805 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:808 builtin/checkout.c:1045 +#: builtin/checkout.c:832 builtin/checkout.c:1280 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:952 +#: builtin/checkout.c:893 +msgid "no branch specified" +msgstr "aucune branche spécifiée" + +#: builtin/checkout.c:895 +#, c-format +msgid "'%s' already exists" +msgstr "'%s' existe déjà" + +#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842 +#: builtin/clone.c:853 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "impossible de créer les répertoires de premier niveau dans '%s'" + +#: builtin/checkout.c:924 +#, c-format +msgid "could not create directory of '%s'" +msgstr "impossible de créer le répertoire de '%s'" + +#: builtin/checkout.c:960 +#, c-format +msgid "Enter %s (identifier %s)" +msgstr "Saisir %s (identifiant %s)" + +#: builtin/checkout.c:1070 +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "'%s' est déjà extrait dans '%s'" + +#: builtin/checkout.c:1176 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:991 +#: builtin/checkout.c:1215 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1020 +#: builtin/checkout.c:1255 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1059 +#: builtin/checkout.c:1294 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1062 builtin/checkout.c:1066 +#: builtin/checkout.c:1297 builtin/checkout.c:1301 #, 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:1070 builtin/checkout.c:1073 builtin/checkout.c:1078 -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313 +#: builtin/checkout.c:1316 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1086 +#: builtin/checkout.c:1321 #, 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:1108 builtin/checkout.c:1110 builtin/clone.c:90 +#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1109 +#: builtin/checkout.c:1347 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1349 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1112 +#: builtin/checkout.c:1350 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1351 msgid "detach the HEAD at named commit" msgstr "détacher la HEAD à la validation nommée" -#: builtin/checkout.c:1114 +#: builtin/checkout.c:1352 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1355 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1119 +#: builtin/checkout.c:1357 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1121 +#: builtin/checkout.c:1359 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1360 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1123 builtin/merge.c:227 +#: builtin/checkout.c:1361 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 +#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244 msgid "style" msgstr "style" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1363 msgid "conflict style (merge or diff3)" msgstr "style de conflit (fusion ou diff3)" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1366 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:1130 +#: builtin/checkout.c:1368 msgid "second guess 'git checkout <no-such-branch>'" msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1370 +msgid "check a branch out in a separate working directory" +msgstr "extraire une branche dans un répertoire de travail séparé" + +#: builtin/checkout.c:1372 +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:1406 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1423 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1175 +#: builtin/checkout.c:1428 msgid "Missing branch name; try -b" msgstr "Nom de branche manquant ; essayez -b" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1464 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1219 +#: builtin/checkout.c:1471 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3796,12 +3906,12 @@ msgstr "" "en même temps.\n" "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?" -#: builtin/checkout.c:1224 +#: builtin/checkout.c:1476 #, 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:1228 +#: builtin/checkout.c:1480 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3872,36 +3982,36 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection" -#: builtin/clean.c:517 +#: builtin/clean.c:515 #, c-format msgid "Huh (%s)?" msgstr "Hein (%s) ?" -#: builtin/clean.c:659 +#: builtin/clean.c:657 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs à ignorer>> " -#: builtin/clean.c:696 +#: builtin/clean.c:694 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" -#: builtin/clean.c:717 +#: builtin/clean.c:715 msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:756 #, c-format msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:783 +#: builtin/clean.c:781 msgid "Bye." msgstr "Au revoir." -#: builtin/clean.c:791 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3919,62 +4029,62 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:818 +#: builtin/clean.c:816 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: builtin/clean.c:819 +#: builtin/clean.c:817 msgid "What now" msgstr "Et maintenant ?" -#: builtin/clean.c:827 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Supprimerait l'élément suivant :" msgstr[1] "Supprimerait les éléments suivants :" -#: builtin/clean.c:844 +#: builtin/clean.c:842 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:875 +#: builtin/clean.c:873 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:877 +#: builtin/clean.c:875 msgid "force" msgstr "forcer" -#: builtin/clean.c:878 +#: builtin/clean.c:876 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:880 +#: builtin/clean.c:878 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 msgid "pattern" msgstr "motif" -#: builtin/clean.c:882 +#: builtin/clean.c:880 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:883 +#: builtin/clean.c:881 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:885 +#: builtin/clean.c:883 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:903 +#: builtin/clean.c:901 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" -#: builtin/clean.c:907 +#: builtin/clean.c:905 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3982,7 +4092,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:910 +#: builtin/clean.c:908 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3994,150 +4104,150 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224 #: builtin/push.c:523 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" -#: builtin/clone.c:68 +#: builtin/clone.c:59 msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503 msgid "create a bare repository" msgstr "créer un dépôt nu" -#: builtin/clone.c:73 +#: builtin/clone.c:64 msgid "create a mirror repository (implies bare)" msgstr "créer un dépôt miroir (implique dépôt nu)" -#: builtin/clone.c:75 +#: builtin/clone.c:66 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" -#: builtin/clone.c:77 +#: builtin/clone.c:68 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, toujours copier" -#: builtin/clone.c:79 +#: builtin/clone.c:70 msgid "setup as shared repository" msgstr "régler comme dépôt partagé" -#: builtin/clone.c:81 builtin/clone.c:83 +#: builtin/clone.c:72 builtin/clone.c:74 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" -#: builtin/clone.c:84 builtin/init-db.c:493 +#: builtin/clone.c:75 builtin/init-db.c:500 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:85 builtin/init-db.c:494 +#: builtin/clone.c:76 builtin/init-db.c:501 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:87 +#: builtin/clone.c:78 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:80 +msgid "use --reference only while cloning" +msgstr "utiliser seulement --reference pour cloner" + +#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "nom" -#: builtin/clone.c:89 +#: builtin/clone.c:82 msgid "use <name> instead of 'origin' to track upstream" msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont" -#: builtin/clone.c:91 +#: builtin/clone.c:84 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" -#: builtin/clone.c:93 +#: builtin/clone.c:86 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 +#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "profondeur" -#: builtin/clone.c:95 +#: builtin/clone.c:88 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:97 +#: builtin/clone.c:90 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -#: builtin/clone.c:99 -msgid "use --reference only while cloning" -msgstr "utiliser seulement --reference pour cloner" - -#: builtin/clone.c:100 builtin/init-db.c:502 +#: builtin/clone.c:91 builtin/init-db.c:509 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:101 builtin/init-db.c:503 +#: builtin/clone.c:92 builtin/init-db.c:510 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" -#: builtin/clone.c:102 +#: builtin/clone.c:93 msgid "key=value" msgstr "clé=valeur" -#: builtin/clone.c:103 +#: builtin/clone.c:94 msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:256 +#: builtin/clone.c:247 #, 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:260 +#: builtin/clone.c:251 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: builtin/clone.c:263 +#: builtin/clone.c:254 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: builtin/clone.c:325 +#: builtin/clone.c:317 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/clone.c:327 builtin/diff.c:84 +#: builtin/clone.c:319 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: builtin/clone.c:329 +#: builtin/clone.c:321 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:343 +#: builtin/clone.c:335 #, c-format msgid "failed to stat %s\n" msgstr "échec du stat de %s\n" -#: builtin/clone.c:365 +#: builtin/clone.c:357 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:369 +#: builtin/clone.c:361 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:392 builtin/clone.c:566 +#: builtin/clone.c:384 builtin/clone.c:558 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:404 +#: builtin/clone.c:396 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4147,124 +4257,119 @@ 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:481 +#: builtin/clone.c:473 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:561 +#: builtin/clone.c:553 #, c-format msgid "Checking connectivity... " msgstr "Vérification de la connectivité... " -#: builtin/clone.c:564 +#: builtin/clone.c:556 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: builtin/clone.c:628 +#: builtin/clone.c:620 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:659 +#: builtin/clone.c:651 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:746 +#: builtin/clone.c:738 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" -#: builtin/clone.c:748 +#: builtin/clone.c:740 msgid "cannot unlink temporary alternates file" msgstr "impossible de unlinker le fichier temporaire alternates" -#: builtin/clone.c:778 +#: builtin/clone.c:770 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:782 +#: builtin/clone.c:774 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:793 +#: builtin/clone.c:785 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:796 +#: builtin/clone.c:788 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:809 +#: builtin/clone.c:801 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:815 builtin/fetch.c:1156 +#: builtin/clone.c:807 builtin/fetch.c:1160 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:825 +#: builtin/clone.c:817 #, 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:835 +#: builtin/clone.c:827 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:850 builtin/clone.c:861 -#, 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:853 +#: builtin/clone.c:845 #, 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:871 +#: builtin/clone.c:863 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:873 +#: builtin/clone.c:865 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:898 +#: builtin/clone.c:890 msgid "--dissociate given, but there is no --reference" msgstr "--dissociate est spécifié, mais --reference est absent" -#: builtin/clone.c:913 +#: builtin/clone.c:907 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:916 +#: builtin/clone.c:910 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:921 +#: builtin/clone.c:915 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:925 +#: builtin/clone.c:919 #, c-format msgid "Don't know how to clone %s" msgstr "Je ne sais pas cloner %s" -#: builtin/clone.c:976 builtin/clone.c:984 +#: builtin/clone.c:968 builtin/clone.c:976 #, 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:987 +#: builtin/clone.c:979 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -4505,7 +4610,7 @@ msgstr "impossible de lire MERGE_MSG" msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:738 builtin/merge.c:1079 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" @@ -4668,32 +4773,32 @@ msgstr "Mode de nettoyage invalide %s" 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:1604 +#: builtin/commit.c:1324 builtin/commit.c:1603 msgid "show status concisely" msgstr "afficher le statut avec concision" -#: builtin/commit.c:1326 builtin/commit.c:1606 +#: builtin/commit.c:1326 builtin/commit.c:1605 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 +#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1331 builtin/commit.c:1610 +#: builtin/commit.c:1331 builtin/commit.c:1609 msgid "show status in long format (default)" msgstr "afficher le statut en format long (par défaut)" -#: builtin/commit.c:1334 builtin/commit.c:1613 +#: builtin/commit.c:1334 builtin/commit.c:1612 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "mode" -#: builtin/commit.c:1337 builtin/commit.c:1616 +#: builtin/commit.c:1337 builtin/commit.c:1615 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " @@ -4703,7 +4808,7 @@ msgstr "" msgid "show ignored files" msgstr "afficher les fichiers ignorés" -#: builtin/commit.c:1341 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:152 msgid "when" msgstr "quand" @@ -4719,205 +4824,205 @@ msgstr "" msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1431 +#: builtin/commit.c:1430 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: builtin/commit.c:1433 +#: builtin/commit.c:1432 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: builtin/commit.c:1478 +#: builtin/commit.c:1477 msgid "detached HEAD" msgstr "HEAD détachée" -#: builtin/commit.c:1481 +#: builtin/commit.c:1480 msgid " (root-commit)" msgstr " (commit racine)" -#: builtin/commit.c:1574 +#: builtin/commit.c:1573 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1575 +#: builtin/commit.c:1574 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1577 +#: builtin/commit.c:1576 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1578 builtin/tag.c:601 +#: builtin/commit.c:1577 builtin/tag.c:601 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "author" msgstr "auteur" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1580 builtin/gc.c:275 +#: builtin/commit.c:1579 builtin/gc.c:280 msgid "date" msgstr "date" -#: builtin/commit.c:1580 +#: builtin/commit.c:1579 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "message" -#: builtin/commit.c:1581 +#: builtin/commit.c:1580 msgid "commit message" msgstr "message de validation" -#: builtin/commit.c:1582 +#: builtin/commit.c:1581 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1583 +#: builtin/commit.c:1582 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1584 +#: builtin/commit.c:1583 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:1585 +#: builtin/commit.c:1584 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:1586 +#: builtin/commit.c:1585 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:1587 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1588 +#: builtin/commit.c:1587 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1589 +#: builtin/commit.c:1588 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1590 +#: builtin/commit.c:1589 msgid "default" msgstr "défaut" -#: builtin/commit.c:1590 builtin/tag.c:604 +#: builtin/commit.c:1589 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" -#: builtin/commit.c:1591 +#: builtin/commit.c:1590 msgid "include status in commit message template" msgstr "inclure le statut dans le modèle de message de validation" -#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "id de clé" -#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "signer la validation avec GPG" -#: builtin/commit.c:1596 +#: builtin/commit.c:1595 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1597 +#: builtin/commit.c:1596 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1598 +#: builtin/commit.c:1597 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1599 +#: builtin/commit.c:1598 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1600 +#: builtin/commit.c:1599 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1601 +#: builtin/commit.c:1600 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1602 +#: builtin/commit.c:1601 msgid "bypass pre-commit hook" msgstr "éviter d'utiliser le crochet pre-commit" -#: builtin/commit.c:1603 +#: builtin/commit.c:1602 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1614 +#: builtin/commit.c:1613 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1615 +#: builtin/commit.c:1614 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1620 +#: builtin/commit.c:1619 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1622 +#: builtin/commit.c:1621 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1651 +#: builtin/commit.c:1650 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: builtin/commit.c:1690 builtin/merge.c:519 +#: builtin/commit.c:1689 builtin/merge.c:1076 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: builtin/commit.c:1697 +#: builtin/commit.c:1696 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1704 +#: builtin/commit.c:1703 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1723 +#: builtin/commit.c:1722 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1734 +#: builtin/commit.c:1733 #, 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:1739 +#: builtin/commit.c:1738 #, 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:1754 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: builtin/commit.c:1787 +#: builtin/commit.c:1786 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4969,7 +5074,7 @@ msgstr "obtenir la valeur : nom [regex-de-valeur]" #: builtin/config.c:61 msgid "get all values: key [value-regex]" -msgstr "obtenir toutes le valeurs : clé [regex-de-valeur]" +msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]" #: builtin/config.c:62 msgid "get values for regexp: name-regex [value-regex]" @@ -5060,18 +5165,18 @@ msgstr "impossible de lire la valeur de couleur par défaut" #, c-format msgid "" "# This is Git's per-user configuration file.\n" -"[core]\n" +"[user]\n" "# Please adapt and uncomment the following lines:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" msgstr "" -"# Ceci est le fichier de configuration personnel.\n" -"[core]\n" +"# Ceci est le fichier de configuration personnel de Git.\n" +"[user]\n" "# Veuillez adapter et décommenter les lignes suivantes :\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:589 +#: builtin/config.c:587 #, c-format msgid "cannot create configuration file %s" msgstr "création impossible du fichier de configuration '%s'" @@ -5406,82 +5511,82 @@ msgstr "correspondance de référence" msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:375 +#: builtin/fetch.c:377 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:455 +#: builtin/fetch.c:457 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:460 +#: builtin/fetch.c:462 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:474 +#: builtin/fetch.c:476 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)" -#: builtin/fetch.c:475 builtin/fetch.c:561 +#: builtin/fetch.c:477 builtin/fetch.c:563 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:486 +#: builtin/fetch.c:488 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 +#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543 msgid " (unable to update local ref)" msgstr " (impossible de mettre à jour la référence locale)" -#: builtin/fetch.c:506 +#: builtin/fetch.c:508 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:509 +#: builtin/fetch.c:511 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:512 +#: builtin/fetch.c:514 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:563 +#: builtin/fetch.c:565 msgid "(non-fast-forward)" msgstr "(pas d'avance rapide)" -#: builtin/fetch.c:596 builtin/fetch.c:829 +#: builtin/fetch.c:599 builtin/fetch.c:832 #, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir %s : %s\n" -#: builtin/fetch.c:605 +#: builtin/fetch.c:608 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n" -#: builtin/fetch.c:623 +#: builtin/fetch.c:626 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "%s rejeté parce que les racines superficielles ne sont pas mises à jour" -#: builtin/fetch.c:711 builtin/fetch.c:794 +#: builtin/fetch.c:714 builtin/fetch.c:797 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:722 +#: builtin/fetch.c:725 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5490,55 +5595,55 @@ msgstr "" "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n" " 'git remote prune %s' pour supprimer des branches anciennes en conflit" -#: builtin/fetch.c:774 +#: builtin/fetch.c:777 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:775 +#: builtin/fetch.c:778 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:799 +#: builtin/fetch.c:802 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:800 builtin/remote.c:1060 +#: builtin/fetch.c:803 builtin/remote.c:1057 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:819 +#: builtin/fetch.c:822 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu" -#: builtin/fetch.c:838 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" -#: builtin/fetch.c:841 +#: builtin/fetch.c:844 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:897 +#: builtin/fetch.c:900 #, c-format msgid "Don't know how to fetch from %s" msgstr "Je ne sais pas récupérer depuis %s" -#: builtin/fetch.c:1059 +#: builtin/fetch.c:1063 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1061 builtin/remote.c:90 +#: builtin/fetch.c:1065 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1079 +#: builtin/fetch.c:1083 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5546,32 +5651,32 @@ msgstr "" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" "distant depuis lesquels les nouvelles révisions devraient être récupérées." -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1106 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1144 +#: builtin/fetch.c:1148 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1146 +#: builtin/fetch.c:1150 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow sur un dépôt complet n'a pas de sens" -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1173 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1171 +#: builtin/fetch.c:1175 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all n'a pas de sens avec des spécifications de référence" -#: builtin/fetch.c:1182 +#: builtin/fetch.c:1186 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1190 +#: builtin/fetch.c:1194 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "La récupération d'un groupe et les spécifications de référence n'ont pas de " @@ -5583,131 +5688,131 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]" -#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 +#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590 -#: parse-options.h:132 parse-options.h:239 +#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590 +#: parse-options.h:131 parse-options.h:238 msgid "n" msgstr "n" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:669 msgid "populate log with at most <n> entries from shortlog" msgstr "peupler le journal avec au plus <n> éléments depuis le journal court" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:672 msgid "alias for --log (deprecated)" msgstr "alias pour --log (obsolète)" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:675 msgid "text" msgstr "texte" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:676 msgid "use <text> as start of message" msgstr "utiliser <texte> comme début de message" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:677 msgid "file to read from" msgstr "fichier d'où lire" -#: builtin/for-each-ref.c:675 +#: builtin/for-each-ref.c:687 msgid "unable to parse format" msgstr "impossible d'analyser le format" -#: builtin/for-each-ref.c:1063 +#: builtin/for-each-ref.c:1083 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<options>] [<motif>]" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1098 msgid "quote placeholders suitably for shells" msgstr "échapper les champs réservés pour les interpréteurs de commandes" -#: builtin/for-each-ref.c:1080 +#: builtin/for-each-ref.c:1100 msgid "quote placeholders suitably for perl" msgstr "échapper les champs réservés pour perl" -#: builtin/for-each-ref.c:1082 +#: builtin/for-each-ref.c:1102 msgid "quote placeholders suitably for python" msgstr "échapper les champs réservés pour python" -#: builtin/for-each-ref.c:1084 +#: builtin/for-each-ref.c:1104 msgid "quote placeholders suitably for Tcl" msgstr "échapper les champs réservés pour compatibilité avec Tcl" -#: builtin/for-each-ref.c:1087 +#: builtin/for-each-ref.c:1107 msgid "show only <n> matched refs" msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:1088 builtin/replace.c:438 +#: builtin/for-each-ref.c:1108 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1108 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1109 msgid "key" msgstr "clé" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1110 msgid "field name to sort on" msgstr "nom du champ servant à trier" -#: builtin/fsck.c:147 builtin/prune.c:137 +#: builtin/fsck.c:147 builtin/prune.c:236 msgid "Checking connectivity" msgstr "Vérification de la connectivité" -#: builtin/fsck.c:540 +#: builtin/fsck.c:548 msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" -#: builtin/fsck.c:603 +#: builtin/fsck.c:611 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<options>] [<objet>...]" -#: builtin/fsck.c:609 +#: builtin/fsck.c:617 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:610 +#: builtin/fsck.c:618 msgid "show dangling objects" msgstr "afficher les objets en suspens" -#: builtin/fsck.c:611 +#: builtin/fsck.c:619 msgid "report tags" msgstr "afficher les étiquettes" -#: builtin/fsck.c:612 +#: builtin/fsck.c:620 msgid "report root nodes" msgstr "signaler les nœuds racines" -#: builtin/fsck.c:613 +#: builtin/fsck.c:621 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:614 +#: builtin/fsck.c:622 msgid "make reflogs head nodes (default)" msgstr "considérer les reflogs comme nœuds tête (par défaut)" -#: builtin/fsck.c:615 +#: builtin/fsck.c:623 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:616 +#: builtin/fsck.c:624 msgid "enable more strict checking" msgstr "activer une vérification plus strict" -#: builtin/fsck.c:618 +#: builtin/fsck.c:626 msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:619 builtin/prune.c:108 +#: builtin/fsck.c:627 builtin/prune.c:198 msgid "show progress" msgstr "afficher la progression" -#: builtin/fsck.c:669 +#: builtin/fsck.c:677 msgid "Checking objects" msgstr "Vérification des objets" @@ -5715,52 +5820,52 @@ msgstr "Vérification des objets" msgid "git gc [<options>]" msgstr "git gc [<options>]" -#: builtin/gc.c:79 +#: builtin/gc.c:67 #, c-format -msgid "Invalid gc.pruneexpire: '%s'" -msgstr "gc.pruneexpire invalide : '%s'" +msgid "Invalid %s: '%s'" +msgstr "%s invalide : '%s'" -#: builtin/gc.c:107 +#: builtin/gc.c:112 #, c-format msgid "insanely long object directory %.*s" msgstr "objet répertoire démentiellement long %.*s" -#: builtin/gc.c:276 +#: builtin/gc.c:281 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:278 +#: builtin/gc.c:283 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:279 +#: builtin/gc.c:284 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:280 +#: builtin/gc.c:285 msgid "force running gc even if there may be another gc running" msgstr "" "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes " "tourne déjà" -#: builtin/gc.c:321 +#: builtin/gc.c:327 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Compression automatique du dépôt en tâche de fond pour optimiser les " "performances.\n" -#: builtin/gc.c:323 +#: builtin/gc.c:329 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Compression du dépôt pour optimiser les performances.\n" -#: builtin/gc.c:324 +#: builtin/gc.c:330 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n" -#: builtin/gc.c:342 +#: builtin/gc.c:348 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5768,7 +5873,7 @@ msgstr "" "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> " "(utilisez --force si ce n'est pas le cas)" -#: builtin/gc.c:364 +#: builtin/gc.c:376 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5979,7 +6084,7 @@ msgstr "afficher les fichiers correspondant dans le pagineur" msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:741 builtin/show-ref.c:187 +#: builtin/grep.c:741 builtin/show-ref.c:189 msgid "show usage" msgstr "afficher l'usage" @@ -6009,7 +6114,7 @@ msgstr "" msgid "both --cached and trees are given." msgstr "--cached et des arbres sont fournis en même temps." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:80 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -6017,38 +6122,38 @@ msgstr "" "git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] " "[--] <fichier>..." -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:81 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <liste-de-chemins>" -#: builtin/hash-object.c:94 builtin/tag.c:612 +#: builtin/hash-object.c:92 builtin/tag.c:612 msgid "type" msgstr "type" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:92 msgid "object type" msgstr "type d'objet" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:93 msgid "write the object into the object database" msgstr "écrire l'objet dans la base de donnée d'objets" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:95 msgid "read the object from stdin" msgstr "lire l'objet depuis l'entrée standard" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:97 msgid "store file as is without filters" msgstr "stocker le fichier tel quel sans filtrage" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:98 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "juste hasher n'importe quel contenu pour créer des objets corrompus pour " "debugger Git" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:99 msgid "process file as it were from this path" msgstr "traiter le fichier comme s'il venait de ce chemin" @@ -6177,292 +6282,292 @@ msgstr "usage : %s%s" msgid "`git %s' is aliased to `%s'" msgstr "`git %s\" est un alias de `%s'" -#: builtin/index-pack.c:150 +#: builtin/index-pack.c:151 #, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" -#: builtin/index-pack.c:200 +#: builtin/index-pack.c:201 #, c-format msgid "object type mismatch at %s" msgstr "type d'objet non correspondant à %s" -#: builtin/index-pack.c:220 +#: builtin/index-pack.c:221 #, c-format msgid "did not receive expected object %s" msgstr "objet attendu non reçu %s" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objet %s : type attendu %s, reçu %s" -#: builtin/index-pack.c:265 +#: builtin/index-pack.c:266 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "impossible de remplir %d octet" msgstr[1] "impossible de remplir %d octets" -#: builtin/index-pack.c:275 +#: builtin/index-pack.c:276 msgid "early EOF" msgstr "fin de fichier prématurée" -#: builtin/index-pack.c:276 +#: builtin/index-pack.c:277 msgid "read error on input" msgstr "erreur de lecture sur l'entrée" -#: builtin/index-pack.c:288 +#: builtin/index-pack.c:289 msgid "used more bytes than were available" msgstr "plus d'octets utilisés que disponibles" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:296 msgid "pack too large for current definition of off_t" msgstr "le paquet est trop grand pour la définition actuelle de off_t" -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:312 #, c-format msgid "unable to create '%s'" msgstr "impossible de créer '%s'" -#: builtin/index-pack.c:316 +#: builtin/index-pack.c:317 #, c-format msgid "cannot open packfile '%s'" msgstr "impossible d'ouvrir le fichier paquet '%s'" -#: builtin/index-pack.c:330 +#: builtin/index-pack.c:331 msgid "pack signature mismatch" msgstr "la signature du paquet ne correspond pas" -#: builtin/index-pack.c:332 +#: builtin/index-pack.c:333 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "la version de paquet %<PRIu32> non supportée" -#: builtin/index-pack.c:350 +#: builtin/index-pack.c:351 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "le paquet a un mauvais objet à l'offset %lu: %s" -#: builtin/index-pack.c:471 +#: builtin/index-pack.c:472 #, c-format msgid "inflate returned %d" msgstr "la décompression (inflate) a retourné %d" -#: builtin/index-pack.c:520 +#: builtin/index-pack.c:521 msgid "offset value overflow for delta base object" msgstr "dépassement de la valeur d'offset pour l'objet delta de base" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "delta base offset is out of bound" msgstr "l'objet delta de base est hors limite" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 #, c-format msgid "unknown object type %d" msgstr "type d'objet inconnu %d" -#: builtin/index-pack.c:567 +#: builtin/index-pack.c:568 msgid "cannot pread pack file" msgstr "impossible de lire (pread) le fichier paquet" -#: builtin/index-pack.c:569 +#: builtin/index-pack.c:570 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "fin prématurée du fichier paquet, %lu octet lu" msgstr[1] "fin prématurée du fichier paquet, %lu octets lus" -#: builtin/index-pack.c:595 +#: builtin/index-pack.c:596 msgid "serious inflate inconsistency" msgstr "grave incohérence dans la décompression (inflate)" -#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715 -#: builtin/index-pack.c:749 builtin/index-pack.c:758 +#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771 +#: builtin/index-pack.c:805 builtin/index-pack.c:814 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/index-pack.c:745 builtin/pack-objects.c:162 #: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" -#: builtin/index-pack.c:755 +#: builtin/index-pack.c:811 #, c-format msgid "cannot read existing object %s" msgstr "impossible de lire l'objet existant %s" -#: builtin/index-pack.c:769 +#: builtin/index-pack.c:825 #, c-format msgid "invalid blob object %s" msgstr "objet blob invalide %s" -#: builtin/index-pack.c:783 +#: builtin/index-pack.c:839 #, c-format msgid "invalid %s" msgstr "%s invalide" -#: builtin/index-pack.c:787 +#: builtin/index-pack.c:843 msgid "Error in object" msgstr "Erreur dans l'objet" -#: builtin/index-pack.c:789 +#: builtin/index-pack.c:845 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Tous les objets enfants de %s ne sont pas accessibles" -#: builtin/index-pack.c:861 builtin/index-pack.c:890 +#: builtin/index-pack.c:917 builtin/index-pack.c:948 msgid "failed to apply delta" msgstr "échec d'application du delta" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Réception d'objets" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Indexation d'objets" -#: builtin/index-pack.c:1081 +#: builtin/index-pack.c:1150 msgid "pack is corrupted (SHA1 mismatch)" msgstr "le paquet est corrompu (SHA1 ne correspond pas)" -#: builtin/index-pack.c:1086 +#: builtin/index-pack.c:1155 msgid "cannot fstat packfile" msgstr "impossible d'obtenir le statut (fstat) du fichier paquet" -#: builtin/index-pack.c:1089 +#: builtin/index-pack.c:1158 msgid "pack has junk at the end" msgstr "le paquet est invalide à la fin" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1169 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusion extrême dans parse_pack_objects()" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1194 msgid "Resolving deltas" msgstr "Résolution des deltas" -#: builtin/index-pack.c:1133 +#: builtin/index-pack.c:1205 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1247 msgid "confusion beyond insanity" msgstr "confusion extrême" -#: builtin/index-pack.c:1181 +#: builtin/index-pack.c:1253 #, c-format msgid "completed with %d local objects" msgstr "complété avec %d objets locaux" -#: builtin/index-pack.c:1191 +#: builtin/index-pack.c:1263 #, 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:1195 +#: builtin/index-pack.c:1267 #, 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:1219 +#: builtin/index-pack.c:1291 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1367 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1322 +#: builtin/index-pack.c:1391 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1335 +#: builtin/index-pack.c:1404 #, c-format msgid "cannot write keep file '%s'" msgstr "impossible d'écrire le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1343 +#: builtin/index-pack.c:1412 #, c-format msgid "cannot close written keep file '%s'" msgstr "impossible de fermer le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1356 +#: builtin/index-pack.c:1425 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1436 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1469 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1475 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1658 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1537 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1539 #, 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:1517 +#: builtin/index-pack.c:1586 #, 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:1524 +#: builtin/index-pack.c:1593 #, 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:1553 +#: builtin/index-pack.c:1622 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 -#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 +#: builtin/index-pack.c:1670 builtin/index-pack.c:1673 +#: builtin/index-pack.c:1685 builtin/index-pack.c:1689 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1634 +#: builtin/index-pack.c:1703 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 +#: builtin/index-pack.c:1707 builtin/index-pack.c:1716 #, 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:1655 +#: builtin/index-pack.c:1724 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" @@ -6532,22 +6637,22 @@ 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'" -#: builtin/init-db.c:197 +#: builtin/init-db.c:211 #, c-format msgid "insane git directory %s" msgstr "répertoire git démentiel %s" -#: builtin/init-db.c:331 builtin/init-db.c:334 +#: builtin/init-db.c:343 builtin/init-db.c:346 #, c-format msgid "%s already exists" msgstr "%s existe déjà" -#: builtin/init-db.c:363 +#: builtin/init-db.c:374 #, c-format msgid "unable to handle file type %d" msgstr "impossible de traiter le fichier de type %d" -#: builtin/init-db.c:366 +#: builtin/init-db.c:377 #, c-format msgid "unable to move %s to %s" msgstr "impossible de déplacer %s vers %s" @@ -6555,24 +6660,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:426 +#: builtin/init-db.c:433 #, 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:427 +#: builtin/init-db.c:434 msgid "Reinitialized existing" msgstr "existant réinitialisé" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Initialized empty" msgstr "vide initialisé" -#: builtin/init-db.c:428 +#: builtin/init-db.c:435 msgid " shared" msgstr " partagé" -#: builtin/init-db.c:475 +#: builtin/init-db.c:482 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -6580,29 +6685,29 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--" "shared[=<permissions>]] [<répertoire>]" -#: builtin/init-db.c:498 +#: builtin/init-db.c:505 msgid "permissions" msgstr "permissions" -#: builtin/init-db.c:499 +#: builtin/init-db.c:506 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:501 builtin/prune-packed.c:57 builtin/repack.c:171 +#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171 msgid "be quiet" msgstr "être silencieux" -#: builtin/init-db.c:533 builtin/init-db.c:538 +#: builtin/init-db.c:540 builtin/init-db.c:545 #, c-format msgid "cannot mkdir %s" msgstr "impossible de créer le répertoire (mkdir) %s" -#: builtin/init-db.c:542 +#: builtin/init-db.c:549 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se déplacer vers le répertoire (chdir) %s" -#: builtin/init-db.c:563 +#: builtin/init-db.c:570 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6611,7 +6716,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:591 +#: builtin/init-db.c:598 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accéder à l'arbre de travail '%s'" @@ -6637,7 +6742,7 @@ msgid "trailer(s) to add" msgstr "ligne(s) de fin à ajouter" #: builtin/log.c:41 -msgid "git log [<options>] [<revision range>] [[--] <path>...]" +msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]" #: builtin/log.c:42 @@ -6708,7 +6813,7 @@ msgstr "Impossible d'ouvrir le fichier correctif %s" msgid "Need exactly one range." msgstr "Exactement une plage nécessaire." -#: builtin/log.c:811 +#: builtin/log.c:813 msgid "Not a range." msgstr "Ceci n'est pas une plage." @@ -6911,7 +7016,7 @@ msgstr "Échec de création des fichiers en sortie" msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:1638 +#: builtin/log.c:1637 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -6919,7 +7024,7 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spécifier " "<branche_amont> manuellement.\n" -#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 +#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662 #, c-format msgid "Unknown commit %s" msgstr "Commit inconnu %s" @@ -7199,42 +7304,42 @@ msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n" msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:559 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:654 +#: builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: builtin/merge.c:678 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "Impossible de gérer autre chose que la fusion de deux têtes." -#: builtin/merge.c:692 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:705 +#: builtin/merge.c:683 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:794 +#: builtin/merge.c:772 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:803 +#: builtin/merge.c:781 #, 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:809 +#: builtin/merge.c:787 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7251,49 +7356,54 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:833 +#: builtin/merge.c:811 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:845 +#: builtin/merge.c:823 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:900 +#: builtin/merge.c:878 #, 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:916 +#: builtin/merge.c:894 #, c-format msgid "'%s' is not a commit" msgstr "'%s' n'est pas une validation" -#: builtin/merge.c:957 +#: builtin/merge.c:935 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:959 +#: builtin/merge.c:937 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:961 +#: builtin/merge.c:939 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:966 +#: builtin/merge.c:944 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1122 +#: builtin/merge.c:1081 +#, c-format +msgid "could not close '%s'" +msgstr "impossible de fermer '%s'" + +#: builtin/merge.c:1208 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:1138 +#: builtin/merge.c:1224 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7301,11 +7411,11 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1141 git-pull.sh:34 +#: builtin/merge.c:1227 git-pull.sh:74 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: builtin/merge.c:1145 +#: builtin/merge.c:1231 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7313,102 +7423,102 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1148 +#: builtin/merge.c:1234 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:1157 +#: builtin/merge.c:1243 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1166 +#: builtin/merge.c:1251 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:1198 -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:1201 +#: builtin/merge.c:1268 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:1203 +#: builtin/merge.c:1270 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:1208 +#: builtin/merge.c:1276 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1259 +#: builtin/merge.c:1278 +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:1333 #, 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:1262 +#: builtin/merge.c:1336 #, 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:1265 +#: builtin/merge.c:1339 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: builtin/merge.c:1268 +#: builtin/merge.c:1342 #, 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:1349 +#: builtin/merge.c:1423 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1388 +#: builtin/merge.c:1462 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1395 +#: builtin/merge.c:1469 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1427 +#: builtin/merge.c:1501 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1450 builtin/merge.c:1529 +#: builtin/merge.c:1524 builtin/merge.c:1603 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1454 +#: builtin/merge.c:1528 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1520 +#: builtin/merge.c:1594 #, 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:1522 +#: builtin/merge.c:1596 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1605 #, 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:1543 +#: builtin/merge.c:1617 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7599,7 +7709,7 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 +#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" @@ -7976,7 +8086,7 @@ msgstr "références-notes" msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" -#: builtin/notes.c:989 builtin/remote.c:1621 +#: builtin/notes.c:989 builtin/remote.c:1618 #, c-format msgid "Unknown subcommand: %s" msgstr "Sous-commande inconnue : %s" @@ -8000,181 +8110,181 @@ msgstr "erreur de compression (%d)" msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1013 +#: builtin/pack-objects.c:1011 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:2173 +#: builtin/pack-objects.c:2171 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2570 +#: builtin/pack-objects.c:2568 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2572 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2597 +#: builtin/pack-objects.c:2595 #, c-format msgid "option %s does not accept negative form" msgstr "l'option %s n'accepte pas de valeur négative" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2599 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "impossible d'analyser la valeur '%s' pour l'option %s" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2619 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 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:2628 +#: builtin/pack-objects.c:2626 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:2629 +#: builtin/pack-objects.c:2627 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 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:2633 +#: builtin/pack-objects.c:2631 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 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:2643 +#: builtin/pack-objects.c:2641 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:2645 +#: builtin/pack-objects.c:2643 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 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:2653 +#: builtin/pack-objects.c:2651 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 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:2660 +#: builtin/pack-objects.c:2658 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2661 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:2666 +#: builtin/pack-objects.c:2664 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2667 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 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:2673 +#: builtin/pack-objects.c:2671 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2674 parse-options.h:140 +#: builtin/pack-objects.c:2672 parse-options.h:139 msgid "time" msgstr "heure" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:2678 +#: builtin/pack-objects.c:2676 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 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:2690 +#: builtin/pack-objects.c:2688 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:2781 +#: builtin/pack-objects.c:2779 msgid "Counting objects" msgstr "Décompte des objets" @@ -8202,18 +8312,56 @@ 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:106 +#: builtin/prune.c:86 +#, c-format +msgid "Removing worktrees/%s: not a valid directory" +msgstr "Suppression de worktrees/%s : répertoire invalide" + +#: builtin/prune.c:92 +#, c-format +msgid "Removing worktrees/%s: gitdir file does not exist" +msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas" + +#: builtin/prune.c:97 +#, 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/prune.c:108 +#, c-format +msgid "Removing worktrees/%s: invalid gitdir file" +msgstr "Suppression de worktrees/%s : fichier gitdir invalide" + +#: builtin/prune.c:124 +#, 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/prune.c:159 +#, c-format +msgid "failed to remove: %s" +msgstr "échec de la suppression de %s" + +#: builtin/prune.c:196 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" -#: builtin/prune.c:107 +#: builtin/prune.c:197 msgid "report pruned objects" msgstr "afficher les objets éliminés" -#: builtin/prune.c:110 +#: builtin/prune.c:199 +msgid "prune .git/worktrees" +msgstr "éliminer .git/worktrees" + +#: builtin/prune.c:201 msgid "expire objects older than <time>" msgstr "faire expirer les objets plus vieux que <heure>" +#: builtin/prune.c:216 +msgid "--worktrees does not take extra arguments" +msgstr "--worktrees n'accepte pas d'argument supplémentaire" + #: builtin/push.c:14 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]" @@ -8639,12 +8787,12 @@ msgstr "sauter l'application du filtre d'extraction creuse" msgid "debug unpack-trees" msgstr "déboguer unpack-trees" -#: builtin/reflog.c:429 +#: builtin/reflog.c:430 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "%s' pour '%s' n'est pas un horodatage valide" -#: builtin/reflog.c:546 builtin/reflog.c:551 +#: builtin/reflog.c:547 builtin/reflog.c:552 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' n'est pas un horodatage valide" @@ -8786,12 +8934,12 @@ msgstr "" "spécifier les branches à suivre n'a de sens qu'avec des miroirs de " "rapatriement" -#: builtin/remote.c:187 builtin/remote.c:643 +#: builtin/remote.c:187 builtin/remote.c:640 #, c-format msgid "remote %s already exists." msgstr "la distante %s existe déjà." -#: builtin/remote.c:191 builtin/remote.c:647 +#: builtin/remote.c:191 builtin/remote.c:644 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' n'est pas un nom valide de distante" @@ -8816,27 +8964,27 @@ msgstr "(correspond)" msgid "(delete)" msgstr "(supprimer)" -#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604 +#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Impossible d'ajouter '%s' à '%s'" -#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895 +#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892 #, c-format msgid "No such remote: %s" msgstr "Distante inconnue : %s" -#: builtin/remote.c:653 +#: builtin/remote.c:650 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Impossible de renommer la section de configuration '%s' en '%s'" -#: builtin/remote.c:659 builtin/remote.c:847 +#: builtin/remote.c:656 builtin/remote.c:844 #, c-format msgid "Could not remove config section '%s'" msgstr "Impossible de supprimer la section de configuration '%s'" -#: builtin/remote.c:674 +#: builtin/remote.c:671 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8847,32 +8995,32 @@ msgstr "" "\t%s\n" "\tVeuillez mettre à jour la configuration manuellement si nécessaire." -#: builtin/remote.c:680 +#: builtin/remote.c:677 #, c-format msgid "Could not append '%s'" msgstr "Impossible d'ajouter '%s'" -#: builtin/remote.c:691 +#: builtin/remote.c:688 #, c-format msgid "Could not set '%s'" msgstr "Impossible de définir '%s'" -#: builtin/remote.c:713 +#: builtin/remote.c:710 #, c-format msgid "deleting '%s' failed" msgstr "échec de suppression de '%s'" -#: builtin/remote.c:747 +#: builtin/remote.c:744 #, c-format msgid "creating '%s' failed" msgstr "échec de création de '%s'" -#: builtin/remote.c:766 +#: builtin/remote.c:763 #, c-format msgid "Could not remove branch %s" msgstr "Impossible de supprimer la branche %s" -#: builtin/remote.c:833 +#: builtin/remote.c:830 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8887,120 +9035,120 @@ msgstr[1] "" "supprimées ;\n" "pour les supprimer, utilisez :" -#: builtin/remote.c:948 +#: builtin/remote.c:945 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)" -#: builtin/remote.c:951 +#: builtin/remote.c:948 msgid " tracked" msgstr " suivi" -#: builtin/remote.c:953 +#: builtin/remote.c:950 msgid " stale (use 'git remote prune' to remove)" msgstr " dépassé (utilisez 'git remote prune' pour supprimer)" -#: builtin/remote.c:955 +#: builtin/remote.c:952 msgid " ???" msgstr " ???" -#: builtin/remote.c:996 +#: builtin/remote.c:993 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche" -#: builtin/remote.c:1003 +#: builtin/remote.c:1000 #, c-format msgid "rebases onto remote %s" msgstr "rebase sur la distante %s" -#: builtin/remote.c:1006 +#: builtin/remote.c:1003 #, c-format msgid " merges with remote %s" msgstr " fusionne avec la distante %s" -#: builtin/remote.c:1007 +#: builtin/remote.c:1004 msgid " and with remote" msgstr " et avec la distante" -#: builtin/remote.c:1009 +#: builtin/remote.c:1006 #, c-format msgid "merges with remote %s" msgstr "fusionne avec la distante %s" -#: builtin/remote.c:1010 +#: builtin/remote.c:1007 msgid " and with remote" msgstr " et avec la distante" -#: builtin/remote.c:1056 +#: builtin/remote.c:1053 msgid "create" msgstr "créer" -#: builtin/remote.c:1059 +#: builtin/remote.c:1056 msgid "delete" msgstr "supprimer" -#: builtin/remote.c:1063 +#: builtin/remote.c:1060 msgid "up to date" msgstr "à jour" -#: builtin/remote.c:1066 +#: builtin/remote.c:1063 msgid "fast-forwardable" msgstr "peut être mis à jour en avance rapide" -#: builtin/remote.c:1069 +#: builtin/remote.c:1066 msgid "local out of date" msgstr "le local n'est pas à jour" -#: builtin/remote.c:1076 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s force vers %-*s (%s)" -#: builtin/remote.c:1079 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s pousse vers %-*s (%s)" -#: builtin/remote.c:1083 +#: builtin/remote.c:1080 #, c-format msgid " %-*s forces to %s" msgstr " %-*s force vers %s" -#: builtin/remote.c:1086 +#: builtin/remote.c:1083 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s pousse vers %s" -#: builtin/remote.c:1154 +#: builtin/remote.c:1151 msgid "do not query remotes" msgstr "ne pas interroger les distantes" -#: builtin/remote.c:1181 +#: builtin/remote.c:1178 #, c-format msgid "* remote %s" msgstr "* distante %s" -#: builtin/remote.c:1182 +#: builtin/remote.c:1179 #, c-format msgid " Fetch URL: %s" msgstr " URL de rapatriement : %s" -#: builtin/remote.c:1183 builtin/remote.c:1334 +#: builtin/remote.c:1180 builtin/remote.c:1331 msgid "(no URL)" msgstr "(pas d'URL)" -#: builtin/remote.c:1192 builtin/remote.c:1194 +#: builtin/remote.c:1189 builtin/remote.c:1191 #, c-format msgid " Push URL: %s" msgstr " URL push : %s" -#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200 +#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " HEAD branch: %s" msgstr " Branche HEAD : %s" -#: builtin/remote.c:1202 +#: builtin/remote.c:1199 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -9008,145 +9156,145 @@ msgstr "" " Branche HEAD (la HEAD distante est ambiguë, peut être l'une des " "suivantes) :\n" -#: builtin/remote.c:1214 +#: builtin/remote.c:1211 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branche distante :%s" msgstr[1] " Branches distantes :%s" -#: builtin/remote.c:1217 builtin/remote.c:1244 +#: builtin/remote.c:1214 builtin/remote.c:1241 msgid " (status not queried)" msgstr " (statut non demandé)" -#: builtin/remote.c:1226 +#: builtin/remote.c:1223 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:1234 +#: builtin/remote.c:1231 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:1241 +#: builtin/remote.c:1238 #, 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:1262 +#: builtin/remote.c:1259 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "définir refs/remotes/<nom>/HEAD selon la distante" -#: builtin/remote.c:1264 +#: builtin/remote.c:1261 msgid "delete refs/remotes/<name>/HEAD" msgstr "supprimer refs/remotes/<nom>/HEAD" -#: builtin/remote.c:1279 +#: builtin/remote.c:1276 msgid "Cannot determine remote HEAD" msgstr "Impossible de déterminer la HEAD distante" -#: builtin/remote.c:1281 +#: builtin/remote.c:1278 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:1291 +#: builtin/remote.c:1288 #, c-format msgid "Could not delete %s" msgstr "Impossible de supprimer %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1296 #, c-format msgid "Not a valid ref: %s" msgstr "Référence non valide : %s" -#: builtin/remote.c:1301 +#: builtin/remote.c:1298 #, c-format msgid "Could not setup %s" msgstr "Impossible de paramétrer %s" -#: builtin/remote.c:1319 +#: builtin/remote.c:1316 #, c-format msgid " %s will become dangling!" msgstr " %s se retrouvera en suspens !" -#: builtin/remote.c:1320 +#: builtin/remote.c:1317 #, c-format msgid " %s has become dangling!" msgstr " %s se retrouve en suspens !" -#: builtin/remote.c:1330 +#: builtin/remote.c:1327 #, c-format msgid "Pruning %s" msgstr "Élimination de %s" -#: builtin/remote.c:1331 +#: builtin/remote.c:1328 #, c-format msgid "URL: %s" msgstr "URL : %s" -#: builtin/remote.c:1354 +#: builtin/remote.c:1351 #, c-format msgid " * [would prune] %s" msgstr " * [serait éliminé] %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1354 #, c-format msgid " * [pruned] %s" msgstr " * [éliminé] %s" -#: builtin/remote.c:1402 +#: builtin/remote.c:1399 msgid "prune remotes after fetching" msgstr "éliminer les distants après le rapatriement" -#: builtin/remote.c:1468 builtin/remote.c:1542 +#: builtin/remote.c:1465 builtin/remote.c:1539 #, c-format msgid "No such remote '%s'" msgstr "Pas de serveur remote '%s'" -#: builtin/remote.c:1488 +#: builtin/remote.c:1485 msgid "add branch" msgstr "ajouter une branche" -#: builtin/remote.c:1495 +#: builtin/remote.c:1492 msgid "no remote specified" msgstr "pas de serveur distant spécifié" -#: builtin/remote.c:1517 +#: builtin/remote.c:1514 msgid "manipulate push URLs" msgstr "manipuler les URLs push" -#: builtin/remote.c:1519 +#: builtin/remote.c:1516 msgid "add URL" msgstr "ajouter une URL" -#: builtin/remote.c:1521 +#: builtin/remote.c:1518 msgid "delete URLs" msgstr "supprimer des URLs" -#: builtin/remote.c:1528 +#: builtin/remote.c:1525 msgid "--add --delete doesn't make sense" msgstr "--add --delete n'a aucun sens" -#: builtin/remote.c:1568 +#: builtin/remote.c:1565 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Motif d'URL ancien invalide : %s" -#: builtin/remote.c:1576 +#: builtin/remote.c:1573 #, c-format msgid "No such URL found: %s" msgstr "Pas d'URL trouvée : %s" -#: builtin/remote.c:1578 +#: builtin/remote.c:1575 msgid "Will not delete all non-push URLs" msgstr "Pas de suppression de toutes les URLs non-push" -#: builtin/remote.c:1592 +#: builtin/remote.c:1589 msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" @@ -9219,7 +9367,7 @@ msgstr "taille maximum de chaque fichier paquet" msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:375 +#: builtin/repack.c:377 #, c-format msgid "removing '%s' failed" msgstr "la suppression de '%s' a échoué" @@ -9601,7 +9749,7 @@ msgstr "" "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " "historique)" -#: builtin/rm.c:231 +#: builtin/rm.c:230 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -9615,7 +9763,7 @@ msgstr[1] "" "les fichiers suivants ont du contenu indexé différent\n" "du fichier et de HEAD :" -#: builtin/rm.c:236 +#: builtin/rm.c:235 msgid "" "\n" "(use -f to force removal)" @@ -9623,13 +9771,13 @@ msgstr "" "\n" "(utilisez -f pour forcer la suppression)" -#: builtin/rm.c:240 +#: builtin/rm.c:239 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "le fichier suivant a des changements indexés :" msgstr[1] "les fichiers suivants ont des changements indexés :" -#: builtin/rm.c:244 builtin/rm.c:255 +#: builtin/rm.c:243 builtin/rm.c:254 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -9637,44 +9785,44 @@ msgstr "" "\n" "(utilisez --cached pour garder le fichier, ou -f pour forcer la suppression)" -#: builtin/rm.c:252 +#: builtin/rm.c:251 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "le fichier suivant a des modifications locales :" msgstr[1] "les fichiers suivants ont des modifications locales :" -#: builtin/rm.c:270 +#: builtin/rm.c:269 msgid "do not list removed files" msgstr "ne pas afficher les fichiers supprimés" -#: builtin/rm.c:271 +#: builtin/rm.c:270 msgid "only remove from the index" msgstr "supprimer seulement de l'index" -#: builtin/rm.c:272 +#: builtin/rm.c:271 msgid "override the up-to-date check" msgstr "outrepasser la vérification des fichiers à jour" -#: builtin/rm.c:273 +#: builtin/rm.c:272 msgid "allow recursive removal" msgstr "autoriser la suppression récursive" -#: builtin/rm.c:275 +#: builtin/rm.c:274 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:318 +#: 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:336 +#: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" msgstr "pas de suppression récursive de '%s' sans -r" -#: builtin/rm.c:375 +#: builtin/rm.c:374 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm : impossible de supprimer %s" @@ -9726,68 +9874,68 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:659 msgid "show remote-tracking and local branches" msgstr "afficher les branches de suivi distantes et les branches locales" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:661 msgid "show remote-tracking branches" msgstr "afficher les branches de suivi distantes" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:663 msgid "color '*!+-' corresponding to the branch" msgstr "couleur '*!+-' correspondant à la branche" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:665 msgid "show <n> more commits after the common ancestor" msgstr "afficher <n> validations de plus après l'ancêtre commun" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:667 msgid "synonym to more=-1" msgstr "synonyme de more=-1" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:668 msgid "suppress naming strings" msgstr "supprimer les chaînes de nommage" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:670 msgid "include the current branch" msgstr "inclure la branche courante" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:672 msgid "name commits with their object names" msgstr "nommer les validations avec leurs noms d'objet" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:674 msgid "show possible merge bases" msgstr "afficher les bases possibles de fusion" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:676 msgid "show refs unreachable from any other ref" msgstr "afficher les références inaccessibles depuis toute autre référence" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:678 msgid "show commits in topological order" msgstr "afficher les validations dans l'ordre topologique" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:681 msgid "show only commits not on the first branch" msgstr "" "afficher seulement les validations qui ne sont pas sur la première branche" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:683 msgid "show merges reachable from only one tip" msgstr "afficher les fusions accessibles depuis une seule pointe" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:685 msgid "topologically sort, maintaining date order where possible" msgstr "tri topologique, maintenant l'ordre par date si possible" -#: builtin/show-branch.c:681 +#: builtin/show-branch.c:688 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:682 +#: builtin/show-branch.c:689 msgid "show <n> most recent ref-log entries starting at base" msgstr "" "afficher les <n> plus récents éléments de ref-log en commençant à la base" @@ -9804,38 +9952,38 @@ msgstr "" msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "git show-ref --exclude-existing[=motif] < liste-références" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:170 msgid "only show tags (can be combined with heads)" msgstr "afficher seulement les étiquettes (peut être combiné avec des têtes)" -#: builtin/show-ref.c:169 +#: builtin/show-ref.c:171 msgid "only show heads (can be combined with tags)" msgstr "afficher seulement les têtes (peut être combiné avec des étiquettes)" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:172 msgid "stricter reference checking, requires exact ref path" msgstr "" "vérification de référence plus stricte, nécessite un chemin de référence " "exact" -#: builtin/show-ref.c:173 builtin/show-ref.c:175 +#: builtin/show-ref.c:175 builtin/show-ref.c:177 msgid "show the HEAD reference, even if it would be filtered out" msgstr "afficher la référence HEAD, même si elle serait filtrée" -#: builtin/show-ref.c:177 +#: builtin/show-ref.c:179 msgid "dereference tags into object IDs" msgstr "déréférencer les étiquettes en IDs d'objet" -#: builtin/show-ref.c:179 +#: builtin/show-ref.c:181 msgid "only show SHA1 hash using <n> digits" msgstr "afficher seulement le hachage SHA1 en utilisant <n> chiffres" -#: builtin/show-ref.c:183 +#: builtin/show-ref.c:185 msgid "do not print results to stdout (useful with --verify)" msgstr "" "ne pas afficher les résultats sur la sortie standard (pratique avec --verify)" -#: builtin/show-ref.c:185 +#: builtin/show-ref.c:187 msgid "show refs from stdin that aren't in local repository" msgstr "" "afficher les références de l'entrée standard qui ne sont pas dans le dépôt " @@ -10098,126 +10246,192 @@ msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" msgid "Unpacking objects" msgstr "Dépaquetage des objets" -#: builtin/update-index.c:403 +#: builtin/update-index.c:70 +#, c-format +msgid "failed to create directory %s" +msgstr "échec de la création du répertoire %s" + +#: builtin/update-index.c:76 +#, c-format +msgid "failed to stat %s" +msgstr "échec du stat de %s" + +#: builtin/update-index.c:86 +#, c-format +msgid "failed to create file %s" +msgstr "échec de la création du fichier %s" + +#: builtin/update-index.c:94 +#, c-format +msgid "failed to delete file %s" +msgstr "échec de la suppression du fichier %s" + +#: builtin/update-index.c:101 builtin/update-index.c:203 +#, c-format +msgid "failed to delete directory %s" +msgstr "échec de la suppression du répertoire %s" + +#: builtin/update-index.c:124 +#, c-format +msgid "Testing " +msgstr "Test en cours " + +#: builtin/update-index.c:136 +msgid "directory stat info does not change after adding a new file" +msgstr "l'information de stat du répertoire ne change pas après ajout d'un fichier" + +#: builtin/update-index.c:149 +msgid "directory stat info does not change after adding a new directory" +msgstr "l'information de stat du répertoire ne change pas après ajout d'un répertoire" + +#: builtin/update-index.c:162 +msgid "directory stat info changes after updating a file" +msgstr "l'information de stat du répertoire change après mise à jour d'un fichier" + +#: builtin/update-index.c:173 +msgid "directory stat info changes after adding a file inside subdirectory" +msgstr "l'information de stat du répertoire change après l'ajout d'un fichier dans un sous-répertoire" + +#: builtin/update-index.c:184 +msgid "directory stat info does not change after deleting a file" +msgstr "l'information de stat du répertoire ne change pas après la suppression d'un fichier<" + +#: builtin/update-index.c:197 +msgid "directory stat info does not change after deleting a directory" +msgstr "l'information de stat du répertoire ne change pas après la suppression d'un répertoire" + +#: builtin/update-index.c:204 +msgid " OK" +msgstr " OK" + +#: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<options>] [--] [<fichier>...]" -#: builtin/update-index.c:757 +#: builtin/update-index.c:918 msgid "continue refresh even when index needs update" msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour" -#: builtin/update-index.c:760 +#: builtin/update-index.c:921 msgid "refresh: ignore submodules" msgstr "rafraîchir : ignorer les sous-modules" -#: builtin/update-index.c:763 +#: builtin/update-index.c:924 msgid "do not ignore new files" msgstr "ne pas ignorer les nouveaux fichiers" -#: builtin/update-index.c:765 +#: builtin/update-index.c:926 msgid "let files replace directories and vice-versa" msgstr "laisser les fichiers remplacer des répertoires et vice-versa" -#: builtin/update-index.c:767 +#: builtin/update-index.c:928 msgid "notice files missing from worktree" msgstr "aviser des fichiers manquants dans la copie de travail" -#: builtin/update-index.c:769 +#: builtin/update-index.c:930 msgid "refresh even if index contains unmerged entries" msgstr "rafraîchir même si l'index contient des éléments non fusionnés" -#: builtin/update-index.c:772 +#: builtin/update-index.c:933 msgid "refresh stat information" msgstr "rafraîchir l'information de stat" -#: builtin/update-index.c:776 +#: builtin/update-index.c:937 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "comme --refresh, mais en ignorant l'option assume-unchanged" -#: builtin/update-index.c:780 +#: builtin/update-index.c:941 msgid "<mode>,<object>,<path>" msgstr "<mode>, <objet>, <chemin>" -#: builtin/update-index.c:781 +#: builtin/update-index.c:942 msgid "add the specified entry to the index" msgstr "ajouter l'élément spécifié dans l'index" -#: builtin/update-index.c:785 +#: builtin/update-index.c:946 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:786 +#: builtin/update-index.c:947 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exécutable pour les fichiers listés" -#: builtin/update-index.c:790 +#: builtin/update-index.c:951 msgid "mark files as \"not changing\"" msgstr "marquer les fichiers comme \"non changeants\"" -#: builtin/update-index.c:793 +#: builtin/update-index.c:954 msgid "clear assumed-unchanged bit" msgstr "mettre à zéro le bit supposé-non-modifié" -#: builtin/update-index.c:796 +#: builtin/update-index.c:957 msgid "mark files as \"index-only\"" msgstr "marquer les fichiers comme \"index seulement\"" -#: builtin/update-index.c:799 +#: builtin/update-index.c:960 msgid "clear skip-worktree bit" msgstr "mettre à zéro le bit sauter-la-copie-de travail" -#: builtin/update-index.c:802 +#: builtin/update-index.c:963 msgid "add to index only; do not add content to object database" msgstr "" "ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de " "données des objets" -#: builtin/update-index.c:804 +#: builtin/update-index.c:965 msgid "remove named paths even if present in worktree" msgstr "" "supprimer les chemins nommés même s'ils sont présents dans la copie de " "travail" -#: builtin/update-index.c:806 +#: builtin/update-index.c:967 msgid "with --stdin: input lines are terminated by null bytes" msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls" -#: builtin/update-index.c:808 +#: builtin/update-index.c:969 msgid "read list of paths to be updated from standard input" msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard" -#: builtin/update-index.c:812 +#: builtin/update-index.c:973 msgid "add entries from standard input to the index" msgstr "ajouter les éléments depuis l'entrée standard à l'index" -#: builtin/update-index.c:816 +#: builtin/update-index.c:977 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés" -#: builtin/update-index.c:820 +#: builtin/update-index.c:981 msgid "only update entries that differ from HEAD" msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD" -#: builtin/update-index.c:824 +#: builtin/update-index.c:985 msgid "ignore files missing from worktree" msgstr "ignorer les fichiers manquants dans la copie de travail" -#: builtin/update-index.c:827 +#: builtin/update-index.c:988 msgid "report actions to standard output" msgstr "afficher les actions sur la sortie standard" -#: builtin/update-index.c:829 +#: builtin/update-index.c:990 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus" -#: builtin/update-index.c:833 +#: builtin/update-index.c:994 msgid "write index in this format" msgstr "écrire l'index dans ce format" -#: builtin/update-index.c:835 +#: builtin/update-index.c:996 msgid "enable or disable split index" msgstr "activer ou désactiver l'index divisé" +#: builtin/update-index.c:998 +msgid "enable/disable untracked cache" +msgstr "activer ou désactiver le cache non-suivi" + +#: builtin/update-index.c:1000 +msgid "enable untracked cache without testing the filesystem" +msgstr "activer le cache non-suivi sans tester le système de fichier" + #: builtin/update-ref.c:9 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]" @@ -10314,111 +10528,131 @@ 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." -#: common-cmds.h:8 +#: common-cmds.h:10 +msgid "start a working area (see also: git help tutorial)" +msgstr "démarrer une zone de travail (voir aussi : git help tutorial)" + +#: common-cmds.h:11 +msgid "work on the current change (see also: git help everyday)" +msgstr "travailler sur la modification actuelle (voir aussi : git help revisions)" + +#: common-cmds.h:12 +msgid "examine the history and state (see also: git help revisions)" +msgstr "examiner l'historique et l'état (voir aussi : git help revisions)" + +#: common-cmds.h:13 +msgid "grow, mark and tweak your common history" +msgstr "agrandir, marquer et modifier votre historique" + +#: common-cmds.h:14 +msgid "collaborate (see also: git help workflows)" +msgstr "collaborer (voir aussi : git help workflows)" + +#: common-cmds.h:18 msgid "Add file contents to the index" msgstr "Ajouter le contenu de fichiers dans l'index" -#: common-cmds.h:9 +#: common-cmds.h:19 msgid "Find by binary search the change that introduced a bug" msgstr "Trouver par recherche binaire la modification qui a introduit un bogue" -#: common-cmds.h:10 +#: common-cmds.h:20 msgid "List, create, or delete branches" msgstr "Lister, créer ou supprimer des branches" -#: common-cmds.h:11 +#: common-cmds.h:21 msgid "Checkout a branch or paths to the working tree" msgstr "Extraire une branche ou des chemins dans la copie de travail" -#: common-cmds.h:12 +#: common-cmds.h:22 msgid "Clone a repository into a new directory" msgstr "Cloner un dépôt dans un nouveau répertoire" -#: common-cmds.h:13 +#: common-cmds.h:23 msgid "Record changes to the repository" msgstr "Enregistrer les modifications dans le dépôt" -#: common-cmds.h:14 +#: common-cmds.h:24 msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Afficher les changements entre les validations, entre validation et copie de " "travail, etc" -#: common-cmds.h:15 +#: common-cmds.h:25 msgid "Download objects and refs from another repository" msgstr "Télécharger les objets et références depuis un autre dépôt" -#: common-cmds.h:16 +#: common-cmds.h:26 msgid "Print lines matching a pattern" msgstr "Afficher les lignes correspondant à un motif" -#: common-cmds.h:17 +#: common-cmds.h:27 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Créer un dépôt Git vide ou réinitialiser un existant" -#: common-cmds.h:18 +#: common-cmds.h:28 msgid "Show commit logs" msgstr "Afficher l'historique des validations" -#: common-cmds.h:19 +#: common-cmds.h:29 msgid "Join two or more development histories together" msgstr "Fusionner deux ou plusieurs historiques de développement ensemble" -#: common-cmds.h:20 +#: common-cmds.h:30 msgid "Move or rename a file, a directory, or a symlink" msgstr "Déplacer ou renommer un fichier, un répertoire, ou un lien symbolique" -#: common-cmds.h:21 +#: common-cmds.h:31 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Rapatrier et intégrer un autre dépôt ou une branche locale" -#: common-cmds.h:22 +#: common-cmds.h:32 msgid "Update remote refs along with associated objects" msgstr "Mettre à jour les références distantes ainsi que les objets associés" -#: common-cmds.h:23 +#: common-cmds.h:33 msgid "Forward-port local commits to the updated upstream head" msgstr "" "Reporter les validations locales sur le sommet mis à jour d'une branche amont" -#: common-cmds.h:24 +#: common-cmds.h:34 msgid "Reset current HEAD to the specified state" msgstr "Réinitialiser la HEAD courante à l'état spécifié" -#: common-cmds.h:25 +#: common-cmds.h:35 msgid "Remove files from the working tree and from the index" msgstr "Supprimer des fichiers de la copie de travail et de l'index" -#: common-cmds.h:26 +#: common-cmds.h:36 msgid "Show various types of objects" msgstr "Afficher différents types d'objets" -#: common-cmds.h:27 +#: common-cmds.h:37 msgid "Show the working tree status" msgstr "Afficher le statut de la copie de travail" -#: common-cmds.h:28 +#: common-cmds.h:38 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" "Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG" -#: parse-options.h:143 +#: parse-options.h:142 msgid "expiry-date" msgstr "date-d'expiration" -#: parse-options.h:158 +#: parse-options.h:157 msgid "no-op (backward compatibility)" msgstr "sans action (rétrocompatibilité)" -#: parse-options.h:232 +#: parse-options.h:231 msgid "be more verbose" msgstr "être plus verbeux" -#: parse-options.h:234 +#: parse-options.h:233 msgid "be more quiet" msgstr "être plus silencieux" -#: parse-options.h:240 +#: parse-options.h:239 msgid "use <n> digits to display SHA-1s" msgstr "utiliser <n> chiffres pour afficher les SHA-1s" @@ -10431,7 +10665,7 @@ msgstr "" msgid "You need to set your committer info first" msgstr "Vous devez d'abord définir vos informations de validateur" -#: git-am.sh:98 +#: git-am.sh:100 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10439,7 +10673,7 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: git-am.sh:108 +#: git-am.sh:110 #, sh-format msgid "" "When you have resolved this problem, run \"$cmdline --continue\".\n" @@ -10451,22 +10685,22 @@ msgstr "" "Pour restaurer la branche d'origine et stopper le patchage, lancez " "\"$cmdline --abort\"." -#: git-am.sh:124 +#: git-am.sh:126 msgid "Cannot fall back to three-way merge." msgstr "Impossible de retourner à une fusion à 3 points." -#: git-am.sh:140 +#: git-am.sh:142 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." -#: git-am.sh:142 +#: git-am.sh:144 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilisation de l'information de l'index pour reconstruire un arbre de base..." -#: git-am.sh:157 +#: git-am.sh:159 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10474,28 +10708,28 @@ msgstr "" "Avez-vous édité le patch à la main ?\n" "Il ne s'applique pas aux blobs enregistrés dans son index." -#: git-am.sh:166 +#: git-am.sh:168 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour à un patch de la base et fusion à 3 points..." -#: git-am.sh:182 +#: git-am.sh:185 msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." -#: git-am.sh:277 +#: git-am.sh:280 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" -#: git-am.sh:364 +#: git-am.sh:367 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "Le format de patch $patch_format n'est pas supporté." -#: git-am.sh:366 +#: git-am.sh:369 msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: git-am.sh:398 +#: git-am.sh:407 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." @@ -10503,17 +10737,17 @@ msgstr "" "L'option -b/--binary ne fait plus rien depuis longtemps,\n" "et elle sera supprimée. Veuillez ne plus l'utiliser." -#: git-am.sh:496 +#: git-am.sh:507 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" "le répertoire précédent de rebasage $dotest existe toujours mais mbox donnée." -#: git-am.sh:501 +#: git-am.sh:512 msgid "Please make up your mind. --skip or --abort?" msgstr "Décidez-vous. --skip ou --abort ?" -#: git-am.sh:537 +#: git-am.sh:560 #, sh-format msgid "" "Stray $dotest directory found.\n" @@ -10522,18 +10756,18 @@ msgstr "" "Répertoire abandonné $dotest trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: git-am.sh:545 +#: git-am.sh:568 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 " "reprise." -#: git-am.sh:612 +#: git-am.sh:635 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "Index sale : impossible d'appliquer des patchs (sales : $files)" -#: git-am.sh:722 +#: git-am.sh:747 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -10545,32 +10779,32 @@ msgstr "" "Pour restaurer la branche d'origine et stopper le patchage, lancez " "\"$cmdline --abort\"." -#: git-am.sh:749 +#: git-am.sh:774 msgid "Patch does not have a valid e-mail address." msgstr "Le patch n'a pas d'adresse e-mail valide." -#: git-am.sh:796 +#: git-am.sh:821 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "impossible d'être interactif sans entrée standard connectée à un terminal." -#: git-am.sh:800 +#: git-am.sh:825 msgid "Commit Body is:" msgstr "Le corps de la validation est :" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:807 +#: git-am.sh:832 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 " -#: git-am.sh:843 +#: git-am.sh:868 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Application : $FIRSTLINE" -#: git-am.sh:864 +#: git-am.sh:889 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10581,7 +10815,7 @@ msgstr "" "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: git-am.sh:872 +#: git-am.sh:897 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" @@ -10589,16 +10823,16 @@ msgstr "" "Vous avez toujours des chemins non fusionnés dans votre index\n" "auriez-vous oublié de faire 'git add' ?" -#: git-am.sh:888 +#: git-am.sh:913 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: git-am.sh:898 +#: git-am.sh:923 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Le patch a échoué à $msgnum $FIRSTLINE" -#: git-am.sh:901 +#: git-am.sh:926 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" @@ -10607,7 +10841,7 @@ msgstr "" "La copie du patch qui a échoué se trouve dans :\n" " $dotest/patch" -#: git-am.sh:919 +#: git-am.sh:945 msgid "applying to an empty history" msgstr "application à un historique vide" @@ -10766,7 +11000,7 @@ msgstr "" msgid "bisect run success" msgstr "succès de la bissection" -#: git-pull.sh:21 +#: git-pull.sh:61 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" @@ -10777,11 +11011,11 @@ msgstr "" "rm <fichier>'\n" "si nécessaire pour marquer comme résolu et valider." -#: git-pull.sh:25 +#: git-pull.sh:65 msgid "Pull is not possible because you have unmerged files." msgstr "Le pull n'est pas possible car vous avez des fichiers non fusionnés." -#: git-pull.sh:31 +#: git-pull.sh:71 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -10789,13 +11023,13 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos changements avant de pouvoir fusionner." -#: git-pull.sh:245 +#: git-pull.sh:285 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" -#: git-pull.sh:269 +#: git-pull.sh:311 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -10806,11 +11040,11 @@ msgstr "" "Attention : mise à jour en avance rapide de votre copie de travail\n" "Attention : depuis la validation $orig_head." -#: git-pull.sh:294 +#: git-pull.sh:336 msgid "Cannot merge multiple branches into empty head" msgstr "Impossible de fusionner de multiples branches sur une tête vide" -#: git-pull.sh:298 +#: git-pull.sh:340 msgid "Cannot rebase onto multiple branches" msgstr "Impossible de rebaser sur de multiples branches" @@ -11012,7 +11246,7 @@ msgstr "Impossible de mettre à jour $ref_stash avec $w_commit" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:238 +#: git-stash.sh:241 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -11021,85 +11255,90 @@ msgstr "" "erreur: option inconnue pour 'stash save': $option\n" " Pour fournir un message, utilisez git stash save -- '$option'" -#: git-stash.sh:259 +#: git-stash.sh:262 msgid "No local changes to save" msgstr "Pas de modifications locales à sauver" -#: git-stash.sh:263 +#: git-stash.sh:266 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: git-stash.sh:267 +#: git-stash.sh:270 msgid "Cannot save the current status" msgstr "Impossible de sauver le statut courant" -#: git-stash.sh:285 +#: git-stash.sh:288 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: git-stash.sh:384 +#: git-stash.sh:389 +#, sh-format +msgid "unknown option: $opt" +msgstr "option inconnue : $opt" + +#: git-stash.sh:399 msgid "No stash found." msgstr "Pas de remisage trouvé." -#: git-stash.sh:391 +#: git-stash.sh:406 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Trop de révisions spécifiées : $REV" -#: git-stash.sh:397 +#: git-stash.sh:412 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference n'est pas une référence valide" -#: git-stash.sh:425 +#: git-stash.sh:440 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' n'est pas une validation de type remisage" -#: git-stash.sh:436 +#: git-stash.sh:451 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' n'est pas une référence de remisage" -#: git-stash.sh:444 +#: git-stash.sh:459 msgid "unable to refresh index" msgstr "impossible de rafraîchir l'index" -#: git-stash.sh:448 +#: git-stash.sh:463 msgid "Cannot apply a stash in the middle of a merge" msgstr "Impossible d'appliquer un remisage en cours de fusion" -#: git-stash.sh:456 +#: git-stash.sh:471 msgid "Conflicts in index. Try without --index." msgstr "Conflits dans l'index. Essayez sans --index." -#: git-stash.sh:458 +#: git-stash.sh:473 msgid "Could not save index tree" msgstr "Impossible de sauvegarder l'arbre d'index" -#: git-stash.sh:492 +#: git-stash.sh:507 msgid "Cannot unstage modified files" msgstr "Impossible de désindexer les fichiers modifiés" -#: git-stash.sh:507 +#: git-stash.sh:522 msgid "Index was not unstashed." msgstr "L'index n'a pas été sorti de remise." -#: git-stash.sh:530 +#: git-stash.sh:545 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} supprimé ($s)" -#: git-stash.sh:531 +#: git-stash.sh:546 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Impossible de supprimer l'élément de stash" -#: git-stash.sh:539 +#: git-stash.sh:554 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: git-stash.sh:611 +#: git-stash.sh:626 msgid "(To restore them type \"git stash apply\")" msgstr "(Pour les restaurer tapez \"git stash apply\")" @@ -11420,6 +11659,18 @@ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'" msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" +#~ msgid "The most commonly used git commands are:" +#~ msgstr "Les commandes git les plus utilisées sont :" + +#~ msgid "No such branch: '%s'" +#~ msgstr "Branche inconnue : '%s'" + +#~ msgid "Could not create git link %s" +#~ msgstr "Impossible de créer le lien git %s" + +#~ msgid "Invalid gc.pruneexpire: '%s'" +#~ msgstr "gc.pruneexpire invalide : '%s'" + #~ msgid "server does not support --atomic push" #~ msgstr "le serveur ne gère pas push --atomic" @@ -11465,9 +11716,6 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" #~ msgid "cannot update HEAD ref" #~ msgstr "impossible de mettre à jour la référence HEAD" -#~ msgid "Invalid %s: '%s'" -#~ msgstr "%s invalide : '%s'" - #~ msgid "cannot tell cwd" #~ msgstr "impossible de déterminer le répertoire de travail courant" diff --git a/po/git.pot b/po/git.pot index c94a95591f..c1855b9617 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: 2015-04-03 08:13+0800\n" +"POT-Creation-Date: 2015-06-27 19:17+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" @@ -46,7 +46,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -69,9 +69,9 @@ msgstr "" #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150 msgid "file" msgstr "" @@ -103,7 +103,7 @@ msgstr "" msgid "list supported archive formats" msgstr "" -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77 msgid "repo" msgstr "" @@ -119,7 +119,7 @@ msgstr "" msgid "path to the remote git-upload-archive command" msgstr "" -#: attr.c:264 +#: attr.c:265 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -246,8 +246,8 @@ msgid "Repository lacks these prerequisite commits:" msgstr "" #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 -#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 +#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330 +#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "" @@ -490,27 +490,35 @@ msgid "" "%s" msgstr "" -#: diff.c:2956 +#: diff.c:2997 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:3351 +#: diff.c:3393 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:3514 +#: diff.c:3556 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3528 +#: diff.c:3570 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" +#: dir.c:1852 +msgid "failed to get kernel name and information" +msgstr "" + +#: dir.c:1945 +msgid "Untracked cache is disabled on this system." +msgstr "" + #: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "" @@ -557,39 +565,39 @@ msgstr "" msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:230 -msgid "The most commonly used git commands are:" +#: help.c:246 +msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:289 +#: help.c:311 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" -#: help.c:346 +#: help.c:368 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:368 +#: help.c:390 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" msgstr "" -#: help.c:373 +#: help.c:395 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" -#: help.c:380 +#: help.c:402 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:384 help.c:444 +#: help.c:406 help.c:466 msgid "" "\n" "Did you mean this?" @@ -599,16 +607,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:440 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "" -#: lockfile.c:283 +#: lockfile.c:345 msgid "BUG: reopen a lockfile that is still open" msgstr "" -#: lockfile.c:285 +#: lockfile.c:347 msgid "BUG: reopen a lockfile that has been committed" msgstr "" @@ -616,8 +624,8 @@ msgstr "" msgid "failed to read the cache" msgstr "" -#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580 -#: builtin/clone.c:662 +#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594 +#: builtin/clone.c:654 msgid "unable to write new index file" msgstr "" @@ -635,233 +643,233 @@ msgstr "" msgid "error building trees" msgstr "" -#: merge-recursive.c:688 +#: merge-recursive.c:687 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:699 +#: merge-recursive.c:698 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:713 merge-recursive.c:734 +#: merge-recursive.c:712 merge-recursive.c:733 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:724 +#: merge-recursive.c:723 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:764 +#: merge-recursive.c:763 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:766 +#: merge-recursive.c:765 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:789 builtin/clone.c:321 +#: merge-recursive.c:788 builtin/clone.c:313 #, c-format msgid "failed to open '%s'" msgstr "" -#: merge-recursive.c:797 +#: merge-recursive.c:796 #, c-format msgid "failed to symlink '%s'" msgstr "" -#: merge-recursive.c:800 +#: merge-recursive.c:799 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:938 +#: merge-recursive.c:937 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:942 +#: merge-recursive.c:941 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:958 +#: merge-recursive.c:957 msgid "unsupported object type in the tree" msgstr "" -#: merge-recursive.c:1033 merge-recursive.c:1047 +#: merge-recursive.c:1032 merge-recursive.c:1046 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1039 merge-recursive.c:1052 +#: merge-recursive.c:1038 merge-recursive.c:1051 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "rename" msgstr "" -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "renamed" msgstr "" -#: merge-recursive.c:1149 +#: merge-recursive.c:1148 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1171 +#: merge-recursive.c:1170 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1176 +#: merge-recursive.c:1175 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1230 +#: merge-recursive.c:1229 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1260 +#: merge-recursive.c:1259 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1459 +#: merge-recursive.c:1458 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1469 +#: merge-recursive.c:1468 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1474 merge-recursive.c:1672 +#: merge-recursive.c:1473 merge-recursive.c:1671 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1525 +#: merge-recursive.c:1524 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1528 +#: merge-recursive.c:1527 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modify" msgstr "" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modified" msgstr "" -#: merge-recursive.c:1586 +#: merge-recursive.c:1585 msgid "content" msgstr "" -#: merge-recursive.c:1593 +#: merge-recursive.c:1592 msgid "add/add" msgstr "" -#: merge-recursive.c:1627 +#: merge-recursive.c:1626 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1641 +#: merge-recursive.c:1640 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1645 git-submodule.sh:1150 +#: merge-recursive.c:1644 git-submodule.sh:1150 msgid "submodule" msgstr "" -#: merge-recursive.c:1646 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1732 +#: merge-recursive.c:1731 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1757 +#: merge-recursive.c:1756 msgid "file/directory" msgstr "" -#: merge-recursive.c:1763 +#: merge-recursive.c:1762 msgid "directory/file" msgstr "" -#: merge-recursive.c:1768 +#: merge-recursive.c:1767 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1778 +#: merge-recursive.c:1777 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1795 +#: merge-recursive.c:1794 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1814 +#: merge-recursive.c:1813 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1823 +#: merge-recursive.c:1822 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1853 +#: merge-recursive.c:1852 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1901 +#: merge-recursive.c:1900 msgid "Merging:" msgstr "" -#: merge-recursive.c:1914 +#: merge-recursive.c:1913 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1951 +#: merge-recursive.c:1950 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2008 +#: merge-recursive.c:2007 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2019 builtin/merge.c:667 +#: merge-recursive.c:2018 builtin/merge.c:645 msgid "Unable to write index." msgstr "" @@ -886,7 +894,7 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "" -#: object.c:241 +#: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "" @@ -980,69 +988,111 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "" -#: progress.c:225 +#: progress.c:236 msgid "done" msgstr "" -#: read-cache.c:1275 +#: read-cache.c:1295 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1285 +#: read-cache.c:1305 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: remote.c:782 +#: remote.c:792 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:786 +#: remote.c:796 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:790 +#: remote.c:800 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:798 +#: remote.c:808 msgid "Internal error" msgstr "" -#: remote.c:1980 +#: remote.c:1723 remote.c:1766 +msgid "HEAD does not point to a branch" +msgstr "" + +#: remote.c:1732 +#, c-format +msgid "no such branch: '%s'" +msgstr "" + +#: remote.c:1735 +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "" + +#: remote.c:1741 +#, c-format +msgid "upstream branch '%s' not stored as a remote-tracking branch" +msgstr "" + +#: remote.c:1756 +#, c-format +msgid "push destination '%s' on remote '%s' has no local tracking branch" +msgstr "" + +#: remote.c:1771 +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "" + +#: remote.c:1782 +#, c-format +msgid "push refspecs for '%s' do not include '%s'" +msgstr "" + +#: remote.c:1795 +msgid "push has no destination (push.default is 'nothing')" +msgstr "" + +#: remote.c:1817 +msgid "cannot resolve 'simple' push to a single destination" +msgstr "" + +#: remote.c:2124 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:1984 +#: remote.c:2128 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:1987 +#: remote.c:2131 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" -#: remote.c:1991 +#: remote.c:2135 #, 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:1997 +#: remote.c:2141 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2000 +#: remote.c:2144 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1050,11 +1100,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2008 +#: remote.c:2152 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2011 +#: remote.c:2155 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1065,11 +1115,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2021 +#: remote.c:2165 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2348 +#: revision.c:2366 msgid "--first-parent is incompatible with --bisect" msgstr "" @@ -1086,22 +1136,22 @@ msgstr "" msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:356 +#: send-pack.c:378 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:366 +#: send-pack.c:389 msgid "the receiving end does not support --atomic push" msgstr "" -#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 -#: builtin/merge.c:1005 +#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 -#: builtin/merge.c:1010 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 +#: builtin/merge.c:988 #, c-format msgid "Could not write to '%s'" msgstr "" @@ -1294,7 +1344,7 @@ msgstr "" msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:908 builtin/apply.c:4288 +#: sequencer.c:908 builtin/apply.c:4291 #, c-format msgid "cannot open %s: %s" msgstr "" @@ -1336,7 +1386,12 @@ msgstr "" msgid "Can't cherry-pick into empty head" msgstr "" -#: sha1_name.c:440 +#: setup.c:243 +#, c-format +msgid "failed to read %s" +msgstr "" + +#: sha1_name.c:453 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" @@ -1349,25 +1404,6 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: sha1_name.c:1068 -msgid "HEAD does not point to a branch" -msgstr "" - -#: sha1_name.c:1071 -#, c-format -msgid "No such branch: '%s'" -msgstr "" - -#: sha1_name.c:1073 -#, c-format -msgid "No upstream configured for branch '%s'" -msgstr "" - -#: sha1_name.c:1077 -#, c-format -msgid "Upstream branch '%s' not stored as a remote-tracking branch" -msgstr "" - #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -1391,12 +1427,7 @@ msgstr "" msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:1109 builtin/init-db.c:371 -#, c-format -msgid "Could not create git link %s" -msgstr "" - -#: submodule.c:1120 +#: submodule.c:1115 #, c-format msgid "Could not set core.worktree in %s" msgstr "" @@ -1426,7 +1457,7 @@ msgstr "" msgid "could not read from stdin" msgstr "" -#: unpack-trees.c:202 +#: unpack-trees.c:203 msgid "Checking out files" msgstr "" @@ -1482,6 +1513,21 @@ msgstr "" msgid "unable to get current working directory" msgstr "" +#: wrapper.c:575 +#, c-format +msgid "could not open %s for writing" +msgstr "" + +#: wrapper.c:587 +#, c-format +msgid "could not write to %s" +msgstr "" + +#: wrapper.c:593 +#, c-format +msgid "could not close %s" +msgstr "" + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "" @@ -1507,11 +1553,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:198 wt-status.c:878 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:216 wt-status.c:887 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "" @@ -1619,193 +1665,193 @@ msgstr "" msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:753 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:755 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:835 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" -#: wt-status.c:946 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:949 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:952 +#: wt-status.c:955 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:955 +#: wt-status.c:958 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:965 +#: wt-status.c:968 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:968 +#: wt-status.c:971 msgid "The current patch is empty." msgstr "" -#: wt-status.c:972 +#: wt-status.c:975 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:974 +#: wt-status.c:977 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:976 +#: wt-status.c:979 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1036 wt-status.c:1053 +#: wt-status.c:1039 wt-status.c:1056 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1041 wt-status.c:1058 +#: wt-status.c:1044 wt-status.c:1061 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1044 +#: wt-status.c:1047 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1046 +#: wt-status.c:1049 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1048 +#: wt-status.c:1051 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1061 +#: wt-status.c:1064 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1065 +#: wt-status.c:1068 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1070 +#: wt-status.c:1073 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1073 +#: wt-status.c:1076 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1077 +#: wt-status.c:1080 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1082 +#: wt-status.c:1085 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1085 +#: wt-status.c:1088 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1087 +#: wt-status.c:1090 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1097 +#: wt-status.c:1100 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1102 +#: wt-status.c:1105 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1105 +#: wt-status.c:1108 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1107 +#: wt-status.c:1110 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1116 +#: wt-status.c:1119 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1121 +#: wt-status.c:1124 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1124 +#: wt-status.c:1127 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1126 +#: wt-status.c:1129 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1137 +#: wt-status.c:1140 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1141 +#: wt-status.c:1144 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1144 +#: wt-status.c:1147 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1321 +#: wt-status.c:1324 msgid "On branch " msgstr "" -#: wt-status.c:1328 +#: wt-status.c:1331 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1333 +#: wt-status.c:1336 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1335 +#: wt-status.c:1338 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1338 +#: wt-status.c:1341 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1355 +#: wt-status.c:1358 msgid "Initial commit" msgstr "" -#: wt-status.c:1369 +#: wt-status.c:1372 msgid "Untracked files" msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1374 msgid "Ignored files" msgstr "" -#: wt-status.c:1375 +#: wt-status.c:1378 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1813,78 +1859,78 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1381 +#: wt-status.c:1384 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1383 +#: wt-status.c:1386 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1389 +#: wt-status.c:1392 msgid "No changes" msgstr "" -#: wt-status.c:1394 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1397 +#: wt-status.c:1400 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1400 +#: wt-status.c:1403 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1403 +#: wt-status.c:1406 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1406 +#: wt-status.c:1409 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1409 wt-status.c:1414 +#: wt-status.c:1412 wt-status.c:1417 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1412 +#: wt-status.c:1415 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1416 +#: wt-status.c:1419 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1525 +#: wt-status.c:1528 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1531 +#: wt-status.c:1534 msgid "Initial commit on " msgstr "" -#: wt-status.c:1563 +#: wt-status.c:1561 msgid "gone" msgstr "" -#: wt-status.c:1565 wt-status.c:1573 +#: wt-status.c:1563 wt-status.c:1571 msgid "behind " msgstr "" -#: compat/precompose_utf8.c:55 builtin/clone.c:360 +#: compat/precompose_utf8.c:55 builtin/clone.c:352 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -1911,7 +1957,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:194 builtin/rev-parse.c:785 +#: builtin/add.c:194 builtin/rev-parse.c:796 msgid "Could not read the index" msgstr "" @@ -1924,113 +1970,117 @@ msgstr "" msgid "Could not write patch" msgstr "" -#: builtin/add.c:214 +#: builtin/add.c:212 +msgid "editing patch failed" +msgstr "" + +#: builtin/add.c:215 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:216 +#: builtin/add.c:217 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:221 +#: builtin/add.c:222 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:231 +#: builtin/add.c:232 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 -#: builtin/rm.c:269 +#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369 +#: builtin/rm.c:268 msgid "dry run" msgstr "" -#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "" -#: builtin/add.c:251 +#: builtin/add.c:252 msgid "interactive picking" msgstr "" -#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:253 +#: builtin/add.c:254 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:254 +#: builtin/add.c:255 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:255 +#: builtin/add.c:256 msgid "update tracked files" msgstr "" -#: builtin/add.c:256 +#: builtin/add.c:257 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:257 +#: builtin/add.c:258 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:260 +#: builtin/add.c:261 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:262 +#: builtin/add.c:263 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:263 +#: builtin/add.c:264 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:264 +#: builtin/add.c:265 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:286 +#: builtin/add.c:287 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:293 +#: builtin/add.c:294 msgid "adding files failed" msgstr "" -#: builtin/add.c:329 +#: builtin/add.c:330 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:336 +#: builtin/add.c:337 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:357 +#: builtin/add.c:358 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:358 +#: builtin/add.c:359 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 msgid "index file corrupt" msgstr "" -#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "" @@ -2104,413 +2154,413 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1656 +#: builtin/apply.c:1659 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1658 +#: builtin/apply.c:1661 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1684 +#: builtin/apply.c:1687 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1720 +#: builtin/apply.c:1723 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1722 +#: builtin/apply.c:1725 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1725 +#: builtin/apply.c:1728 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1871 +#: builtin/apply.c:1874 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: builtin/apply.c:1900 +#: builtin/apply.c:1903 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:2051 +#: builtin/apply.c:2054 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2141 +#: builtin/apply.c:2144 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2145 +#: builtin/apply.c:2148 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2778 +#: builtin/apply.c:2781 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2897 +#: builtin/apply.c:2900 #, 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:2909 +#: builtin/apply.c:2912 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2915 +#: builtin/apply.c:2918 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2935 +#: builtin/apply.c:2938 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:3036 +#: builtin/apply.c:3039 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:3042 +#: builtin/apply.c:3045 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:3063 +#: builtin/apply.c:3066 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3187 +#: builtin/apply.c:3190 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 +#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3240 +#: builtin/apply.c:3243 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: builtin/apply.c:3268 builtin/apply.c:3490 +#: builtin/apply.c:3271 builtin/apply.c:3493 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3349 builtin/apply.c:3504 +#: builtin/apply.c:3352 builtin/apply.c:3507 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 +#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3358 builtin/apply.c:3512 +#: builtin/apply.c:3361 builtin/apply.c:3515 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3460 +#: builtin/apply.c:3463 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3529 +#: builtin/apply.c:3532 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3531 +#: builtin/apply.c:3534 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3690 builtin/apply.c:3692 +#: builtin/apply.c:3693 builtin/apply.c:3695 #, c-format msgid "invalid path '%s'" msgstr "" -#: builtin/apply.c:3747 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3750 +#: builtin/apply.c:3753 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3770 +#: builtin/apply.c:3773 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3775 +#: builtin/apply.c:3778 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3795 +#: builtin/apply.c:3798 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: builtin/apply.c:3799 +#: builtin/apply.c:3802 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3813 +#: builtin/apply.c:3816 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:4049 +#: builtin/apply.c:4052 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:4078 +#: builtin/apply.c:4081 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: builtin/apply.c:4082 +#: builtin/apply.c:4085 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:4087 +#: builtin/apply.c:4090 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:4090 builtin/apply.c:4198 +#: builtin/apply.c:4093 builtin/apply.c:4201 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:4123 +#: builtin/apply.c:4126 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:4172 +#: builtin/apply.c:4175 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:4259 +#: builtin/apply.c:4262 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:4267 +#: builtin/apply.c:4270 msgid "internal error" msgstr "" -#: builtin/apply.c:4270 +#: builtin/apply.c:4273 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4280 +#: builtin/apply.c:4283 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4301 +#: builtin/apply.c:4304 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4304 +#: builtin/apply.c:4307 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4394 +#: builtin/apply.c:4397 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4405 +#: builtin/apply.c:4408 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85 #: builtin/fetch.c:92 msgid "path" msgstr "" -#: builtin/apply.c:4523 +#: builtin/apply.c:4526 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4526 +#: builtin/apply.c:4529 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4528 +#: builtin/apply.c:4531 msgid "num" msgstr "" -#: builtin/apply.c:4529 +#: builtin/apply.c:4532 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4532 +#: builtin/apply.c:4535 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4534 +#: builtin/apply.c:4537 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4538 +#: builtin/apply.c:4541 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4540 +#: builtin/apply.c:4543 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4542 +#: builtin/apply.c:4545 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4544 +#: builtin/apply.c:4547 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4546 +#: builtin/apply.c:4549 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4548 +#: builtin/apply.c:4551 msgid "accept a patch that touches outside the working area" msgstr "" -#: builtin/apply.c:4550 +#: builtin/apply.c:4553 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4552 +#: builtin/apply.c:4555 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4554 +#: builtin/apply.c:4557 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 +#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4559 +#: builtin/apply.c:4562 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4560 +#: builtin/apply.c:4563 msgid "action" msgstr "" -#: builtin/apply.c:4561 +#: builtin/apply.c:4564 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4564 builtin/apply.c:4567 +#: builtin/apply.c:4567 builtin/apply.c:4570 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4570 +#: builtin/apply.c:4573 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4572 +#: builtin/apply.c:4575 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4574 +#: builtin/apply.c:4577 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4576 +#: builtin/apply.c:4579 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4579 +#: builtin/apply.c:4582 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4582 +#: builtin/apply.c:4585 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4584 +#: builtin/apply.c:4587 msgid "root" msgstr "" -#: builtin/apply.c:4585 +#: builtin/apply.c:4588 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4607 +#: builtin/apply.c:4610 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4615 +#: builtin/apply.c:4618 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4618 +#: builtin/apply.c:4621 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4637 +#: builtin/apply.c:4640 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4651 +#: builtin/apply.c:4654 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4657 builtin/apply.c:4667 +#: builtin/apply.c:4660 builtin/apply.c:4670 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2564,11 +2614,11 @@ msgstr "" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/blame.c:30 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +#: builtin/blame.c:31 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "" -#: builtin/blame.c:35 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "" @@ -2690,376 +2740,376 @@ msgstr "" msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" -#: builtin/branch.c:152 +#: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:156 +#: builtin/branch.c:154 #, 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:170 +#: builtin/branch.c:168 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:174 +#: builtin/branch.c:172 #, 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:187 +#: builtin/branch.c:185 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:215 +#: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:221 +#: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:229 +#: builtin/branch.c:227 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" -#: builtin/branch.c:245 +#: builtin/branch.c:243 #, c-format -msgid "remote branch '%s' not found." +msgid "remote-tracking branch '%s' not found." msgstr "" -#: builtin/branch.c:246 +#: builtin/branch.c:244 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:260 +#: builtin/branch.c:258 #, c-format -msgid "Error deleting remote branch '%s'" +msgid "Error deleting remote-tracking branch '%s'" msgstr "" -#: builtin/branch.c:261 +#: builtin/branch.c:259 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:268 +#: builtin/branch.c:266 #, c-format -msgid "Deleted remote branch %s (was %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:269 +#: builtin/branch.c:267 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:370 +#: builtin/branch.c:368 #, c-format msgid "branch '%s' does not point at a commit" msgstr "" -#: builtin/branch.c:459 +#: builtin/branch.c:451 #, c-format msgid "[%s: gone]" msgstr "" -#: builtin/branch.c:464 +#: builtin/branch.c:456 #, c-format msgid "[%s]" msgstr "" -#: builtin/branch.c:469 +#: builtin/branch.c:461 #, c-format msgid "[%s: behind %d]" msgstr "" -#: builtin/branch.c:471 +#: builtin/branch.c:463 #, c-format msgid "[behind %d]" msgstr "" -#: builtin/branch.c:475 +#: builtin/branch.c:467 #, c-format msgid "[%s: ahead %d]" msgstr "" -#: builtin/branch.c:477 +#: builtin/branch.c:469 #, c-format msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:480 +#: builtin/branch.c:472 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:483 +#: builtin/branch.c:475 #, c-format msgid "[ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:496 +#: builtin/branch.c:488 msgid " **** invalid ref ****" msgstr "" -#: builtin/branch.c:587 +#: builtin/branch.c:579 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: builtin/branch.c:590 +#: builtin/branch.c:582 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" -#: builtin/branch.c:596 +#: builtin/branch.c:588 #, c-format msgid "(HEAD detached at %s)" msgstr "" -#: builtin/branch.c:599 +#: builtin/branch.c:591 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: builtin/branch.c:603 +#: builtin/branch.c:595 msgid "(no branch)" msgstr "" -#: builtin/branch.c:650 +#: builtin/branch.c:642 #, c-format msgid "object '%s' does not point to a commit" msgstr "" -#: builtin/branch.c:698 +#: builtin/branch.c:690 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:711 +#: builtin/branch.c:703 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:721 +#: builtin/branch.c:713 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:736 +#: builtin/branch.c:728 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:740 +#: builtin/branch.c:732 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:744 +#: builtin/branch.c:736 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:751 +#: builtin/branch.c:743 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:766 +#: builtin/branch.c:758 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:790 +#: builtin/branch.c:780 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:820 +#: builtin/branch.c:810 msgid "Generic options" msgstr "" -#: builtin/branch.c:822 +#: builtin/branch.c:812 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:823 +#: builtin/branch.c:813 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:824 +#: builtin/branch.c:814 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:826 +#: builtin/branch.c:816 msgid "change upstream info" msgstr "" -#: builtin/branch.c:830 +#: builtin/branch.c:820 msgid "use colored output" msgstr "" -#: builtin/branch.c:831 +#: builtin/branch.c:821 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 -#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 -#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 +#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851 +#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "" -#: builtin/branch.c:835 builtin/branch.c:841 +#: builtin/branch.c:825 builtin/branch.c:831 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:847 +#: builtin/branch.c:837 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:848 +#: builtin/branch.c:838 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:850 +#: builtin/branch.c:840 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:851 +#: builtin/branch.c:841 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:852 +#: builtin/branch.c:842 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:853 +#: builtin/branch.c:843 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:854 +#: builtin/branch.c:844 msgid "list branch names" msgstr "" -#: builtin/branch.c:855 +#: builtin/branch.c:845 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:857 +#: builtin/branch.c:847 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:858 +#: builtin/branch.c:848 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:861 +#: builtin/branch.c:851 msgid "print only not merged branches" msgstr "" -#: builtin/branch.c:867 +#: builtin/branch.c:857 msgid "print only merged branches" msgstr "" -#: builtin/branch.c:871 +#: builtin/branch.c:861 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:884 +#: builtin/branch.c:874 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:888 builtin/clone.c:637 +#: builtin/branch.c:878 builtin/clone.c:629 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:910 +#: builtin/branch.c:900 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:921 builtin/branch.c:960 +#: builtin/branch.c:911 builtin/branch.c:950 msgid "branch name required" msgstr "" -#: builtin/branch.c:936 +#: builtin/branch.c:926 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:941 +#: builtin/branch.c:931 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:948 +#: builtin/branch.c:938 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:951 +#: builtin/branch.c:941 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:966 +#: builtin/branch.c:956 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:971 +#: builtin/branch.c:961 msgid "too many branches to set new upstream" msgstr "" -#: builtin/branch.c:975 +#: builtin/branch.c:965 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 +#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:982 +#: builtin/branch.c:972 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:994 +#: builtin/branch.c:984 msgid "too many branches to unset upstream" msgstr "" -#: builtin/branch.c:998 +#: builtin/branch.c:988 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:1004 +#: builtin/branch.c:994 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:1018 +#: builtin/branch.c:1008 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:1024 +#: builtin/branch.c:1014 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:1027 +#: builtin/branch.c:1017 #, 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:1044 +#: builtin/branch.c:1034 #, c-format msgid "" "\n" @@ -3067,69 +3117,81 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:1045 +#: builtin/branch.c:1035 #, c-format msgid " git branch -d %s\n" msgstr "" -#: builtin/branch.c:1046 +#: builtin/branch.c:1036 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr "" -#: builtin/bundle.c:47 +#: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" msgstr "" -#: builtin/bundle.c:56 +#: builtin/bundle.c:64 msgid "Need a repository to create a bundle." msgstr "" -#: builtin/bundle.c:60 +#: builtin/bundle.c:68 msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:326 -msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" +#: builtin/cat-file.c:369 +msgid "" +"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" +"<type>|--textconv) <object>" msgstr "" -#: builtin/cat-file.c:327 -msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +#: builtin/cat-file.c:370 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-" +"objects>" msgstr "" -#: builtin/cat-file.c:364 +#: builtin/cat-file.c:407 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:365 +#: builtin/cat-file.c:408 msgid "show object type" msgstr "" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:409 msgid "show object size" msgstr "" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:411 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:412 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:414 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:416 +msgid "allow -s and -t to work with broken/corrupt objects" +msgstr "" + +#: builtin/cat-file.c:418 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:421 msgid "show info about objects fed from the standard input" msgstr "" +#: builtin/cat-file.c:424 +msgid "follow in-tree symlinks (used with --batch or --batch-check)" +msgstr "" + #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "" @@ -3146,7 +3208,7 @@ msgstr "" msgid "use .gitattributes only from the index" msgstr "" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96 msgid "read file names from stdin" msgstr "" @@ -3154,7 +3216,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274 +#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279 msgid "suppress progress reporting" msgstr "" @@ -3251,113 +3313,113 @@ msgstr "" msgid "copy out the files from named stage" msgstr "" -#: builtin/checkout.c:25 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "" -#: builtin/checkout.c:132 builtin/checkout.c:165 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:150 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:194 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:211 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:228 +#: builtin/checkout.c:234 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255 -#: builtin/checkout.c:258 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 builtin/checkout.c:277 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:261 builtin/checkout.c:264 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:267 +#: builtin/checkout.c:273 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:278 builtin/checkout.c:467 +#: builtin/checkout.c:287 builtin/checkout.c:481 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:338 builtin/checkout.c:345 +#: builtin/checkout.c:347 builtin/checkout.c:354 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:489 +#: builtin/checkout.c:503 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:615 +#: builtin/checkout.c:634 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:653 +#: builtin/checkout.c:670 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:660 +#: builtin/checkout.c:677 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:663 +#: builtin/checkout.c:680 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:667 +#: builtin/checkout.c:684 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:669 builtin/checkout.c:1050 +#: builtin/checkout.c:686 builtin/checkout.c:1285 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:671 +#: builtin/checkout.c:688 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:723 +#: builtin/checkout.c:740 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:729 +#: builtin/checkout.c:746 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3372,161 +3434,206 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:747 +#: builtin/checkout.c:765 #, c-format msgid "" +"If you want to keep it by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch <new-branch-name> %s\n" +"\n" +msgid_plural "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" " git branch <new-branch-name> %s\n" "\n" -msgstr "" +msgstr[0] "" +msgstr[1] "" -#: builtin/checkout.c:777 +#: builtin/checkout.c:801 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:781 +#: builtin/checkout.c:805 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:808 builtin/checkout.c:1045 +#: builtin/checkout.c:832 builtin/checkout.c:1280 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:952 +#: builtin/checkout.c:893 +msgid "no branch specified" +msgstr "" + +#: builtin/checkout.c:895 +#, c-format +msgid "'%s' already exists" +msgstr "" + +#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842 +#: builtin/clone.c:853 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "" + +#: builtin/checkout.c:924 +#, c-format +msgid "could not create directory of '%s'" +msgstr "" + +#: builtin/checkout.c:960 +#, c-format +msgid "Enter %s (identifier %s)" +msgstr "" + +#: builtin/checkout.c:1070 +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "" + +#: builtin/checkout.c:1176 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:991 +#: builtin/checkout.c:1215 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1020 +#: builtin/checkout.c:1255 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1059 +#: builtin/checkout.c:1294 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1062 builtin/checkout.c:1066 +#: builtin/checkout.c:1297 builtin/checkout.c:1301 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078 -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313 +#: builtin/checkout.c:1316 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1086 +#: builtin/checkout.c:1321 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90 +#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "" -#: builtin/checkout.c:1109 +#: builtin/checkout.c:1347 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1349 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1112 +#: builtin/checkout.c:1350 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1351 msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1114 +#: builtin/checkout.c:1352 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1355 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1119 +#: builtin/checkout.c:1357 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1121 +#: builtin/checkout.c:1359 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1360 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1123 builtin/merge.c:227 +#: builtin/checkout.c:1361 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 +#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244 msgid "style" msgstr "" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1363 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1366 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1368 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1370 +msgid "check a branch out in a separate working directory" +msgstr "" + +#: builtin/checkout.c:1372 +msgid "do not check if another worktree is holding the given ref" +msgstr "" + +#: builtin/checkout.c:1406 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1423 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1175 +#: builtin/checkout.c:1428 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1464 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1219 +#: builtin/checkout.c:1471 #, 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:1224 +#: builtin/checkout.c:1476 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1228 +#: builtin/checkout.c:1480 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3582,36 +3689,36 @@ msgid "" " - (empty) finish selecting" msgstr "" -#: builtin/clean.c:517 +#: builtin/clean.c:515 #, c-format msgid "Huh (%s)?" msgstr "" -#: builtin/clean.c:659 +#: builtin/clean.c:657 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:696 +#: builtin/clean.c:694 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:717 +#: builtin/clean.c:715 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:756 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:783 +#: builtin/clean.c:781 msgid "Bye." msgstr "" -#: builtin/clean.c:791 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3622,68 +3729,68 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:818 +#: builtin/clean.c:816 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:819 +#: builtin/clean.c:817 msgid "What now" msgstr "" -#: builtin/clean.c:827 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:844 +#: builtin/clean.c:842 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:875 +#: builtin/clean.c:873 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:877 +#: builtin/clean.c:875 msgid "force" msgstr "" -#: builtin/clean.c:878 +#: builtin/clean.c:876 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:880 +#: builtin/clean.c:878 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 msgid "pattern" msgstr "" -#: builtin/clean.c:882 +#: builtin/clean.c:880 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:883 +#: builtin/clean.c:881 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:885 +#: builtin/clean.c:883 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:903 +#: builtin/clean.c:901 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:907 +#: builtin/clean.c:905 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:910 +#: builtin/clean.c:908 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3693,270 +3800,265 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224 #: builtin/push.c:523 msgid "force progress reporting" msgstr "" -#: builtin/clone.c:68 +#: builtin/clone.c:59 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:73 +#: builtin/clone.c:64 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:75 +#: builtin/clone.c:66 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:77 +#: builtin/clone.c:68 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:79 +#: builtin/clone.c:70 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:81 builtin/clone.c:83 +#: builtin/clone.c:72 builtin/clone.c:74 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:84 builtin/init-db.c:493 +#: builtin/clone.c:75 builtin/init-db.c:500 msgid "template-directory" msgstr "" -#: builtin/clone.c:85 builtin/init-db.c:494 +#: builtin/clone.c:76 builtin/init-db.c:501 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:87 +#: builtin/clone.c:78 msgid "reference repository" msgstr "" -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:80 +msgid "use --reference only while cloning" +msgstr "" + +#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "" -#: builtin/clone.c:89 +#: builtin/clone.c:82 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:91 +#: builtin/clone.c:84 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:93 +#: builtin/clone.c:86 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 +#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "" -#: builtin/clone.c:95 +#: builtin/clone.c:88 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:97 +#: builtin/clone.c:90 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:99 -msgid "use --reference only while cloning" -msgstr "" - -#: builtin/clone.c:100 builtin/init-db.c:502 +#: builtin/clone.c:91 builtin/init-db.c:509 msgid "gitdir" msgstr "" -#: builtin/clone.c:101 builtin/init-db.c:503 +#: builtin/clone.c:92 builtin/init-db.c:510 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:102 +#: builtin/clone.c:93 msgid "key=value" msgstr "" -#: builtin/clone.c:103 +#: builtin/clone.c:94 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:256 +#: builtin/clone.c:247 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: builtin/clone.c:260 +#: builtin/clone.c:251 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: builtin/clone.c:263 +#: builtin/clone.c:254 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: builtin/clone.c:325 +#: builtin/clone.c:317 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/clone.c:327 builtin/diff.c:84 +#: builtin/clone.c:319 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "" -#: builtin/clone.c:329 +#: builtin/clone.c:321 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:343 +#: builtin/clone.c:335 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:365 +#: builtin/clone.c:357 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:369 +#: builtin/clone.c:361 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:392 builtin/clone.c:566 +#: builtin/clone.c:384 builtin/clone.c:558 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:404 +#: builtin/clone.c:396 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:481 +#: builtin/clone.c:473 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:561 +#: builtin/clone.c:553 #, c-format msgid "Checking connectivity... " msgstr "" -#: builtin/clone.c:564 +#: builtin/clone.c:556 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:628 +#: builtin/clone.c:620 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:659 +#: builtin/clone.c:651 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:746 +#: builtin/clone.c:738 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:748 +#: builtin/clone.c:740 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:778 +#: builtin/clone.c:770 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:782 +#: builtin/clone.c:774 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:793 +#: builtin/clone.c:785 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:796 +#: builtin/clone.c:788 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:809 +#: builtin/clone.c:801 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:815 builtin/fetch.c:1156 +#: builtin/clone.c:807 builtin/fetch.c:1160 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:825 +#: builtin/clone.c:817 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:835 +#: builtin/clone.c:827 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:850 builtin/clone.c:861 -#, c-format -msgid "could not create leading directories of '%s'" -msgstr "" - -#: builtin/clone.c:853 +#: builtin/clone.c:845 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:871 +#: builtin/clone.c:863 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:873 +#: builtin/clone.c:865 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:898 +#: builtin/clone.c:890 msgid "--dissociate given, but there is no --reference" msgstr "" -#: builtin/clone.c:913 +#: builtin/clone.c:907 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:916 +#: builtin/clone.c:910 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:921 +#: builtin/clone.c:915 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:925 +#: builtin/clone.c:919 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:976 builtin/clone.c:984 +#: builtin/clone.c:968 builtin/clone.c:976 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:987 +#: builtin/clone.c:979 msgid "You appear to have cloned an empty repository." msgstr "" @@ -4155,7 +4257,7 @@ msgstr "" msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:738 +#: builtin/commit.c:738 builtin/merge.c:1079 #, c-format msgid "could not read '%s'" msgstr "" @@ -4298,32 +4400,32 @@ msgstr "" msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1324 builtin/commit.c:1604 +#: builtin/commit.c:1324 builtin/commit.c:1603 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1326 builtin/commit.c:1606 +#: builtin/commit.c:1326 builtin/commit.c:1605 msgid "show branch information" msgstr "" -#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 +#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1331 builtin/commit.c:1610 +#: builtin/commit.c:1331 builtin/commit.c:1609 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1334 builtin/commit.c:1613 +#: builtin/commit.c:1334 builtin/commit.c:1612 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "" -#: builtin/commit.c:1337 builtin/commit.c:1616 +#: builtin/commit.c:1337 builtin/commit.c:1615 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" @@ -4331,7 +4433,7 @@ msgstr "" msgid "show ignored files" msgstr "" -#: builtin/commit.c:1341 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:152 msgid "when" msgstr "" @@ -4345,202 +4447,202 @@ msgstr "" msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1431 +#: builtin/commit.c:1430 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1433 +#: builtin/commit.c:1432 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1478 +#: builtin/commit.c:1477 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1481 +#: builtin/commit.c:1480 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1574 +#: builtin/commit.c:1573 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1575 +#: builtin/commit.c:1574 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1577 +#: builtin/commit.c:1576 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1578 builtin/tag.c:601 +#: builtin/commit.c:1577 builtin/tag.c:601 msgid "read message from file" msgstr "" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "author" msgstr "" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1580 builtin/gc.c:275 +#: builtin/commit.c:1579 builtin/gc.c:280 msgid "date" msgstr "" -#: builtin/commit.c:1580 +#: builtin/commit.c:1579 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "" -#: builtin/commit.c:1581 +#: builtin/commit.c:1580 msgid "commit message" msgstr "" -#: builtin/commit.c:1582 +#: builtin/commit.c:1581 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1583 +#: builtin/commit.c:1582 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1584 +#: builtin/commit.c:1583 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1585 +#: builtin/commit.c:1584 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1586 +#: builtin/commit.c:1585 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1588 +#: builtin/commit.c:1587 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1589 +#: builtin/commit.c:1588 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1589 msgid "default" msgstr "" -#: builtin/commit.c:1590 builtin/tag.c:604 +#: builtin/commit.c:1589 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1591 +#: builtin/commit.c:1590 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "" -#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1596 +#: builtin/commit.c:1595 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1596 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1598 +#: builtin/commit.c:1597 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1599 +#: builtin/commit.c:1598 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1600 +#: builtin/commit.c:1599 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1600 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1602 +#: builtin/commit.c:1601 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1603 +#: builtin/commit.c:1602 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1614 +#: builtin/commit.c:1613 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1615 +#: builtin/commit.c:1614 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1620 +#: builtin/commit.c:1619 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1622 +#: builtin/commit.c:1621 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1651 +#: builtin/commit.c:1650 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1690 builtin/merge.c:519 +#: builtin/commit.c:1689 builtin/merge.c:1076 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1697 +#: builtin/commit.c:1696 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1704 +#: builtin/commit.c:1703 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1723 +#: builtin/commit.c:1722 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1734 +#: builtin/commit.c:1733 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1739 +#: builtin/commit.c:1738 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1787 +#: builtin/commit.c:1786 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4679,13 +4781,13 @@ msgstr "" #, c-format msgid "" "# This is Git's per-user configuration file.\n" -"[core]\n" +"[user]\n" "# Please adapt and uncomment the following lines:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" msgstr "" -#: builtin/config.c:589 +#: builtin/config.c:587 #, c-format msgid "cannot create configuration file %s" msgstr "" @@ -5009,167 +5111,167 @@ msgstr "" msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:375 +#: builtin/fetch.c:377 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:455 +#: builtin/fetch.c:457 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:460 +#: builtin/fetch.c:462 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:474 +#: builtin/fetch.c:476 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:475 builtin/fetch.c:561 +#: builtin/fetch.c:477 builtin/fetch.c:563 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:486 +#: builtin/fetch.c:488 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 +#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:506 +#: builtin/fetch.c:508 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:509 +#: builtin/fetch.c:511 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:512 +#: builtin/fetch.c:514 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "forced update" msgstr "" -#: builtin/fetch.c:563 +#: builtin/fetch.c:565 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:596 builtin/fetch.c:829 +#: builtin/fetch.c:599 builtin/fetch.c:832 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:605 +#: builtin/fetch.c:608 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:623 +#: builtin/fetch.c:626 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:711 builtin/fetch.c:794 +#: builtin/fetch.c:714 builtin/fetch.c:797 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:722 +#: builtin/fetch.c:725 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:774 +#: builtin/fetch.c:777 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:775 +#: builtin/fetch.c:778 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:799 +#: builtin/fetch.c:802 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:800 builtin/remote.c:1060 +#: builtin/fetch.c:803 builtin/remote.c:1057 msgid "(none)" msgstr "" -#: builtin/fetch.c:819 +#: builtin/fetch.c:822 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:838 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:841 +#: builtin/fetch.c:844 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:897 +#: builtin/fetch.c:900 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:1059 +#: builtin/fetch.c:1063 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1061 builtin/remote.c:90 +#: builtin/fetch.c:1065 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1079 +#: builtin/fetch.c:1083 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1106 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1144 +#: builtin/fetch.c:1148 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1146 +#: builtin/fetch.c:1150 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1173 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1171 +#: builtin/fetch.c:1175 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1182 +#: builtin/fetch.c:1186 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1190 +#: builtin/fetch.c:1194 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -5178,130 +5280,130 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 +#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590 -#: parse-options.h:132 parse-options.h:239 +#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590 +#: parse-options.h:131 parse-options.h:238 msgid "n" msgstr "" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:669 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:672 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:675 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:676 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:677 msgid "file to read from" msgstr "" -#: builtin/for-each-ref.c:675 +#: builtin/for-each-ref.c:687 msgid "unable to parse format" msgstr "" -#: builtin/for-each-ref.c:1063 +#: builtin/for-each-ref.c:1083 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1098 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:1080 +#: builtin/for-each-ref.c:1100 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:1082 +#: builtin/for-each-ref.c:1102 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:1084 +#: builtin/for-each-ref.c:1104 msgid "quote placeholders suitably for Tcl" msgstr "" -#: builtin/for-each-ref.c:1087 +#: builtin/for-each-ref.c:1107 msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:1088 builtin/replace.c:438 +#: builtin/for-each-ref.c:1108 builtin/replace.c:438 msgid "format" msgstr "" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1108 msgid "format to use for the output" msgstr "" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1109 msgid "key" msgstr "" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1110 msgid "field name to sort on" msgstr "" -#: builtin/fsck.c:147 builtin/prune.c:137 +#: builtin/fsck.c:147 builtin/prune.c:236 msgid "Checking connectivity" msgstr "" -#: builtin/fsck.c:540 +#: builtin/fsck.c:548 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:603 +#: builtin/fsck.c:611 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:609 +#: builtin/fsck.c:617 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:610 +#: builtin/fsck.c:618 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:611 +#: builtin/fsck.c:619 msgid "report tags" msgstr "" -#: builtin/fsck.c:612 +#: builtin/fsck.c:620 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:613 +#: builtin/fsck.c:621 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:614 +#: builtin/fsck.c:622 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:615 +#: builtin/fsck.c:623 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:616 +#: builtin/fsck.c:624 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:618 +#: builtin/fsck.c:626 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:619 builtin/prune.c:108 +#: builtin/fsck.c:627 builtin/prune.c:198 msgid "show progress" msgstr "" -#: builtin/fsck.c:669 +#: builtin/fsck.c:677 msgid "Checking objects" msgstr "" @@ -5309,54 +5411,54 @@ msgstr "" msgid "git gc [<options>]" msgstr "" -#: builtin/gc.c:79 +#: builtin/gc.c:67 #, c-format -msgid "Invalid gc.pruneexpire: '%s'" +msgid "Invalid %s: '%s'" msgstr "" -#: builtin/gc.c:107 +#: builtin/gc.c:112 #, c-format msgid "insanely long object directory %.*s" msgstr "" -#: builtin/gc.c:276 +#: builtin/gc.c:281 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:278 +#: builtin/gc.c:283 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:279 +#: builtin/gc.c:284 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:280 +#: builtin/gc.c:285 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:321 +#: builtin/gc.c:327 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:323 +#: builtin/gc.c:329 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:324 +#: builtin/gc.c:330 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:342 +#: builtin/gc.c:348 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:364 +#: builtin/gc.c:376 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5558,7 +5660,7 @@ msgstr "" msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:741 builtin/show-ref.c:187 +#: builtin/grep.c:741 builtin/show-ref.c:189 msgid "show usage" msgstr "" @@ -5586,42 +5688,42 @@ msgstr "" msgid "both --cached and trees are given." msgstr "" -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:80 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." msgstr "" -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:81 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "" -#: builtin/hash-object.c:94 builtin/tag.c:612 +#: builtin/hash-object.c:92 builtin/tag.c:612 msgid "type" msgstr "" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:92 msgid "object type" msgstr "" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:93 msgid "write the object into the object database" msgstr "" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:95 msgid "read the object from stdin" msgstr "" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:97 msgid "store file as is without filters" msgstr "" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:98 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:99 msgid "process file as it were from this path" msgstr "" @@ -5745,291 +5847,291 @@ msgstr "" msgid "`git %s' is aliased to `%s'" msgstr "" -#: builtin/index-pack.c:150 +#: builtin/index-pack.c:151 #, c-format msgid "unable to open %s" msgstr "" -#: builtin/index-pack.c:200 +#: builtin/index-pack.c:201 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:220 +#: builtin/index-pack.c:221 #, c-format msgid "did not receive expected object %s" msgstr "" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "object %s: expected type %s, found %s" msgstr "" -#: builtin/index-pack.c:265 +#: builtin/index-pack.c:266 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:275 +#: builtin/index-pack.c:276 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:276 +#: builtin/index-pack.c:277 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:288 +#: builtin/index-pack.c:289 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:296 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:312 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:316 +#: builtin/index-pack.c:317 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:330 +#: builtin/index-pack.c:331 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:332 +#: builtin/index-pack.c:333 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:350 +#: builtin/index-pack.c:351 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "" -#: builtin/index-pack.c:471 +#: builtin/index-pack.c:472 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:520 +#: builtin/index-pack.c:521 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:567 +#: builtin/index-pack.c:568 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:569 +#: builtin/index-pack.c:570 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:595 +#: builtin/index-pack.c:596 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715 -#: builtin/index-pack.c:749 builtin/index-pack.c:758 +#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771 +#: builtin/index-pack.c:805 builtin/index-pack.c:814 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/index-pack.c:745 builtin/pack-objects.c:162 #: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:755 +#: builtin/index-pack.c:811 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:769 +#: builtin/index-pack.c:825 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:783 +#: builtin/index-pack.c:839 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:787 +#: builtin/index-pack.c:843 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:789 +#: builtin/index-pack.c:845 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:861 builtin/index-pack.c:890 +#: builtin/index-pack.c:917 builtin/index-pack.c:948 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1081 +#: builtin/index-pack.c:1150 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1086 +#: builtin/index-pack.c:1155 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1089 +#: builtin/index-pack.c:1158 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1169 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1194 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1133 +#: builtin/index-pack.c:1205 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1247 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1181 +#: builtin/index-pack.c:1253 #, c-format msgid "completed with %d local objects" msgstr "" -#: builtin/index-pack.c:1191 +#: builtin/index-pack.c:1263 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1267 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1219 +#: builtin/index-pack.c:1291 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1367 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1322 +#: builtin/index-pack.c:1391 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1335 +#: builtin/index-pack.c:1404 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1343 +#: builtin/index-pack.c:1412 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1356 +#: builtin/index-pack.c:1425 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1436 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1469 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1475 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1658 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1537 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1539 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1517 +#: builtin/index-pack.c:1586 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1524 +#: builtin/index-pack.c:1593 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1553 +#: builtin/index-pack.c:1622 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 -#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 +#: builtin/index-pack.c:1670 builtin/index-pack.c:1673 +#: builtin/index-pack.c:1685 builtin/index-pack.c:1689 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1634 +#: builtin/index-pack.c:1703 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 +#: builtin/index-pack.c:1707 builtin/index-pack.c:1716 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1655 +#: builtin/index-pack.c:1724 msgid "--verify with no packfile name given" msgstr "" @@ -6098,22 +6200,22 @@ msgstr "" msgid "not copying templates of a wrong format version %d from '%s'" msgstr "" -#: builtin/init-db.c:197 +#: builtin/init-db.c:211 #, c-format msgid "insane git directory %s" msgstr "" -#: builtin/init-db.c:331 builtin/init-db.c:334 +#: builtin/init-db.c:343 builtin/init-db.c:346 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:363 +#: builtin/init-db.c:374 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:366 +#: builtin/init-db.c:377 #, c-format msgid "unable to move %s to %s" msgstr "" @@ -6121,59 +6223,59 @@ 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:426 +#: builtin/init-db.c:433 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Reinitialized existing" msgstr "" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Initialized empty" msgstr "" -#: builtin/init-db.c:428 +#: builtin/init-db.c:435 msgid " shared" msgstr "" -#: builtin/init-db.c:475 +#: builtin/init-db.c:482 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -#: builtin/init-db.c:498 +#: builtin/init-db.c:505 msgid "permissions" msgstr "" -#: builtin/init-db.c:499 +#: builtin/init-db.c:506 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171 +#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171 msgid "be quiet" msgstr "" -#: builtin/init-db.c:533 builtin/init-db.c:538 +#: builtin/init-db.c:540 builtin/init-db.c:545 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:542 +#: builtin/init-db.c:549 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:563 +#: builtin/init-db.c:570 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:591 +#: builtin/init-db.c:598 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -6197,7 +6299,7 @@ msgid "trailer(s) to add" msgstr "" #: builtin/log.c:41 -msgid "git log [<options>] [<revision range>] [[--] <path>...]" +msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "" #: builtin/log.c:42 @@ -6266,7 +6368,7 @@ msgstr "" msgid "Need exactly one range." msgstr "" -#: builtin/log.c:811 +#: builtin/log.c:813 msgid "Not a range." msgstr "" @@ -6466,13 +6568,13 @@ msgstr "" msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1638 +#: builtin/log.c:1637 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 +#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662 #, c-format msgid "Unknown commit %s" msgstr "" @@ -6744,40 +6846,40 @@ msgstr "" msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:559 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:654 +#: builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:678 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:692 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:705 +#: builtin/merge.c:683 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:794 +#: builtin/merge.c:772 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:803 +#: builtin/merge.c:781 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:809 +#: builtin/merge.c:787 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6787,156 +6889,161 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:833 +#: builtin/merge.c:811 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:845 +#: builtin/merge.c:823 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:900 +#: builtin/merge.c:878 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:916 +#: builtin/merge.c:894 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:957 +#: builtin/merge.c:935 msgid "No current branch." msgstr "" -#: builtin/merge.c:959 +#: builtin/merge.c:937 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:961 +#: builtin/merge.c:939 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:966 +#: builtin/merge.c:944 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1122 +#: builtin/merge.c:1081 +#, c-format +msgid "could not close '%s'" +msgstr "" + +#: builtin/merge.c:1208 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1138 +#: builtin/merge.c:1224 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1141 git-pull.sh:34 +#: builtin/merge.c:1227 git-pull.sh:74 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:1145 +#: builtin/merge.c:1231 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1148 +#: builtin/merge.c:1234 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1157 +#: builtin/merge.c:1243 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1166 +#: builtin/merge.c:1251 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1198 -msgid "Can merge only exactly one commit into empty head" -msgstr "" - -#: builtin/merge.c:1201 +#: builtin/merge.c:1268 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1203 +#: builtin/merge.c:1270 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1208 +#: builtin/merge.c:1276 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1259 +#: builtin/merge.c:1278 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:1333 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1262 +#: builtin/merge.c:1336 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1265 +#: builtin/merge.c:1339 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1268 +#: builtin/merge.c:1342 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1349 +#: builtin/merge.c:1423 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1388 +#: builtin/merge.c:1462 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1395 +#: builtin/merge.c:1469 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1427 +#: builtin/merge.c:1501 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1450 builtin/merge.c:1529 +#: builtin/merge.c:1524 builtin/merge.c:1603 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1454 +#: builtin/merge.c:1528 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1520 +#: builtin/merge.c:1594 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1522 +#: builtin/merge.c:1596 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1531 +#: builtin/merge.c:1605 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1543 +#: builtin/merge.c:1617 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7122,7 +7229,7 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 +#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361 #, c-format msgid "renaming '%s' failed" msgstr "" @@ -7481,7 +7588,7 @@ msgstr "" msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:989 builtin/remote.c:1621 +#: builtin/notes.c:989 builtin/remote.c:1618 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -7503,171 +7610,171 @@ msgstr "" msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1013 +#: builtin/pack-objects.c:1011 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2173 +#: builtin/pack-objects.c:2171 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2570 +#: builtin/pack-objects.c:2568 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2572 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2597 +#: builtin/pack-objects.c:2595 #, c-format msgid "option %s does not accept negative form" msgstr "" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2599 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2619 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2626 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:2627 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2633 +#: builtin/pack-objects.c:2631 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2660 +#: builtin/pack-objects.c:2658 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2661 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2664 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2667 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2674 parse-options.h:140 +#: builtin/pack-objects.c:2672 parse-options.h:139 msgid "time" msgstr "" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2678 +#: builtin/pack-objects.c:2676 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:2781 +#: builtin/pack-objects.c:2779 msgid "Counting objects" msgstr "" @@ -7695,18 +7802,56 @@ msgstr "" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "" -#: builtin/prune.c:106 +#: builtin/prune.c:86 +#, c-format +msgid "Removing worktrees/%s: not a valid directory" +msgstr "" + +#: builtin/prune.c:92 +#, c-format +msgid "Removing worktrees/%s: gitdir file does not exist" +msgstr "" + +#: builtin/prune.c:97 +#, c-format +msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +msgstr "" + +#: builtin/prune.c:108 +#, c-format +msgid "Removing worktrees/%s: invalid gitdir file" +msgstr "" + +#: builtin/prune.c:124 +#, c-format +msgid "Removing worktrees/%s: gitdir file points to non-existent location" +msgstr "" + +#: builtin/prune.c:159 +#, c-format +msgid "failed to remove: %s" +msgstr "" + +#: builtin/prune.c:196 msgid "do not remove, show only" msgstr "" -#: builtin/prune.c:107 +#: builtin/prune.c:197 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:110 +#: builtin/prune.c:199 +msgid "prune .git/worktrees" +msgstr "" + +#: builtin/prune.c:201 msgid "expire objects older than <time>" msgstr "" +#: builtin/prune.c:216 +msgid "--worktrees does not take extra arguments" +msgstr "" + #: builtin/push.c:14 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" @@ -8033,12 +8178,12 @@ msgstr "" msgid "debug unpack-trees" msgstr "" -#: builtin/reflog.c:429 +#: builtin/reflog.c:430 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "" -#: builtin/reflog.c:546 builtin/reflog.c:551 +#: builtin/reflog.c:547 builtin/reflog.c:552 #, c-format msgid "'%s' is not a valid timestamp" msgstr "" @@ -8170,12 +8315,12 @@ msgstr "" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:187 builtin/remote.c:643 +#: builtin/remote.c:187 builtin/remote.c:640 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:191 builtin/remote.c:647 +#: builtin/remote.c:191 builtin/remote.c:644 #, c-format msgid "'%s' is not a valid remote name" msgstr "" @@ -8198,27 +8343,27 @@ msgstr "" msgid "(delete)" msgstr "" -#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604 +#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 #, c-format msgid "Could not append '%s' to '%s'" msgstr "" -#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895 +#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892 #, c-format msgid "No such remote: %s" msgstr "" -#: builtin/remote.c:653 +#: builtin/remote.c:650 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:659 builtin/remote.c:847 +#: builtin/remote.c:656 builtin/remote.c:844 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:674 +#: builtin/remote.c:671 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8226,32 +8371,32 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:680 +#: builtin/remote.c:677 #, c-format msgid "Could not append '%s'" msgstr "" -#: builtin/remote.c:691 +#: builtin/remote.c:688 #, c-format msgid "Could not set '%s'" msgstr "" -#: builtin/remote.c:713 +#: builtin/remote.c:710 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:747 +#: builtin/remote.c:744 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:766 +#: builtin/remote.c:763 #, c-format msgid "Could not remove branch %s" msgstr "" -#: builtin/remote.c:833 +#: builtin/remote.c:830 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8261,262 +8406,262 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:948 +#: builtin/remote.c:945 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:951 +#: builtin/remote.c:948 msgid " tracked" msgstr "" -#: builtin/remote.c:953 +#: builtin/remote.c:950 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:955 +#: builtin/remote.c:952 msgid " ???" msgstr "" -#: builtin/remote.c:996 +#: builtin/remote.c:993 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:1003 +#: builtin/remote.c:1000 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:1006 +#: builtin/remote.c:1003 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:1007 +#: builtin/remote.c:1004 msgid " and with remote" msgstr "" -#: builtin/remote.c:1009 +#: builtin/remote.c:1006 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:1010 +#: builtin/remote.c:1007 msgid " and with remote" msgstr "" -#: builtin/remote.c:1056 +#: builtin/remote.c:1053 msgid "create" msgstr "" -#: builtin/remote.c:1059 +#: builtin/remote.c:1056 msgid "delete" msgstr "" -#: builtin/remote.c:1063 +#: builtin/remote.c:1060 msgid "up to date" msgstr "" -#: builtin/remote.c:1066 +#: builtin/remote.c:1063 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1069 +#: builtin/remote.c:1066 msgid "local out of date" msgstr "" -#: builtin/remote.c:1076 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1079 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1083 +#: builtin/remote.c:1080 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1086 +#: builtin/remote.c:1083 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1154 +#: builtin/remote.c:1151 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1181 +#: builtin/remote.c:1178 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1182 +#: builtin/remote.c:1179 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1183 builtin/remote.c:1334 +#: builtin/remote.c:1180 builtin/remote.c:1331 msgid "(no URL)" msgstr "" -#: builtin/remote.c:1192 builtin/remote.c:1194 +#: builtin/remote.c:1189 builtin/remote.c:1191 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200 +#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1202 +#: builtin/remote.c:1199 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1214 +#: builtin/remote.c:1211 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1217 builtin/remote.c:1244 +#: builtin/remote.c:1214 builtin/remote.c:1241 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1226 +#: builtin/remote.c:1223 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1234 +#: builtin/remote.c:1231 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1241 +#: builtin/remote.c:1238 #, 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:1262 +#: builtin/remote.c:1259 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1264 +#: builtin/remote.c:1261 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1279 +#: builtin/remote.c:1276 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1281 +#: builtin/remote.c:1278 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1291 +#: builtin/remote.c:1288 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1299 +#: builtin/remote.c:1296 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1301 +#: builtin/remote.c:1298 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1319 +#: builtin/remote.c:1316 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1320 +#: builtin/remote.c:1317 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1330 +#: builtin/remote.c:1327 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1331 +#: builtin/remote.c:1328 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1354 +#: builtin/remote.c:1351 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1357 +#: builtin/remote.c:1354 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1402 +#: builtin/remote.c:1399 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1468 builtin/remote.c:1542 +#: builtin/remote.c:1465 builtin/remote.c:1539 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1488 +#: builtin/remote.c:1485 msgid "add branch" msgstr "" -#: builtin/remote.c:1495 +#: builtin/remote.c:1492 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1517 +#: builtin/remote.c:1514 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1519 +#: builtin/remote.c:1516 msgid "add URL" msgstr "" -#: builtin/remote.c:1521 +#: builtin/remote.c:1518 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1528 +#: builtin/remote.c:1525 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1568 +#: builtin/remote.c:1565 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1576 +#: builtin/remote.c:1573 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1578 +#: builtin/remote.c:1575 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1592 +#: builtin/remote.c:1589 msgid "be verbose; must be placed before a subcommand" msgstr "" @@ -8588,7 +8733,7 @@ msgstr "" msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:375 +#: builtin/repack.c:377 #, c-format msgid "removing '%s' failed" msgstr "" @@ -8949,7 +9094,7 @@ msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -#: builtin/rm.c:231 +#: builtin/rm.c:230 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -8959,60 +9104,60 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:236 +#: builtin/rm.c:235 msgid "" "\n" "(use -f to force removal)" msgstr "" -#: builtin/rm.c:240 +#: builtin/rm.c:239 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:244 builtin/rm.c:255 +#: builtin/rm.c:243 builtin/rm.c:254 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:252 +#: builtin/rm.c:251 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:270 +#: builtin/rm.c:269 msgid "do not list removed files" msgstr "" -#: builtin/rm.c:271 +#: builtin/rm.c:270 msgid "only remove from the index" msgstr "" -#: builtin/rm.c:272 +#: builtin/rm.c:271 msgid "override the up-to-date check" msgstr "" -#: builtin/rm.c:273 +#: builtin/rm.c:272 msgid "allow recursive removal" msgstr "" -#: builtin/rm.c:275 +#: builtin/rm.c:274 msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:318 +#: builtin/rm.c:317 msgid "Please, stage your changes to .gitmodules or stash them to proceed" msgstr "" -#: builtin/rm.c:336 +#: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:375 +#: builtin/rm.c:374 #, c-format msgid "git rm: unable to remove %s" msgstr "" @@ -9058,67 +9203,67 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:659 msgid "show remote-tracking and local branches" msgstr "" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:661 msgid "show remote-tracking branches" msgstr "" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:663 msgid "color '*!+-' corresponding to the branch" msgstr "" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:665 msgid "show <n> more commits after the common ancestor" msgstr "" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:667 msgid "synonym to more=-1" msgstr "" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:668 msgid "suppress naming strings" msgstr "" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:670 msgid "include the current branch" msgstr "" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:672 msgid "name commits with their object names" msgstr "" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:674 msgid "show possible merge bases" msgstr "" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:676 msgid "show refs unreachable from any other ref" msgstr "" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:678 msgid "show commits in topological order" msgstr "" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:681 msgid "show only commits not on the first branch" msgstr "" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:683 msgid "show merges reachable from only one tip" msgstr "" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:685 msgid "topologically sort, maintaining date order where possible" msgstr "" -#: builtin/show-branch.c:681 +#: builtin/show-branch.c:688 msgid "<n>[,<base>]" msgstr "" -#: builtin/show-branch.c:682 +#: builtin/show-branch.c:689 msgid "show <n> most recent ref-log entries starting at base" msgstr "" @@ -9132,35 +9277,35 @@ msgstr "" msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:170 msgid "only show tags (can be combined with heads)" msgstr "" -#: builtin/show-ref.c:169 +#: builtin/show-ref.c:171 msgid "only show heads (can be combined with tags)" msgstr "" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:172 msgid "stricter reference checking, requires exact ref path" msgstr "" -#: builtin/show-ref.c:173 builtin/show-ref.c:175 +#: builtin/show-ref.c:175 builtin/show-ref.c:177 msgid "show the HEAD reference, even if it would be filtered out" msgstr "" -#: builtin/show-ref.c:177 +#: builtin/show-ref.c:179 msgid "dereference tags into object IDs" msgstr "" -#: builtin/show-ref.c:179 +#: builtin/show-ref.c:181 msgid "only show SHA1 hash using <n> digits" msgstr "" -#: builtin/show-ref.c:183 +#: builtin/show-ref.c:185 msgid "do not print results to stdout (useful with --verify)" msgstr "" -#: builtin/show-ref.c:185 +#: builtin/show-ref.c:187 msgid "show refs from stdin that aren't in local repository" msgstr "" @@ -9407,122 +9552,188 @@ msgstr "" msgid "Unpacking objects" msgstr "" -#: builtin/update-index.c:403 +#: builtin/update-index.c:70 +#, c-format +msgid "failed to create directory %s" +msgstr "" + +#: builtin/update-index.c:76 +#, c-format +msgid "failed to stat %s" +msgstr "" + +#: builtin/update-index.c:86 +#, c-format +msgid "failed to create file %s" +msgstr "" + +#: builtin/update-index.c:94 +#, c-format +msgid "failed to delete file %s" +msgstr "" + +#: builtin/update-index.c:101 builtin/update-index.c:203 +#, c-format +msgid "failed to delete directory %s" +msgstr "" + +#: builtin/update-index.c:124 +#, c-format +msgid "Testing " +msgstr "" + +#: builtin/update-index.c:136 +msgid "directory stat info does not change after adding a new file" +msgstr "" + +#: builtin/update-index.c:149 +msgid "directory stat info does not change after adding a new directory" +msgstr "" + +#: builtin/update-index.c:162 +msgid "directory stat info changes after updating a file" +msgstr "" + +#: builtin/update-index.c:173 +msgid "directory stat info changes after adding a file inside subdirectory" +msgstr "" + +#: builtin/update-index.c:184 +msgid "directory stat info does not change after deleting a file" +msgstr "" + +#: builtin/update-index.c:197 +msgid "directory stat info does not change after deleting a directory" +msgstr "" + +#: builtin/update-index.c:204 +msgid " OK" +msgstr "" + +#: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:757 +#: builtin/update-index.c:918 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:760 +#: builtin/update-index.c:921 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:763 +#: builtin/update-index.c:924 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:765 +#: builtin/update-index.c:926 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:767 +#: builtin/update-index.c:928 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:769 +#: builtin/update-index.c:930 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:772 +#: builtin/update-index.c:933 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:776 +#: builtin/update-index.c:937 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:780 +#: builtin/update-index.c:941 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:781 +#: builtin/update-index.c:942 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:785 +#: builtin/update-index.c:946 msgid "(+/-)x" msgstr "" -#: builtin/update-index.c:786 +#: builtin/update-index.c:947 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/update-index.c:790 +#: builtin/update-index.c:951 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:793 +#: builtin/update-index.c:954 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:796 +#: builtin/update-index.c:957 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:799 +#: builtin/update-index.c:960 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:802 +#: builtin/update-index.c:963 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:804 +#: builtin/update-index.c:965 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:806 +#: builtin/update-index.c:967 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:808 +#: builtin/update-index.c:969 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:812 +#: builtin/update-index.c:973 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:816 +#: builtin/update-index.c:977 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:820 +#: builtin/update-index.c:981 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:824 +#: builtin/update-index.c:985 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:827 +#: builtin/update-index.c:988 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:829 +#: builtin/update-index.c:990 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:833 +#: builtin/update-index.c:994 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:835 +#: builtin/update-index.c:996 msgid "enable or disable split index" msgstr "" +#: builtin/update-index.c:998 +msgid "enable/disable untracked cache" +msgstr "" + +#: builtin/update-index.c:1000 +msgid "enable untracked cache without testing the filesystem" +msgstr "" + #: builtin/update-ref.c:9 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "" @@ -9614,107 +9825,127 @@ msgid "" "to read about a specific subcommand or concept." msgstr "" -#: common-cmds.h:8 +#: common-cmds.h:10 +msgid "start a working area (see also: git help tutorial)" +msgstr "" + +#: common-cmds.h:11 +msgid "work on the current change (see also: git help everyday)" +msgstr "" + +#: common-cmds.h:12 +msgid "examine the history and state (see also: git help revisions)" +msgstr "" + +#: common-cmds.h:13 +msgid "grow, mark and tweak your common history" +msgstr "" + +#: common-cmds.h:14 +msgid "collaborate (see also: git help workflows)" +msgstr "" + +#: common-cmds.h:18 msgid "Add file contents to the index" msgstr "" -#: common-cmds.h:9 +#: common-cmds.h:19 msgid "Find by binary search the change that introduced a bug" msgstr "" -#: common-cmds.h:10 +#: common-cmds.h:20 msgid "List, create, or delete branches" msgstr "" -#: common-cmds.h:11 +#: common-cmds.h:21 msgid "Checkout a branch or paths to the working tree" msgstr "" -#: common-cmds.h:12 +#: common-cmds.h:22 msgid "Clone a repository into a new directory" msgstr "" -#: common-cmds.h:13 +#: common-cmds.h:23 msgid "Record changes to the repository" msgstr "" -#: common-cmds.h:14 +#: common-cmds.h:24 msgid "Show changes between commits, commit and working tree, etc" msgstr "" -#: common-cmds.h:15 +#: common-cmds.h:25 msgid "Download objects and refs from another repository" msgstr "" -#: common-cmds.h:16 +#: common-cmds.h:26 msgid "Print lines matching a pattern" msgstr "" -#: common-cmds.h:17 +#: common-cmds.h:27 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" -#: common-cmds.h:18 +#: common-cmds.h:28 msgid "Show commit logs" msgstr "" -#: common-cmds.h:19 +#: common-cmds.h:29 msgid "Join two or more development histories together" msgstr "" -#: common-cmds.h:20 +#: common-cmds.h:30 msgid "Move or rename a file, a directory, or a symlink" msgstr "" -#: common-cmds.h:21 +#: common-cmds.h:31 msgid "Fetch from and integrate with another repository or a local branch" msgstr "" -#: common-cmds.h:22 +#: common-cmds.h:32 msgid "Update remote refs along with associated objects" msgstr "" -#: common-cmds.h:23 +#: common-cmds.h:33 msgid "Forward-port local commits to the updated upstream head" msgstr "" -#: common-cmds.h:24 +#: common-cmds.h:34 msgid "Reset current HEAD to the specified state" msgstr "" -#: common-cmds.h:25 +#: common-cmds.h:35 msgid "Remove files from the working tree and from the index" msgstr "" -#: common-cmds.h:26 +#: common-cmds.h:36 msgid "Show various types of objects" msgstr "" -#: common-cmds.h:27 +#: common-cmds.h:37 msgid "Show the working tree status" msgstr "" -#: common-cmds.h:28 +#: common-cmds.h:38 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" -#: parse-options.h:143 +#: parse-options.h:142 msgid "expiry-date" msgstr "" -#: parse-options.h:158 +#: parse-options.h:157 msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:232 +#: parse-options.h:231 msgid "be more verbose" msgstr "" -#: parse-options.h:234 +#: parse-options.h:233 msgid "be more quiet" msgstr "" -#: parse-options.h:240 +#: parse-options.h:239 msgid "use <n> digits to display SHA-1s" msgstr "" @@ -9726,13 +9957,13 @@ msgstr "" msgid "You need to set your committer info first" msgstr "" -#: git-am.sh:98 +#: git-am.sh:100 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: git-am.sh:108 +#: git-am.sh:110 #, sh-format msgid "" "When you have resolved this problem, run \"$cmdline --continue\".\n" @@ -9740,77 +9971,77 @@ msgid "" "To restore the original branch and stop patching, run \"$cmdline --abort\"." msgstr "" -#: git-am.sh:124 +#: git-am.sh:126 msgid "Cannot fall back to three-way merge." msgstr "" -#: git-am.sh:140 +#: git-am.sh:142 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: git-am.sh:142 +#: git-am.sh:144 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: git-am.sh:157 +#: git-am.sh:159 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: git-am.sh:166 +#: git-am.sh:168 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: git-am.sh:182 +#: git-am.sh:185 msgid "Failed to merge in the changes." msgstr "" -#: git-am.sh:277 +#: git-am.sh:280 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: git-am.sh:364 +#: git-am.sh:367 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "" -#: git-am.sh:366 +#: git-am.sh:369 msgid "Patch format detection failed." msgstr "" -#: git-am.sh:398 +#: git-am.sh:407 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 "" -#: git-am.sh:496 +#: git-am.sh:507 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" -#: git-am.sh:501 +#: git-am.sh:512 msgid "Please make up your mind. --skip or --abort?" msgstr "" -#: git-am.sh:537 +#: git-am.sh:560 #, sh-format msgid "" "Stray $dotest directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: git-am.sh:545 +#: git-am.sh:568 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: git-am.sh:612 +#: git-am.sh:635 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" -#: git-am.sh:722 +#: git-am.sh:747 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -9818,60 +10049,60 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" -#: git-am.sh:749 +#: git-am.sh:774 msgid "Patch does not have a valid e-mail address." msgstr "" -#: git-am.sh:796 +#: git-am.sh:821 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: git-am.sh:800 +#: git-am.sh:825 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. -#: git-am.sh:807 +#: git-am.sh:832 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" -#: git-am.sh:843 +#: git-am.sh:868 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "" -#: git-am.sh:864 +#: git-am.sh:889 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-am.sh:872 +#: git-am.sh:897 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "" -#: git-am.sh:888 +#: git-am.sh:913 msgid "No changes -- Patch already applied." msgstr "" -#: git-am.sh:898 +#: git-am.sh:923 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "" -#: git-am.sh:901 +#: git-am.sh:926 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" " $dotest/patch" msgstr "" -#: git-am.sh:919 +#: git-am.sh:945 msgid "applying to an empty history" msgstr "" @@ -10017,28 +10248,28 @@ msgstr "" msgid "bisect run success" msgstr "" -#: git-pull.sh:21 +#: git-pull.sh:61 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 "" -#: git-pull.sh:25 +#: git-pull.sh:65 msgid "Pull is not possible because you have unmerged files." msgstr "" -#: git-pull.sh:31 +#: git-pull.sh:71 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: git-pull.sh:245 +#: git-pull.sh:285 msgid "updating an unborn branch with changes added to the index" msgstr "" -#: git-pull.sh:269 +#: git-pull.sh:311 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -10046,11 +10277,11 @@ msgid "" "Warning: commit $orig_head." msgstr "" -#: git-pull.sh:294 +#: git-pull.sh:336 msgid "Cannot merge multiple branches into empty head" msgstr "" -#: git-pull.sh:298 +#: git-pull.sh:340 msgid "Cannot rebase onto multiple branches" msgstr "" @@ -10231,92 +10462,97 @@ msgstr "" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:238 +#: git-stash.sh:241 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "" -#: git-stash.sh:259 +#: git-stash.sh:262 msgid "No local changes to save" msgstr "" -#: git-stash.sh:263 +#: git-stash.sh:266 msgid "Cannot initialize stash" msgstr "" -#: git-stash.sh:267 +#: git-stash.sh:270 msgid "Cannot save the current status" msgstr "" -#: git-stash.sh:285 +#: git-stash.sh:288 msgid "Cannot remove worktree changes" msgstr "" -#: git-stash.sh:384 +#: git-stash.sh:389 +#, sh-format +msgid "unknown option: $opt" +msgstr "" + +#: git-stash.sh:399 msgid "No stash found." msgstr "" -#: git-stash.sh:391 +#: git-stash.sh:406 #, sh-format msgid "Too many revisions specified: $REV" msgstr "" -#: git-stash.sh:397 +#: git-stash.sh:412 #, sh-format msgid "$reference is not a valid reference" msgstr "" -#: git-stash.sh:425 +#: git-stash.sh:440 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "" -#: git-stash.sh:436 +#: git-stash.sh:451 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-stash.sh:444 +#: git-stash.sh:459 msgid "unable to refresh index" msgstr "" -#: git-stash.sh:448 +#: git-stash.sh:463 msgid "Cannot apply a stash in the middle of a merge" msgstr "" -#: git-stash.sh:456 +#: git-stash.sh:471 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-stash.sh:458 +#: git-stash.sh:473 msgid "Could not save index tree" msgstr "" -#: git-stash.sh:492 +#: git-stash.sh:507 msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:507 +#: git-stash.sh:522 msgid "Index was not unstashed." msgstr "" -#: git-stash.sh:530 +#: git-stash.sh:545 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:531 +#: git-stash.sh:546 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:539 +#: git-stash.sh:554 msgid "No branch name specified" msgstr "" -#: git-stash.sh:611 +#: git-stash.sh:626 msgid "(To restore them type \"git stash apply\")" msgstr "" @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.4.0\n" +"Project-Id-Version: git 2.5.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-04-03 08:13+0800\n" -"PO-Revision-Date: 2015-04-07 08:44+0100\n" +"POT-Creation-Date: 2015-06-27 19:17+0800\n" +"PO-Revision-Date: 2015-06-28 18:49+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -50,7 +50,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -73,9 +73,9 @@ msgstr "lägg till prefix till varje sökväg i arkivet" #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150 msgid "file" msgstr "fil" @@ -107,7 +107,7 @@ msgstr "komprimera bättre" msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77 msgid "repo" msgstr "arkiv" @@ -123,7 +123,7 @@ msgstr "kommando" msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" -#: attr.c:264 +#: attr.c:265 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -262,8 +262,8 @@ msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 -#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 +#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330 +#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -508,16 +508,16 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:2956 +#: diff.c:2997 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3351 +#: diff.c:3393 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3514 +#: diff.c:3556 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -526,11 +526,19 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3528 +#: diff.c:3570 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" +#: dir.c:1852 +msgid "failed to get kernel name and information" +msgstr "misslyckades hämta kärnans namn och information" + +#: dir.c:1945 +msgid "Untracked cache is disabled on this system." +msgstr "Ospårad cache är inaktiverad på detta system." + #: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "kunde inte köra gpg." @@ -577,11 +585,11 @@ msgstr "git-kommandon tillgängliga i \"%s\"" msgid "git commands available from elsewhere on your $PATH" msgstr "git-kommandon från andra platser i din $PATH" -#: help.c:230 -msgid "The most commonly used git commands are:" -msgstr "De mest använda git-kommandona är:" +#: help.c:246 +msgid "These are common Git commands used in various situations:" +msgstr "Dessa vanliga Git-kommandon används i olika situationer:" -#: help.c:289 +#: help.c:311 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -590,11 +598,11 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "köra det. Kanske git-%s är trasigt?" -#: help.c:346 +#: help.c:368 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls." -#: help.c:368 +#: help.c:390 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -603,17 +611,17 @@ msgstr "" "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n" "Fortsätter under förutsättningen att du menade \"%s\"" -#: help.c:373 +#: help.c:395 #, c-format msgid "in %0.1f seconds automatically..." msgstr "automatiskt om %0.1f sekunder..." -#: help.c:380 +#: help.c:402 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"." -#: help.c:384 help.c:444 +#: help.c:406 help.c:466 msgid "" "\n" "Did you mean this?" @@ -627,16 +635,16 @@ msgstr[1] "" "\n" "Menade du ett av dessa?" -#: help.c:440 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: lockfile.c:283 +#: lockfile.c:345 msgid "BUG: reopen a lockfile that is still open" msgstr "FEL: återöppna en låsfil som fortfarande är öppen" -#: lockfile.c:285 +#: lockfile.c:347 msgid "BUG: reopen a lockfile that has been committed" msgstr "FEL: återöppna en låsfil som har överlämnats" @@ -644,8 +652,8 @@ msgstr "FEL: återöppna en låsfil som har överlämnats" msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580 -#: builtin/clone.c:662 +#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594 +#: builtin/clone.c:654 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -663,64 +671,64 @@ msgstr "addinfo_cache misslyckades för sökvägen \"%s\"" msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:688 +#: merge-recursive.c:687 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:699 +#: merge-recursive.c:698 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Tar bort %s för att göra plats för underkatalog\n" -#: merge-recursive.c:713 merge-recursive.c:734 +#: merge-recursive.c:712 merge-recursive.c:733 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:724 +#: merge-recursive.c:723 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:764 +#: merge-recursive.c:763 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:766 +#: merge-recursive.c:765 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:789 builtin/clone.c:321 +#: merge-recursive.c:788 builtin/clone.c:313 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: merge-recursive.c:797 +#: merge-recursive.c:796 #, c-format msgid "failed to symlink '%s'" msgstr "misslyckades skapa symboliska länken \"%s\"" -#: merge-recursive.c:800 +#: merge-recursive.c:799 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" skall hanteras" -#: merge-recursive.c:938 +#: merge-recursive.c:937 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:942 +#: merge-recursive.c:941 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:958 +#: merge-recursive.c:957 msgid "unsupported object type in the tree" msgstr "objekttyp som ej stöds upptäcktes i trädet" -#: merge-recursive.c:1033 merge-recursive.c:1047 +#: merge-recursive.c:1032 merge-recursive.c:1046 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -729,7 +737,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet." -#: merge-recursive.c:1039 merge-recursive.c:1052 +#: merge-recursive.c:1038 merge-recursive.c:1051 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -738,20 +746,20 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet vid %s." -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1149 +#: merge-recursive.c:1148 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s är en katalog i %s lägger till som %s istället" -#: merge-recursive.c:1171 +#: merge-recursive.c:1170 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -760,144 +768,144 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1176 +#: merge-recursive.c:1175 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1230 +#: merge-recursive.c:1229 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s" -#: merge-recursive.c:1260 +#: merge-recursive.c:1259 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Byter namn på %s till %s och %s till %s istället" -#: merge-recursive.c:1459 +#: merge-recursive.c:1458 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s" -#: merge-recursive.c:1469 +#: merge-recursive.c:1468 #, c-format msgid "Adding merged %s" msgstr "Lägger till sammanslagen %s" -#: merge-recursive.c:1474 merge-recursive.c:1672 +#: merge-recursive.c:1473 merge-recursive.c:1671 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:1525 +#: merge-recursive.c:1524 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:1528 +#: merge-recursive.c:1527 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modify" msgstr "ändra" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:1586 +#: merge-recursive.c:1585 msgid "content" msgstr "innehåll" -#: merge-recursive.c:1593 +#: merge-recursive.c:1592 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:1627 +#: merge-recursive.c:1626 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:1641 +#: merge-recursive.c:1640 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1645 git-submodule.sh:1150 +#: merge-recursive.c:1644 git-submodule.sh:1150 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:1646 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:1732 +#: merge-recursive.c:1731 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:1757 +#: merge-recursive.c:1756 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:1763 +#: merge-recursive.c:1762 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1768 +#: merge-recursive.c:1767 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s" -#: merge-recursive.c:1778 +#: merge-recursive.c:1777 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1795 +#: merge-recursive.c:1794 msgid "Fatal merge failure, shouldn't happen." msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa." -#: merge-recursive.c:1814 +#: merge-recursive.c:1813 msgid "Already up-to-date!" msgstr "Redan à jour!" -#: merge-recursive.c:1823 +#: merge-recursive.c:1822 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:1853 +#: merge-recursive.c:1852 #, c-format msgid "Unprocessed path??? %s" msgstr "Obehandlad sökväg??? %s" -#: merge-recursive.c:1901 +#: merge-recursive.c:1900 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:1914 +#: merge-recursive.c:1913 #, 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:1951 +#: merge-recursive.c:1950 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2008 +#: merge-recursive.c:2007 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2019 builtin/merge.c:667 +#: merge-recursive.c:2018 builtin/merge.c:645 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -922,7 +930,7 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: object.c:241 +#: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" @@ -1021,11 +1029,11 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: progress.c:225 +#: progress.c:236 msgid "done" msgstr "klart" -#: read-cache.c:1275 +#: read-cache.c:1295 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1034,7 +1042,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1285 +#: read-cache.c:1305 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1043,51 +1051,93 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: remote.c:782 +#: remote.c:792 #, 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:786 +#: remote.c:796 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:790 +#: remote.c:800 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:798 +#: remote.c:808 msgid "Internal error" msgstr "Internt fel" -#: remote.c:1980 +#: remote.c:1723 remote.c:1766 +msgid "HEAD does not point to a branch" +msgstr "HEAD pekar inte på en gren" + +#: remote.c:1732 +#, c-format +msgid "no such branch: '%s'" +msgstr "okänd gren: \"%s\"" + +#: remote.c:1735 +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "ingen standarduppström angiven för grenen \"%s\"" + +#: remote.c:1741 +#, 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:1756 +#, 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:1771 +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "grenen \"%s\" har ingen fjärr för \"push\"" + +#: remote.c:1782 +#, c-format +msgid "push refspecs for '%s' do not include '%s'" +msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" + +#: remote.c:1795 +msgid "push has no destination (push.default is 'nothing')" +msgstr "\"push\" har inget mål (push.default är \"ingenting\")" + +#: remote.c:1817 +msgid "cannot resolve 'simple' push to a single destination" +msgstr "\"enkel push\" motsvarar flera olika mål" + +#: remote.c:2124 #, 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:1984 +#: remote.c:2128 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:1987 +#: remote.c:2131 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:1991 +#: remote.c:2135 #, 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:1997 +#: remote.c:2141 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:2000 +#: remote.c:2144 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1097,11 +1147,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2008 +#: remote.c:2152 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:2011 +#: remote.c:2155 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1116,11 +1166,11 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2021 +#: remote.c:2165 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:2348 +#: revision.c:2366 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" @@ -1137,22 +1187,22 @@ msgstr "dup2(%d,%d) misslyckades" msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:356 +#: send-pack.c:378 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:366 +#: send-pack.c:389 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 -#: builtin/merge.c:1005 +#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 -#: builtin/merge.c:1010 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 +#: builtin/merge.c:988 #, c-format msgid "Could not write to '%s'" msgstr "Kunde inte skriva till \"%s\"" @@ -1350,7 +1400,7 @@ 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:908 builtin/apply.c:4288 +#: sequencer.c:908 builtin/apply.c:4291 #, c-format msgid "cannot open %s: %s" msgstr "kan inte öppna %s: %s" @@ -1392,7 +1442,12 @@ msgstr "Kan inte ångra som första incheckning" msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" -#: sha1_name.c:440 +#: setup.c:243 +#, c-format +msgid "failed to read %s" +msgstr "misslyckades läsa %s" + +#: sha1_name.c:453 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" @@ -1414,25 +1469,6 @@ msgstr "" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" -#: sha1_name.c:1068 -msgid "HEAD does not point to a branch" -msgstr "HEAD pekar inte på en gren" - -#: sha1_name.c:1071 -#, c-format -msgid "No such branch: '%s'" -msgstr "Okänd gren: \"%s\"" - -#: sha1_name.c:1073 -#, c-format -msgid "No upstream configured for branch '%s'" -msgstr "Ingen standarduppström angiven för grenen \"%s\"" - -#: sha1_name.c:1077 -#, 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" - #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -1458,12 +1494,7 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s" msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:1109 builtin/init-db.c:371 -#, c-format -msgid "Could not create git link %s" -msgstr "Kunde inte skapa gitlänk %s" - -#: submodule.c:1120 +#: submodule.c:1115 #, c-format msgid "Could not set core.worktree in %s" msgstr "Kunde inte sätta core.worktree i %s" @@ -1493,7 +1524,7 @@ msgstr "kunde inte läsa indatafilen \"%s\"" msgid "could not read from stdin" msgstr "Kunde inte läsa från standard in" -#: unpack-trees.c:202 +#: unpack-trees.c:203 msgid "Checking out files" msgstr "Checkar ut filer" @@ -1549,6 +1580,21 @@ msgstr "okänd användare" msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" +#: wrapper.c:575 +#, c-format +msgid "could not open %s for writing" +msgstr "kunde inte öppna %s för skrivning" + +#: wrapper.c:587 +#, c-format +msgid "could not write to %s" +msgstr "kunde inte skriva till %s" + +#: wrapper.c:593 +#, c-format +msgid "could not close %s" +msgstr "kunde inte stänga %s" + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" @@ -1574,11 +1620,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning) msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:198 wt-status.c:878 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:216 wt-status.c:887 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" @@ -1692,15 +1738,15 @@ msgstr "ospårat innehåll, " msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:753 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:755 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:835 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1708,68 +1754,68 @@ msgstr "" "Rör inte raden ovan.\n" "Allt nedan kommer tas bort." -#: wt-status.c:946 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:949 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:952 +#: wt-status.c:955 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:955 +#: wt-status.c:958 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:965 +#: wt-status.c:968 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:968 +#: wt-status.c:971 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:972 +#: wt-status.c:975 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:974 +#: wt-status.c:977 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:976 +#: wt-status.c:979 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:1036 wt-status.c:1053 +#: wt-status.c:1039 wt-status.c:1056 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:1041 wt-status.c:1058 +#: wt-status.c:1044 wt-status.c:1061 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1044 +#: wt-status.c:1047 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1046 +#: wt-status.c:1049 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1048 +#: wt-status.c:1051 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:1061 +#: wt-status.c:1064 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1065 +#: wt-status.c:1068 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1777,118 +1823,118 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1070 +#: wt-status.c:1073 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:1073 +#: wt-status.c:1076 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:1077 +#: wt-status.c:1080 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1082 +#: wt-status.c:1085 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:1085 +#: wt-status.c:1088 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:1087 +#: wt-status.c:1090 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:1097 +#: wt-status.c:1100 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1102 +#: wt-status.c:1105 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1105 +#: wt-status.c:1108 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1107 +#: wt-status.c:1110 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1116 +#: wt-status.c:1119 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1121 +#: wt-status.c:1124 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1124 +#: wt-status.c:1127 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1126 +#: wt-status.c:1129 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1137 +#: wt-status.c:1140 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." -#: wt-status.c:1141 +#: wt-status.c:1144 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1144 +#: wt-status.c:1147 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:1321 +#: wt-status.c:1324 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1328 +#: wt-status.c:1331 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå" -#: wt-status.c:1333 +#: wt-status.c:1336 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1335 +#: wt-status.c:1338 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1338 +#: wt-status.c:1341 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1355 +#: wt-status.c:1358 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1369 +#: wt-status.c:1372 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1371 +#: wt-status.c:1374 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1375 +#: wt-status.c:1378 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1900,32 +1946,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1381 +#: wt-status.c:1384 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1383 +#: wt-status.c:1386 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1389 +#: wt-status.c:1392 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1394 +#: wt-status.c:1397 #, 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:1397 +#: wt-status.c:1400 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1400 +#: wt-status.c:1403 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1934,48 +1980,48 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1403 +#: wt-status.c:1406 #, 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:1406 +#: wt-status.c:1409 #, 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:1409 wt-status.c:1414 +#: wt-status.c:1412 wt-status.c:1417 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1412 +#: wt-status.c:1415 #, 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:1416 +#: wt-status.c:1419 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1525 +#: wt-status.c:1528 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1531 +#: wt-status.c:1534 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1563 +#: wt-status.c:1561 msgid "gone" msgstr "försvunnen" -#: wt-status.c:1565 wt-status.c:1573 +#: wt-status.c:1563 wt-status.c:1571 msgid "behind " msgstr "efter " -#: compat/precompose_utf8.c:55 builtin/clone.c:360 +#: compat/precompose_utf8.c:55 builtin/clone.c:352 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -2002,7 +2048,7 @@ msgstr "ta bort \"%s\"\n" msgid "Unstaged changes after refreshing the index:" msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:194 builtin/rev-parse.c:785 +#: builtin/add.c:194 builtin/rev-parse.c:796 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" @@ -2015,113 +2061,117 @@ msgstr "Kunde inte öppna \"%s\" för skrivning" msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:214 +#: builtin/add.c:212 +msgid "editing patch failed" +msgstr "redigering av patch misslyckades" + +#: builtin/add.c:215 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:216 +#: builtin/add.c:217 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:221 +#: builtin/add.c:222 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:231 +#: builtin/add.c:232 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:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 -#: builtin/rm.c:269 +#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369 +#: builtin/rm.c:268 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "var pratsam" -#: builtin/add.c:251 +#: builtin/add.c:252 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:253 +#: builtin/add.c:254 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:254 +#: builtin/add.c:255 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:255 +#: builtin/add.c:256 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:256 +#: builtin/add.c:257 msgid "record only the fact that the path will be added later" msgstr "registrera endast att sökvägen kommer läggas till senare" -#: builtin/add.c:257 +#: builtin/add.c:258 msgid "add changes from all tracked and untracked files" msgstr "lägg till ändringar från alla spårade och ospårade filer" -#: builtin/add.c:260 +#: builtin/add.c:261 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)" -#: builtin/add.c:262 +#: builtin/add.c:263 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:263 +#: builtin/add.c:264 msgid "just skip files which cannot be added because of errors" msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" -#: builtin/add.c:264 +#: builtin/add.c:265 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:286 +#: builtin/add.c:287 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Använd -f om du verkligen vill lägga till dem.\n" -#: builtin/add.c:293 +#: builtin/add.c:294 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:329 +#: builtin/add.c:330 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:336 +#: builtin/add.c:337 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:357 +#: builtin/add.c:358 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:358 +#: builtin/add.c:359 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" @@ -2200,77 +2250,77 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1656 +#: builtin/apply.c:1659 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: builtin/apply.c:1658 +#: builtin/apply.c:1661 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: builtin/apply.c:1684 +#: builtin/apply.c:1687 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: builtin/apply.c:1720 +#: builtin/apply.c:1723 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: builtin/apply.c:1722 +#: builtin/apply.c:1725 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: builtin/apply.c:1725 +#: builtin/apply.c:1728 #, 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:1871 +#: builtin/apply.c:1874 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: builtin/apply.c:1900 +#: builtin/apply.c:1903 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: builtin/apply.c:2051 +#: builtin/apply.c:2054 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: builtin/apply.c:2141 +#: builtin/apply.c:2144 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/apply.c:2145 +#: builtin/apply.c:2148 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: builtin/apply.c:2778 +#: builtin/apply.c:2781 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: builtin/apply.c:2897 +#: builtin/apply.c:2900 #, 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:2909 +#: builtin/apply.c:2912 #, 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:2915 +#: builtin/apply.c:2918 #, c-format msgid "" "while searching for:\n" @@ -2279,336 +2329,336 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: builtin/apply.c:2935 +#: builtin/apply.c:2938 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: builtin/apply.c:3036 +#: builtin/apply.c:3039 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: builtin/apply.c:3042 +#: builtin/apply.c:3045 #, 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:3063 +#: builtin/apply.c:3066 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3187 +#: builtin/apply.c:3190 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 +#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291 #, c-format msgid "read of %s failed" msgstr "misslyckades läsa %s" -#: builtin/apply.c:3240 +#: builtin/apply.c:3243 #, 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:3268 builtin/apply.c:3490 +#: builtin/apply.c:3271 builtin/apply.c:3493 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: builtin/apply.c:3349 builtin/apply.c:3504 +#: builtin/apply.c:3352 builtin/apply.c:3507 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 +#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3358 builtin/apply.c:3512 +#: builtin/apply.c:3361 builtin/apply.c:3515 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3460 +#: builtin/apply.c:3463 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: builtin/apply.c:3529 +#: builtin/apply.c:3532 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3531 +#: builtin/apply.c:3534 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: builtin/apply.c:3690 builtin/apply.c:3692 +#: builtin/apply.c:3693 builtin/apply.c:3695 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg: %s" -#: builtin/apply.c:3747 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3750 +#: builtin/apply.c:3753 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: builtin/apply.c:3770 +#: builtin/apply.c:3773 #, 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:3775 +#: builtin/apply.c:3778 #, 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:3795 +#: builtin/apply.c:3798 #, 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:3799 +#: builtin/apply.c:3802 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: builtin/apply.c:3813 +#: builtin/apply.c:3816 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3909 builtin/checkout.c:237 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:4049 +#: builtin/apply.c:4052 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: builtin/apply.c:4078 +#: builtin/apply.c:4081 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: builtin/apply.c:4082 +#: builtin/apply.c:4085 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: builtin/apply.c:4087 +#: builtin/apply.c:4090 #, 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:4090 builtin/apply.c:4198 +#: builtin/apply.c:4093 builtin/apply.c:4201 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: builtin/apply.c:4123 +#: builtin/apply.c:4126 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: builtin/apply.c:4172 +#: builtin/apply.c:4175 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: builtin/apply.c:4259 +#: builtin/apply.c:4262 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: builtin/apply.c:4267 +#: builtin/apply.c:4270 msgid "internal error" msgstr "internt fel" -#: builtin/apply.c:4270 +#: builtin/apply.c:4273 #, 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:4280 +#: builtin/apply.c:4283 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:4301 +#: builtin/apply.c:4304 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: builtin/apply.c:4304 +#: builtin/apply.c:4307 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:4394 +#: builtin/apply.c:4397 msgid "unrecognized input" msgstr "indata känns inte igen" -#: builtin/apply.c:4405 +#: builtin/apply.c:4408 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85 #: builtin/fetch.c:92 msgid "path" msgstr "sökväg" -#: builtin/apply.c:4523 +#: builtin/apply.c:4526 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: builtin/apply.c:4526 +#: builtin/apply.c:4529 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: builtin/apply.c:4528 +#: builtin/apply.c:4531 msgid "num" msgstr "antal" -#: builtin/apply.c:4529 +#: builtin/apply.c:4532 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:4532 +#: builtin/apply.c:4535 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: builtin/apply.c:4534 +#: builtin/apply.c:4537 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:4538 +#: builtin/apply.c:4541 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:4540 +#: builtin/apply.c:4543 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:4542 +#: builtin/apply.c:4545 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:4544 +#: builtin/apply.c:4547 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:4546 +#: builtin/apply.c:4549 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: builtin/apply.c:4548 +#: builtin/apply.c:4551 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: builtin/apply.c:4550 +#: builtin/apply.c:4553 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: builtin/apply.c:4552 +#: builtin/apply.c:4555 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:4554 +#: builtin/apply.c:4557 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 +#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: builtin/apply.c:4559 +#: builtin/apply.c:4562 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: builtin/apply.c:4560 +#: builtin/apply.c:4563 msgid "action" msgstr "åtgärd" -#: builtin/apply.c:4561 +#: builtin/apply.c:4564 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: builtin/apply.c:4564 builtin/apply.c:4567 +#: builtin/apply.c:4567 builtin/apply.c:4570 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: builtin/apply.c:4570 +#: builtin/apply.c:4573 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: builtin/apply.c:4572 +#: builtin/apply.c:4575 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: builtin/apply.c:4574 +#: builtin/apply.c:4577 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4576 +#: builtin/apply.c:4579 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: builtin/apply.c:4579 +#: builtin/apply.c:4582 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4582 +#: builtin/apply.c:4585 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: builtin/apply.c:4584 +#: builtin/apply.c:4587 msgid "root" msgstr "rot" -#: builtin/apply.c:4585 +#: builtin/apply.c:4588 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: builtin/apply.c:4607 +#: builtin/apply.c:4610 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: builtin/apply.c:4615 +#: builtin/apply.c:4618 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: builtin/apply.c:4618 +#: builtin/apply.c:4621 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: builtin/apply.c:4637 +#: builtin/apply.c:4640 #, c-format msgid "can't open patch '%s'" msgstr "kan inte öppna patchen \"%s\"" -#: builtin/apply.c:4651 +#: builtin/apply.c:4654 #, 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:4657 builtin/apply.c:4667 +#: builtin/apply.c:4660 builtin/apply.c:4670 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2662,11 +2712,11 @@ msgstr "utför 'git bisect next'" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" -#: builtin/blame.c:30 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" -msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] fil" +#: builtin/blame.c:31 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" -#: builtin/blame.c:35 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" @@ -2788,7 +2838,7 @@ msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..." msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>" -#: builtin/branch.c:152 +#: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2797,7 +2847,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:156 +#: builtin/branch.c:154 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2806,12 +2856,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:170 +#: builtin/branch.c:168 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:174 +#: builtin/branch.c:172 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2820,348 +2870,348 @@ 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:187 +#: builtin/branch.c:185 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:215 +#: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:221 +#: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:229 +#: builtin/branch.c:227 #, 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." -#: builtin/branch.c:245 +#: builtin/branch.c:243 #, c-format -msgid "remote branch '%s' not found." -msgstr "fjärrgrenen \"%s\" hittades inte." +msgid "remote-tracking branch '%s' not found." +msgstr "fjärrspårande grenen \"%s\" hittades inte." -#: builtin/branch.c:246 +#: builtin/branch.c:244 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:260 +#: builtin/branch.c:258 #, c-format -msgid "Error deleting remote branch '%s'" -msgstr "Fel vid borttagning av fjärrgrenen \"%s\"" +msgid "Error deleting remote-tracking branch '%s'" +msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\"" -#: builtin/branch.c:261 +#: builtin/branch.c:259 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:268 +#: builtin/branch.c:266 #, c-format -msgid "Deleted remote branch %s (was %s).\n" -msgstr "Tog bort fjärrgrenen %s (var %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" +msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" -#: builtin/branch.c:269 +#: builtin/branch.c:267 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:370 +#: builtin/branch.c:368 #, c-format msgid "branch '%s' does not point at a commit" msgstr "grenen \"%s\" pekar inte på en incheckning" -#: builtin/branch.c:459 +#: builtin/branch.c:451 #, c-format msgid "[%s: gone]" msgstr "[%s: försvunnen]" -#: builtin/branch.c:464 +#: builtin/branch.c:456 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:469 +#: builtin/branch.c:461 #, c-format msgid "[%s: behind %d]" msgstr "[%s: bakom %d] " -#: builtin/branch.c:471 +#: builtin/branch.c:463 #, c-format msgid "[behind %d]" msgstr "[bakom %d] " -#: builtin/branch.c:475 +#: builtin/branch.c:467 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: före %d] " -#: builtin/branch.c:477 +#: builtin/branch.c:469 #, c-format msgid "[ahead %d]" msgstr "[före %d] " -#: builtin/branch.c:480 +#: builtin/branch.c:472 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: före %d, bakom %d] " -#: builtin/branch.c:483 +#: builtin/branch.c:475 #, c-format msgid "[ahead %d, behind %d]" msgstr "[före %d, bakom %d] " -#: builtin/branch.c:496 +#: builtin/branch.c:488 msgid " **** invalid ref ****" msgstr " **** ogiltig ref ****" -#: builtin/branch.c:587 +#: builtin/branch.c:579 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: builtin/branch.c:590 +#: builtin/branch.c:582 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:588 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" -#: builtin/branch.c:599 +#: builtin/branch.c:591 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: builtin/branch.c:603 +#: builtin/branch.c:595 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:650 +#: builtin/branch.c:642 #, c-format msgid "object '%s' does not point to a commit" msgstr "objektet \"%s\" pekar på en incheckning" -#: builtin/branch.c:698 +#: builtin/branch.c:690 msgid "some refs could not be read" msgstr "vissa referenser kunde inte läsas" -#: builtin/branch.c:711 +#: builtin/branch.c:703 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:721 +#: builtin/branch.c:713 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:736 +#: builtin/branch.c:728 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:740 +#: builtin/branch.c:732 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:744 +#: builtin/branch.c:736 #, 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:751 +#: builtin/branch.c:743 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:766 +#: builtin/branch.c:758 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: builtin/branch.c:790 +#: builtin/branch.c:780 #, c-format msgid "could not write branch description template: %s" msgstr "kunde inte skriva grenbeskrivningsmall: %s" -#: builtin/branch.c:820 +#: builtin/branch.c:810 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:822 +#: builtin/branch.c:812 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:823 +#: builtin/branch.c:813 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:824 +#: builtin/branch.c:814 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:826 +#: builtin/branch.c:816 msgid "change upstream info" msgstr "ändra uppströmsinformation" -#: builtin/branch.c:830 +#: builtin/branch.c:820 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:831 +#: builtin/branch.c:821 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 -#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 -#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 +#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851 +#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "incheckning" -#: builtin/branch.c:835 builtin/branch.c:841 +#: builtin/branch.c:825 builtin/branch.c:831 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:847 +#: builtin/branch.c:837 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:848 +#: builtin/branch.c:838 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:850 +#: builtin/branch.c:840 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:851 +#: builtin/branch.c:841 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:852 +#: builtin/branch.c:842 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:853 +#: builtin/branch.c:843 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:854 +#: builtin/branch.c:844 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:855 +#: builtin/branch.c:845 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:857 +#: builtin/branch.c:847 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:858 +#: builtin/branch.c:848 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:861 +#: builtin/branch.c:851 msgid "print only not merged branches" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:867 +#: builtin/branch.c:857 msgid "print only merged branches" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:871 +#: builtin/branch.c:861 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:884 +#: builtin/branch.c:874 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:888 builtin/clone.c:637 +#: builtin/branch.c:878 builtin/clone.c:629 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:910 +#: builtin/branch.c:900 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:921 builtin/branch.c:960 +#: builtin/branch.c:911 builtin/branch.c:950 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:936 +#: builtin/branch.c:926 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:941 +#: builtin/branch.c:931 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:948 +#: builtin/branch.c:938 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu" -#: builtin/branch.c:951 +#: builtin/branch.c:941 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:966 +#: builtin/branch.c:956 msgid "too many branches for a rename operation" msgstr "för många grenar för namnbyte" -#: builtin/branch.c:971 +#: builtin/branch.c:961 msgid "too many branches to set new upstream" msgstr "för många grenar för att byta uppström" -#: builtin/branch.c:975 +#: builtin/branch.c:965 #, 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:978 builtin/branch.c:1000 builtin/branch.c:1021 +#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:982 +#: builtin/branch.c:972 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:994 +#: builtin/branch.c:984 msgid "too many branches to unset upstream" msgstr "för många grenar för att ta bort uppström" -#: builtin/branch.c:998 +#: builtin/branch.c:988 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:1004 +#: builtin/branch.c:994 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:1018 +#: builtin/branch.c:1008 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:1024 +#: builtin/branch.c:1014 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:1027 +#: builtin/branch.c:1017 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3170,7 +3220,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:1044 +#: builtin/branch.c:1034 #, c-format msgid "" "\n" @@ -3181,69 +3231,85 @@ msgstr "" "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" "\n" -#: builtin/branch.c:1045 +#: builtin/branch.c:1035 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1046 +#: builtin/branch.c:1036 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" -#: builtin/bundle.c:47 +#: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" msgstr "%s är okej\n" -#: builtin/bundle.c:56 +#: builtin/bundle.c:64 msgid "Need a repository to create a bundle." msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." -#: builtin/bundle.c:60 +#: builtin/bundle.c:68 msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:326 -msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" -msgstr "git cat-file (-t | -s | -e | -p | <typ> | --textconv) <objekt>" +#: builtin/cat-file.c:369 +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|" +"<typ>|--textconv) <objekt>" -#: builtin/cat-file.c:327 -msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" -msgstr "git cat-file (--batch | --batch-check) < <objektlista>" +#: builtin/cat-file.c:370 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-" +"objects>" +msgstr "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <objektlista>" -#: builtin/cat-file.c:364 +#: builtin/cat-file.c:407 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:365 +#: builtin/cat-file.c:408 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:409 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:411 msgid "exit with zero when there's no error" msgstr "avsluta med noll när det inte uppstått något fel" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:412 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:414 msgid "for blob objects, run textconv on object's content" msgstr "för blob-objekt, kör textconv på objektets innehåll" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:416 +msgid "allow -s and -t to work with broken/corrupt objects" +msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt" + +#: builtin/cat-file.c:418 msgid "show info and content of objects fed from the standard input" msgstr "visa information och innehåll för objekt som listas på standard in" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:421 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" +#: builtin/cat-file.c:424 +msgid "follow in-tree symlinks (used with --batch or --batch-check)" +msgstr "" +"följ symboliska länkar i trädet (använd med --batch eller --batch-check)" + #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..." @@ -3260,7 +3326,7 @@ msgstr "visa alla attribut som satts på filen" msgid "use .gitattributes only from the index" msgstr "använd .gitattributes endast från indexet" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96 msgid "read file names from stdin" msgstr "läs filnamn från standard in" @@ -3268,7 +3334,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:1107 builtin/gc.c:274 +#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -3365,113 +3431,113 @@ msgstr "när filer skapas, lägg till <sträng> först" msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" -#: builtin/checkout.c:25 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<flaggor>] <gren>" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." -#: builtin/checkout.c:132 builtin/checkout.c:165 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:150 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:194 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:211 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:228 +#: builtin/checkout.c:234 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255 -#: builtin/checkout.c:258 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 builtin/checkout.c:277 #, 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:261 builtin/checkout.c:264 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:267 +#: builtin/checkout.c:273 #, 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:278 builtin/checkout.c:467 +#: builtin/checkout.c:287 builtin/checkout.c:481 msgid "corrupt index file" msgstr "indexfilen är trasig" -#: builtin/checkout.c:338 builtin/checkout.c:345 +#: builtin/checkout.c:347 builtin/checkout.c:354 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:489 +#: builtin/checkout.c:503 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:615 +#: builtin/checkout.c:634 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Kan inte skapa referenslog för \"%s\"\n" -#: builtin/checkout.c:653 +#: builtin/checkout.c:670 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:660 +#: builtin/checkout.c:677 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:663 +#: builtin/checkout.c:680 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:667 +#: builtin/checkout.c:684 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:669 builtin/checkout.c:1050 +#: builtin/checkout.c:686 builtin/checkout.c:1285 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:671 +#: builtin/checkout.c:688 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:723 +#: builtin/checkout.c:740 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:729 +#: builtin/checkout.c:746 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3494,154 +3560,205 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:747 +#: builtin/checkout.c:765 #, c-format msgid "" +"If you want to keep it by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch <new-branch-name> %s\n" +"\n" +msgid_plural "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" " git branch <new-branch-name> %s\n" "\n" -msgstr "" +msgstr[0] "" +"Om du vill behålla den genom att skapa en ny gren är nu en bra tidpunkt\n" +"att göra så, med:\n" +"\n" +" git branch <nytt_grennamn> %s\n" +"\n" +msgstr[1] "" "Om du vill behålla dem genom att skapa en ny gren är nu en bra tidpunkt\n" "att göra så, med:\n" "\n" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:777 +#: builtin/checkout.c:801 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:781 +#: builtin/checkout.c:805 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:808 builtin/checkout.c:1045 +#: builtin/checkout.c:832 builtin/checkout.c:1280 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:952 +#: builtin/checkout.c:893 +msgid "no branch specified" +msgstr "inget grennamn angavs" + +#: builtin/checkout.c:895 +#, c-format +msgid "'%s' already exists" +msgstr "\"%s\" finns redan" + +#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842 +#: builtin/clone.c:853 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "kunde inte skapa inledande kataloger för \"%s\"" + +#: builtin/checkout.c:924 +#, c-format +msgid "could not create directory of '%s'" +msgstr "kunde inte skapa katalogen \"%s\"" + +#: builtin/checkout.c:960 +#, c-format +msgid "Enter %s (identifier %s)" +msgstr "Går in i %s (identifieraren %s)" + +#: builtin/checkout.c:1070 +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "\"%s\" är redan utcheckad på \"%s\"" + +#: builtin/checkout.c:1176 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:991 +#: builtin/checkout.c:1215 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1020 +#: builtin/checkout.c:1255 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1059 +#: builtin/checkout.c:1294 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1062 builtin/checkout.c:1066 +#: builtin/checkout.c:1297 builtin/checkout.c:1301 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078 -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313 +#: builtin/checkout.c:1316 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1086 +#: builtin/checkout.c:1321 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90 +#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1109 +#: builtin/checkout.c:1347 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1349 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1112 +#: builtin/checkout.c:1350 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1351 msgid "detach the HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1114 +#: builtin/checkout.c:1352 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1355 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1119 +#: builtin/checkout.c:1357 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1121 +#: builtin/checkout.c:1359 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1360 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:1123 builtin/merge.c:227 +#: builtin/checkout.c:1361 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 +#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244 msgid "style" msgstr "stil" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1363 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1366 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1368 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1370 +msgid "check a branch out in a separate working directory" +msgstr "checka ut en gren i separat arbetskatalog" + +#: builtin/checkout.c:1372 +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:1406 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1423 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1175 +#: builtin/checkout.c:1428 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1464 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1219 +#: builtin/checkout.c:1471 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3650,12 +3767,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:1224 +#: builtin/checkout.c:1476 #, 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:1228 +#: builtin/checkout.c:1480 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3727,36 +3844,36 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering" -#: builtin/clean.c:517 +#: builtin/clean.c:515 #, c-format msgid "Huh (%s)?" msgstr "Vadå (%s)?" -#: builtin/clean.c:659 +#: builtin/clean.c:657 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmönster>>" -#: builtin/clean.c:696 +#: builtin/clean.c:694 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:717 +#: builtin/clean.c:715 msgid "Select items to delete" msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:756 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]?" -#: builtin/clean.c:783 +#: builtin/clean.c:781 msgid "Bye." msgstr "Hej då." -#: builtin/clean.c:791 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3774,62 +3891,62 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:818 +#: builtin/clean.c:816 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:819 +#: builtin/clean.c:817 msgid "What now" msgstr "Vad nu" -#: builtin/clean.c:827 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Skulle ta bort följande post:" msgstr[1] "Skulle ta bort följande poster:" -#: builtin/clean.c:844 +#: builtin/clean.c:842 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:875 +#: builtin/clean.c:873 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:877 +#: builtin/clean.c:875 msgid "force" msgstr "tvinga" -#: builtin/clean.c:878 +#: builtin/clean.c:876 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:880 +#: builtin/clean.c:878 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:882 +#: builtin/clean.c:880 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:883 +#: builtin/clean.c:881 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:885 +#: builtin/clean.c:883 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:903 +#: builtin/clean.c:901 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:907 +#: builtin/clean.c:905 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3837,7 +3954,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:910 +#: builtin/clean.c:908 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3849,150 +3966,150 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224 #: builtin/push.c:523 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/clone.c:68 +#: builtin/clone.c:59 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:73 +#: builtin/clone.c:64 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:75 +#: builtin/clone.c:66 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:77 +#: builtin/clone.c:68 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:79 +#: builtin/clone.c:70 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:81 builtin/clone.c:83 +#: builtin/clone.c:72 builtin/clone.c:74 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:84 builtin/init-db.c:493 +#: builtin/clone.c:75 builtin/init-db.c:500 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:85 builtin/init-db.c:494 +#: builtin/clone.c:76 builtin/init-db.c:501 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:87 +#: builtin/clone.c:78 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:80 +msgid "use --reference only while cloning" +msgstr "använd --reference endast under kloningen" + +#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "namn" -#: builtin/clone.c:89 +#: builtin/clone.c:82 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:91 +#: builtin/clone.c:84 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:93 +#: builtin/clone.c:86 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 +#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "djup" -#: builtin/clone.c:95 +#: builtin/clone.c:88 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:97 +#: builtin/clone.c:90 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:99 -msgid "use --reference only while cloning" -msgstr "använd --reference endast under kloningen" - -#: builtin/clone.c:100 builtin/init-db.c:502 +#: builtin/clone.c:91 builtin/init-db.c:509 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:101 builtin/init-db.c:503 +#: builtin/clone.c:92 builtin/init-db.c:510 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:102 +#: builtin/clone.c:93 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:103 +#: builtin/clone.c:94 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:256 +#: builtin/clone.c:247 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: builtin/clone.c:260 +#: builtin/clone.c:251 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: builtin/clone.c:263 +#: builtin/clone.c:254 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: builtin/clone.c:325 +#: builtin/clone.c:317 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/clone.c:327 builtin/diff.c:84 +#: builtin/clone.c:319 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: builtin/clone.c:329 +#: builtin/clone.c:321 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:343 +#: builtin/clone.c:335 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:365 +#: builtin/clone.c:357 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:369 +#: builtin/clone.c:361 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:392 builtin/clone.c:566 +#: builtin/clone.c:384 builtin/clone.c:558 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:404 +#: builtin/clone.c:396 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4002,123 +4119,118 @@ 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:481 +#: builtin/clone.c:473 #, 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 in the database. -#: builtin/clone.c:561 +#: builtin/clone.c:553 #, c-format msgid "Checking connectivity... " msgstr "Kontrollerar konnektivitet..." -#: builtin/clone.c:564 +#: builtin/clone.c:556 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: builtin/clone.c:628 +#: builtin/clone.c:620 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:659 +#: builtin/clone.c:651 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:746 +#: builtin/clone.c:738 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:748 +#: builtin/clone.c:740 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:778 +#: builtin/clone.c:770 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:782 +#: builtin/clone.c:774 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:793 +#: builtin/clone.c:785 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:796 +#: builtin/clone.c:788 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:809 +#: builtin/clone.c:801 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:815 builtin/fetch.c:1156 +#: builtin/clone.c:807 builtin/fetch.c:1160 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:825 +#: builtin/clone.c:817 #, 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:835 +#: builtin/clone.c:827 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:850 builtin/clone.c:861 -#, c-format -msgid "could not create leading directories of '%s'" -msgstr "kunde inte skapa inledande kataloger för \"%s\"" - -#: builtin/clone.c:853 +#: builtin/clone.c:845 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:871 +#: builtin/clone.c:863 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:873 +#: builtin/clone.c:865 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:898 +#: builtin/clone.c:890 msgid "--dissociate given, but there is no --reference" msgstr "--dissociate angavs, men --reference har inte angivits" -#: builtin/clone.c:913 +#: builtin/clone.c:907 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:916 +#: builtin/clone.c:910 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:921 +#: builtin/clone.c:915 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:925 +#: builtin/clone.c:919 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:976 builtin/clone.c:984 +#: builtin/clone.c:968 builtin/clone.c:976 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:987 +#: builtin/clone.c:979 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -4356,7 +4468,7 @@ msgstr "kunde inte läsa MERGE_MSG" msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:738 builtin/merge.c:1079 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" @@ -4517,32 +4629,32 @@ msgstr "Felaktigt städningsläge %s" msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1324 builtin/commit.c:1604 +#: builtin/commit.c:1324 builtin/commit.c:1603 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1326 builtin/commit.c:1606 +#: builtin/commit.c:1326 builtin/commit.c:1605 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 +#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1331 builtin/commit.c:1610 +#: builtin/commit.c:1331 builtin/commit.c:1609 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1334 builtin/commit.c:1613 +#: builtin/commit.c:1334 builtin/commit.c:1612 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "läge" -#: builtin/commit.c:1337 builtin/commit.c:1616 +#: builtin/commit.c:1337 builtin/commit.c:1615 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)" @@ -4550,7 +4662,7 @@ msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)" msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1341 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:152 msgid "when" msgstr "när" @@ -4566,205 +4678,205 @@ msgstr "" msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1431 +#: builtin/commit.c:1430 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1433 +#: builtin/commit.c:1432 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1478 +#: builtin/commit.c:1477 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1481 +#: builtin/commit.c:1480 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1574 +#: builtin/commit.c:1573 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1575 +#: builtin/commit.c:1574 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1577 +#: builtin/commit.c:1576 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1578 builtin/tag.c:601 +#: builtin/commit.c:1577 builtin/tag.c:601 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "author" msgstr "författare" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1580 builtin/gc.c:275 +#: builtin/commit.c:1579 builtin/gc.c:280 msgid "date" msgstr "datum" -#: builtin/commit.c:1580 +#: builtin/commit.c:1579 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1581 +#: builtin/commit.c:1580 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1582 +#: builtin/commit.c:1581 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1583 +#: builtin/commit.c:1582 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1584 +#: builtin/commit.c:1583 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1585 +#: builtin/commit.c:1584 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:1586 +#: builtin/commit.c:1585 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:1587 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1588 +#: builtin/commit.c:1587 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1589 +#: builtin/commit.c:1588 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1590 +#: builtin/commit.c:1589 msgid "default" msgstr "standard" -#: builtin/commit.c:1590 builtin/tag.c:604 +#: builtin/commit.c:1589 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" -#: builtin/commit.c:1591 +#: builtin/commit.c:1590 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "nyckel-id" -#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1596 +#: builtin/commit.c:1595 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1597 +#: builtin/commit.c:1596 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1598 +#: builtin/commit.c:1597 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1599 +#: builtin/commit.c:1598 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1600 +#: builtin/commit.c:1599 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1601 +#: builtin/commit.c:1600 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1602 +#: builtin/commit.c:1601 msgid "bypass pre-commit hook" msgstr "förbigå pre-commit-krok" -#: builtin/commit.c:1603 +#: builtin/commit.c:1602 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1614 +#: builtin/commit.c:1613 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1615 +#: builtin/commit.c:1614 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1620 +#: builtin/commit.c:1619 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1622 +#: builtin/commit.c:1621 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1651 +#: builtin/commit.c:1650 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1690 builtin/merge.c:519 +#: builtin/commit.c:1689 builtin/merge.c:1076 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: builtin/commit.c:1697 +#: builtin/commit.c:1696 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1704 +#: builtin/commit.c:1703 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1723 +#: builtin/commit.c:1722 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1734 +#: builtin/commit.c:1733 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1739 +#: builtin/commit.c:1738 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/commit.c:1787 +#: builtin/commit.c:1786 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4907,18 +5019,18 @@ msgstr "kan inte tolka standardfärgvärde" #, c-format msgid "" "# This is Git's per-user configuration file.\n" -"[core]\n" +"[user]\n" "# Please adapt and uncomment the following lines:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" msgstr "" "# Detta är Gits användarspecifika konfigurationsfil\n" -"[core]\n" +"[user]\n" "# Justera och ta bort kommenteringsmärket från följande rader:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:589 +#: builtin/config.c:587 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" @@ -5248,81 +5360,81 @@ msgstr "referenskarta" msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:375 +#: builtin/fetch.c:377 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:455 +#: builtin/fetch.c:457 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:460 +#: builtin/fetch.c:462 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:474 +#: builtin/fetch.c:476 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)" -#: builtin/fetch.c:475 builtin/fetch.c:561 +#: builtin/fetch.c:477 builtin/fetch.c:563 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:486 +#: builtin/fetch.c:488 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 +#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543 msgid " (unable to update local ref)" msgstr " (kunde inte uppdatera lokal ref)" -#: builtin/fetch.c:506 +#: builtin/fetch.c:508 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:509 +#: builtin/fetch.c:511 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:512 +#: builtin/fetch.c:514 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:563 +#: builtin/fetch.c:565 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:596 builtin/fetch.c:829 +#: builtin/fetch.c:599 builtin/fetch.c:832 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: builtin/fetch.c:605 +#: builtin/fetch.c:608 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s sände inte alla nödvändiga objekt\n" -#: builtin/fetch.c:623 +#: builtin/fetch.c:626 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "avvisa %s då grunda rötter inte kan uppdateras" -#: builtin/fetch.c:711 builtin/fetch.c:794 +#: builtin/fetch.c:714 builtin/fetch.c:797 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:722 +#: builtin/fetch.c:725 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5331,55 +5443,55 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:774 +#: builtin/fetch.c:777 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:775 +#: builtin/fetch.c:778 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:799 +#: builtin/fetch.c:802 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:800 builtin/remote.c:1060 +#: builtin/fetch.c:803 builtin/remote.c:1057 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:819 +#: builtin/fetch.c:822 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:838 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:841 +#: builtin/fetch.c:844 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:897 +#: builtin/fetch.c:900 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:1059 +#: builtin/fetch.c:1063 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1061 builtin/remote.c:90 +#: builtin/fetch.c:1065 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1079 +#: builtin/fetch.c:1083 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5387,32 +5499,32 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1106 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1144 +#: builtin/fetch.c:1148 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1146 +#: builtin/fetch.c:1150 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1173 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1171 +#: builtin/fetch.c:1175 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1182 +#: builtin/fetch.c:1186 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1190 +#: builtin/fetch.c:1194 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -5422,132 +5534,132 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 +#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590 -#: parse-options.h:132 parse-options.h:239 +#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590 +#: parse-options.h:131 parse-options.h:238 msgid "n" msgstr "n" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:669 msgid "populate log with at most <n> entries from shortlog" msgstr "fyll i loggen med som mest <n> poster från shortlog" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:672 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:675 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:676 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:677 msgid "file to read from" msgstr "fil att läsa från" -#: builtin/for-each-ref.c:675 +#: builtin/for-each-ref.c:687 msgid "unable to parse format" msgstr "kan inte tolka formatet" -#: builtin/for-each-ref.c:1063 +#: builtin/for-each-ref.c:1083 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<flaggor>] [<mönster>]" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1098 msgid "quote placeholders suitably for shells" msgstr "citera platshållare passande för skal" -#: builtin/for-each-ref.c:1080 +#: builtin/for-each-ref.c:1100 msgid "quote placeholders suitably for perl" msgstr "citera platshållare passande för perl" -#: builtin/for-each-ref.c:1082 +#: builtin/for-each-ref.c:1102 msgid "quote placeholders suitably for python" msgstr "citera platshållare passande för python" -#: builtin/for-each-ref.c:1084 +#: builtin/for-each-ref.c:1104 msgid "quote placeholders suitably for Tcl" msgstr "citera platshållare passande för Tcl" -#: builtin/for-each-ref.c:1087 +#: builtin/for-each-ref.c:1107 msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:1088 builtin/replace.c:438 +#: builtin/for-each-ref.c:1108 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1108 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1109 msgid "key" msgstr "nyckel" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1110 msgid "field name to sort on" msgstr "fältnamn att sortera på" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:147 builtin/prune.c:137 +#: builtin/fsck.c:147 builtin/prune.c:236 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: builtin/fsck.c:540 +#: builtin/fsck.c:548 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:603 +#: builtin/fsck.c:611 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:609 +#: builtin/fsck.c:617 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:610 +#: builtin/fsck.c:618 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:611 +#: builtin/fsck.c:619 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:612 +#: builtin/fsck.c:620 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:613 +#: builtin/fsck.c:621 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:614 +#: builtin/fsck.c:622 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:615 +#: builtin/fsck.c:623 msgid "also consider packs and alternate objects" msgstr "ta även hänsyn till paket och alternativa objekt" -#: builtin/fsck.c:616 +#: builtin/fsck.c:624 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:618 +#: builtin/fsck.c:626 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:619 builtin/prune.c:108 +#: builtin/fsck.c:627 builtin/prune.c:198 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:669 +#: builtin/fsck.c:677 msgid "Checking objects" msgstr "Kontrollerar objekt" @@ -5555,48 +5667,48 @@ msgstr "Kontrollerar objekt" msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" -#: builtin/gc.c:79 +#: builtin/gc.c:67 #, c-format -msgid "Invalid gc.pruneexpire: '%s'" -msgstr "Ogiltig gc.pruneexpire: '%s'" +msgid "Invalid %s: '%s'" +msgstr "Felaktigt %s: \"%s\"" -#: builtin/gc.c:107 +#: builtin/gc.c:112 #, c-format msgid "insanely long object directory %.*s" msgstr "tokigt lång objektkatalog %.*s" -#: builtin/gc.c:276 +#: builtin/gc.c:281 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:278 +#: builtin/gc.c:283 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:279 +#: builtin/gc.c:284 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:280 +#: builtin/gc.c:285 msgid "force running gc even if there may be another gc running" msgstr "tvinga gc-körning även om en annan gc kanske körs" -#: builtin/gc.c:321 +#: builtin/gc.c:327 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n" -#: builtin/gc.c:323 +#: builtin/gc.c:329 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:324 +#: builtin/gc.c:330 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Se \"git help gc\" för manuell hushållning.\n" -#: builtin/gc.c:342 +#: builtin/gc.c:348 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5604,7 +5716,7 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:364 +#: builtin/gc.c:376 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5808,7 +5920,7 @@ msgstr "visa träffade filer i filbläddraren" msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:741 builtin/show-ref.c:187 +#: builtin/grep.c:741 builtin/show-ref.c:189 msgid "show usage" msgstr "visa användning" @@ -5836,7 +5948,7 @@ msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll." msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:80 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -5844,37 +5956,37 @@ msgstr "" "git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] " "<fil>..." -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:81 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <sökvägslista>" -#: builtin/hash-object.c:94 builtin/tag.c:612 +#: builtin/hash-object.c:92 builtin/tag.c:612 msgid "type" msgstr "typ" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:92 msgid "object type" msgstr "objekttyp" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:93 msgid "write the object into the object database" msgstr "skriv objektet till objektdatabasen" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:95 msgid "read the object from stdin" msgstr "läs objektet från standard in" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:97 msgid "store file as is without filters" msgstr "spara filen som den är utan filer" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:98 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:99 msgid "process file as it were from this path" msgstr "hantera filen som om den kom från sökvägen" @@ -6002,291 +6114,291 @@ msgstr "användning: %s%s" msgid "`git %s' is aliased to `%s'" msgstr "\"git %s\" är ett alias för \"%s\"" -#: builtin/index-pack.c:150 +#: builtin/index-pack.c:151 #, c-format msgid "unable to open %s" msgstr "kunde inte öppna %s" -#: builtin/index-pack.c:200 +#: builtin/index-pack.c:201 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:220 +#: builtin/index-pack.c:221 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objektet %s: förväntad typ %s, såg %s" -#: builtin/index-pack.c:265 +#: builtin/index-pack.c:266 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kan inte fylla %d byte" msgstr[1] "kan inte fylla %d byte" -#: builtin/index-pack.c:275 +#: builtin/index-pack.c:276 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:276 +#: builtin/index-pack.c:277 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:288 +#: builtin/index-pack.c:289 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:296 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:312 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:316 +#: builtin/index-pack.c:317 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:330 +#: builtin/index-pack.c:331 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:332 +#: builtin/index-pack.c:333 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:350 +#: builtin/index-pack.c:351 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "paketet har felaktigt objekt vid index %lu: %s" -#: builtin/index-pack.c:471 +#: builtin/index-pack.c:472 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:520 +#: builtin/index-pack.c:521 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:567 +#: builtin/index-pack.c:568 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:569 +#: builtin/index-pack.c:570 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas" msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas" -#: builtin/index-pack.c:595 +#: builtin/index-pack.c:596 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715 -#: builtin/index-pack.c:749 builtin/index-pack.c:758 +#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771 +#: builtin/index-pack.c:805 builtin/index-pack.c:814 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/index-pack.c:745 builtin/pack-objects.c:162 #: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:755 +#: builtin/index-pack.c:811 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:769 +#: builtin/index-pack.c:825 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:783 +#: builtin/index-pack.c:839 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/index-pack.c:787 +#: builtin/index-pack.c:843 msgid "Error in object" msgstr "Fel i objekt" -#: builtin/index-pack.c:789 +#: builtin/index-pack.c:845 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Inte alla barnobjekt för %s kan nås" -#: builtin/index-pack.c:861 builtin/index-pack.c:890 +#: builtin/index-pack.c:917 builtin/index-pack.c:948 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1081 +#: builtin/index-pack.c:1150 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1086 +#: builtin/index-pack.c:1155 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1089 +#: builtin/index-pack.c:1158 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1169 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1194 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1133 +#: builtin/index-pack.c:1205 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1247 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1181 +#: builtin/index-pack.c:1253 #, c-format msgid "completed with %d local objects" msgstr "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1191 +#: builtin/index-pack.c:1263 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1267 #, 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:1219 +#: builtin/index-pack.c:1291 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1367 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1322 +#: builtin/index-pack.c:1391 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1335 +#: builtin/index-pack.c:1404 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1343 +#: builtin/index-pack.c:1412 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1356 +#: builtin/index-pack.c:1425 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1436 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1469 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1475 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1658 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1537 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1539 #, 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:1517 +#: builtin/index-pack.c:1586 #, 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:1524 +#: builtin/index-pack.c:1593 #, 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:1553 +#: builtin/index-pack.c:1622 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 -#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 +#: builtin/index-pack.c:1670 builtin/index-pack.c:1673 +#: builtin/index-pack.c:1685 builtin/index-pack.c:1689 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1634 +#: builtin/index-pack.c:1703 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 +#: builtin/index-pack.c:1707 builtin/index-pack.c:1716 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1655 +#: builtin/index-pack.c:1724 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -6355,22 +6467,22 @@ msgstr "mallarna hittades inte %s" msgid "not copying templates of a wrong format version %d from '%s'" msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\"" -#: builtin/init-db.c:197 +#: builtin/init-db.c:211 #, c-format msgid "insane git directory %s" msgstr "tokig git-katalog %s" -#: builtin/init-db.c:331 builtin/init-db.c:334 +#: builtin/init-db.c:343 builtin/init-db.c:346 #, c-format msgid "%s already exists" msgstr "%s finns redan" -#: builtin/init-db.c:363 +#: builtin/init-db.c:374 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:366 +#: builtin/init-db.c:377 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" @@ -6378,54 +6490,54 @@ 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:426 +#: builtin/init-db.c:433 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git-arkiv i %s%s\n" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Reinitialized existing" msgstr "Ominitierade befintligt" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Initialized empty" msgstr "Initierade tomt" -#: builtin/init-db.c:428 +#: builtin/init-db.c:435 msgid " shared" msgstr " delat" -#: builtin/init-db.c:475 +#: builtin/init-db.c:482 msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" -"[=<permissions>]] [<directory>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" +"shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared" -"[=<behörigheter>]] [<katalog>]" +"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" +"shared[=<behörigheter>]] [<katalog>]" -#: builtin/init-db.c:498 +#: builtin/init-db.c:505 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:499 +#: builtin/init-db.c:506 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:501 builtin/prune-packed.c:57 builtin/repack.c:171 +#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171 msgid "be quiet" msgstr "var tyst" -#: builtin/init-db.c:533 builtin/init-db.c:538 +#: builtin/init-db.c:540 builtin/init-db.c:545 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:542 +#: builtin/init-db.c:549 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:563 +#: builtin/init-db.c:570 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6434,7 +6546,7 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:591 +#: builtin/init-db.c:598 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" @@ -6444,8 +6556,8 @@ msgid "" "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " "[<file>...]" msgstr "" -"git interpret-trailers [--trim-empty] [(--trailer <symbol>[(=|:)" -"<värde>])...] [<fil>...]" +"git interpret-trailers [--trim-empty] [(--trailer " +"<symbol>[(=|:)<värde>])...] [<fil>...]" #: builtin/interpret-trailers.c:25 msgid "trim empty trailers" @@ -6460,7 +6572,7 @@ msgid "trailer(s) to add" msgstr "släprad(er) att lägga till" #: builtin/log.c:41 -msgid "git log [<options>] [<revision range>] [[--] <path>...]" +msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" #: builtin/log.c:42 @@ -6529,7 +6641,7 @@ msgstr "Kan inte öppna patchfilen %s" msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:811 +#: builtin/log.c:813 msgid "Not a range." msgstr "Inte ett intervall." @@ -6729,13 +6841,13 @@ msgstr "Misslyckades skapa utdatafiler" msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1638 +#: builtin/log.c:1637 #, 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:1651 builtin/log.c:1653 builtin/log.c:1665 +#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" @@ -7008,42 +7120,42 @@ msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:559 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:654 +#: builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/merge.c:678 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:692 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:705 +#: builtin/merge.c:683 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:794 +#: builtin/merge.c:772 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:803 +#: builtin/merge.c:781 #, 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:809 +#: builtin/merge.c:787 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7059,48 +7171,53 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:833 +#: builtin/merge.c:811 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:845 +#: builtin/merge.c:823 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:900 +#: builtin/merge.c:878 #, 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:916 +#: builtin/merge.c:894 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:957 +#: builtin/merge.c:935 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:959 +#: builtin/merge.c:937 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:961 +#: builtin/merge.c:939 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:966 +#: builtin/merge.c:944 #, 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:1122 +#: builtin/merge.c:1081 +#, c-format +msgid "could not close '%s'" +msgstr "kunde inte stänga \"%s\"" + +#: builtin/merge.c:1208 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1138 +#: builtin/merge.c:1224 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7108,11 +7225,11 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1141 git-pull.sh:34 +#: builtin/merge.c:1227 git-pull.sh:74 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: builtin/merge.c:1145 +#: builtin/merge.c:1231 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7120,102 +7237,102 @@ 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:1148 +#: builtin/merge.c:1234 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:1157 +#: builtin/merge.c:1243 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1166 +#: builtin/merge.c:1251 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1198 -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:1201 +#: builtin/merge.c:1268 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1203 +#: builtin/merge.c:1270 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:1208 +#: builtin/merge.c:1276 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1259 +#: builtin/merge.c:1278 +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:1333 #, 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:1262 +#: builtin/merge.c:1336 #, 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:1265 +#: builtin/merge.c:1339 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1268 +#: builtin/merge.c:1342 #, 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:1349 +#: builtin/merge.c:1423 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1388 +#: builtin/merge.c:1462 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1395 +#: builtin/merge.c:1469 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1427 +#: builtin/merge.c:1501 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1450 builtin/merge.c:1529 +#: builtin/merge.c:1524 builtin/merge.c:1603 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1454 +#: builtin/merge.c:1528 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1520 +#: builtin/merge.c:1594 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1522 +#: builtin/merge.c:1596 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1605 #, 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:1543 +#: builtin/merge.c:1617 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7405,7 +7522,7 @@ 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:256 builtin/remote.c:728 builtin/repack.c:359 +#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -7781,7 +7898,7 @@ msgstr "anteckningar-ref" msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:989 builtin/remote.c:1621 +#: builtin/notes.c:989 builtin/remote.c:1618 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -7803,171 +7920,171 @@ msgstr "fel i deflate (%d)" msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1013 +#: builtin/pack-objects.c:1011 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:2173 +#: builtin/pack-objects.c:2171 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2570 +#: builtin/pack-objects.c:2568 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2572 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2597 +#: builtin/pack-objects.c:2595 #, c-format msgid "option %s does not accept negative form" msgstr "flaggan %s godtar inte negativ form" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2599 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "kunde inte tolka värdet \"%s\" för flaggan %s" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2619 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2626 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsmätaren visas" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:2627 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2633 +#: builtin/pack-objects.c:2631 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 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:2643 +#: builtin/pack-objects.c:2641 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:2645 +#: builtin/pack-objects.c:2643 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 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:2653 +#: builtin/pack-objects.c:2651 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 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:2660 +#: builtin/pack-objects.c:2658 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2661 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2664 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2667 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2674 parse-options.h:140 +#: builtin/pack-objects.c:2672 parse-options.h:139 msgid "time" msgstr "tid" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2678 +#: builtin/pack-objects.c:2676 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 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:2690 +#: builtin/pack-objects.c:2688 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:2781 +#: builtin/pack-objects.c:2779 msgid "Counting objects" msgstr "Räknar objekt" @@ -7995,18 +8112,56 @@ msgstr "Tar bort duplicerade objekt" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:106 +#: builtin/prune.c:86 +#, c-format +msgid "Removing worktrees/%s: not a valid directory" +msgstr "Tar bort worktrees/%s: inte en giltig katalog" + +#: builtin/prune.c:92 +#, c-format +msgid "Removing worktrees/%s: gitdir file does not exist" +msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" + +#: builtin/prune.c:97 +#, 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/prune.c:108 +#, c-format +msgid "Removing worktrees/%s: invalid gitdir file" +msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" + +#: builtin/prune.c:124 +#, 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/prune.c:159 +#, c-format +msgid "failed to remove: %s" +msgstr "misslyckades ta bort: %s" + +#: builtin/prune.c:196 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/prune.c:107 +#: builtin/prune.c:197 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:110 +#: builtin/prune.c:199 +msgid "prune .git/worktrees" +msgstr "rensa .git/worktrees" + +#: builtin/prune.c:201 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" +#: builtin/prune.c:216 +msgid "--worktrees does not take extra arguments" +msgstr "--worktrees tar inte ytterligare argument" + #: builtin/push.c:14 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" @@ -8411,12 +8566,12 @@ msgstr "hoppa över att applicera filter för gles utcheckning" msgid "debug unpack-trees" msgstr "felsök unpack-trees" -#: builtin/reflog.c:429 +#: builtin/reflog.c:430 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: builtin/reflog.c:546 builtin/reflog.c:551 +#: builtin/reflog.c:547 builtin/reflog.c:552 #, c-format msgid "'%s' is not a valid timestamp" msgstr "\"%s\" är inte en giltig tidsstämpel" @@ -8553,12 +8708,12 @@ msgstr "att ange en master-gren ger ingen mening med --mirror" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar" -#: builtin/remote.c:187 builtin/remote.c:643 +#: builtin/remote.c:187 builtin/remote.c:640 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:191 builtin/remote.c:647 +#: builtin/remote.c:191 builtin/remote.c:644 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" @@ -8581,27 +8736,27 @@ msgstr "(matchande)" msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604 +#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Kunde inte tillämpa \"%s\" på \"%s\"" -#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895 +#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892 #, c-format msgid "No such remote: %s" msgstr "Inget sådant fjärrarkiv: %s" -#: builtin/remote.c:653 +#: builtin/remote.c:650 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:659 builtin/remote.c:847 +#: builtin/remote.c:656 builtin/remote.c:844 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:674 +#: builtin/remote.c:671 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8612,32 +8767,32 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:680 +#: builtin/remote.c:677 #, c-format msgid "Could not append '%s'" msgstr "Kunde inte lägga till på \"%s\"" -#: builtin/remote.c:691 +#: builtin/remote.c:688 #, c-format msgid "Could not set '%s'" msgstr "Kunde inte sätta \"%s\"" -#: builtin/remote.c:713 +#: builtin/remote.c:710 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:747 +#: builtin/remote.c:744 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:766 +#: builtin/remote.c:763 #, c-format msgid "Could not remove branch %s" msgstr "Kunde inte ta bort grenen %s" -#: builtin/remote.c:833 +#: builtin/remote.c:830 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8651,262 +8806,262 @@ msgstr[1] "" "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n" "för att ta bort dem, använd:" -#: builtin/remote.c:948 +#: builtin/remote.c:945 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:951 +#: builtin/remote.c:948 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:953 +#: builtin/remote.c:950 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:955 +#: builtin/remote.c:952 msgid " ???" msgstr " ???" -#: builtin/remote.c:996 +#: builtin/remote.c:993 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren" -#: builtin/remote.c:1003 +#: builtin/remote.c:1000 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:1006 +#: builtin/remote.c:1003 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:1007 +#: builtin/remote.c:1004 msgid " and with remote" msgstr " och med fjärren" -#: builtin/remote.c:1009 +#: builtin/remote.c:1006 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:1010 +#: builtin/remote.c:1007 msgid " and with remote" msgstr " och med fjärren" -#: builtin/remote.c:1056 +#: builtin/remote.c:1053 msgid "create" msgstr "skapa" -#: builtin/remote.c:1059 +#: builtin/remote.c:1056 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1063 +#: builtin/remote.c:1060 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1066 +#: builtin/remote.c:1063 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1069 +#: builtin/remote.c:1066 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1076 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1079 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1083 +#: builtin/remote.c:1080 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1086 +#: builtin/remote.c:1083 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1154 +#: builtin/remote.c:1151 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1181 +#: builtin/remote.c:1178 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1182 +#: builtin/remote.c:1179 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1183 builtin/remote.c:1334 +#: builtin/remote.c:1180 builtin/remote.c:1331 msgid "(no URL)" msgstr "(ingen URL)" -#: builtin/remote.c:1192 builtin/remote.c:1194 +#: builtin/remote.c:1189 builtin/remote.c:1191 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200 +#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1202 +#: builtin/remote.c:1199 #, 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:1214 +#: builtin/remote.c:1211 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1217 builtin/remote.c:1244 +#: builtin/remote.c:1214 builtin/remote.c:1241 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1226 +#: builtin/remote.c:1223 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:1234 +#: builtin/remote.c:1231 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1241 +#: builtin/remote.c:1238 #, 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:1262 +#: builtin/remote.c:1259 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1264 +#: builtin/remote.c:1261 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1279 +#: builtin/remote.c:1276 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1281 +#: builtin/remote.c:1278 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:1291 +#: builtin/remote.c:1288 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1296 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1301 +#: builtin/remote.c:1298 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1319 +#: builtin/remote.c:1316 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1320 +#: builtin/remote.c:1317 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1330 +#: builtin/remote.c:1327 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1331 +#: builtin/remote.c:1328 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1354 +#: builtin/remote.c:1351 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1354 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1402 +#: builtin/remote.c:1399 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1468 builtin/remote.c:1542 +#: builtin/remote.c:1465 builtin/remote.c:1539 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1488 +#: builtin/remote.c:1485 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1495 +#: builtin/remote.c:1492 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1517 +#: builtin/remote.c:1514 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1519 +#: builtin/remote.c:1516 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1521 +#: builtin/remote.c:1518 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1528 +#: builtin/remote.c:1525 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1568 +#: builtin/remote.c:1565 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1576 +#: builtin/remote.c:1573 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1578 +#: builtin/remote.c:1575 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1592 +#: builtin/remote.c:1589 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" @@ -8978,7 +9133,7 @@ msgstr "maximal storlek på varje paketfil" msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:375 +#: builtin/repack.c:377 #, c-format msgid "removing '%s' failed" msgstr "misslyckades ta bort \"%s\"" @@ -9355,7 +9510,7 @@ msgstr "" "\n" "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" -#: builtin/rm.c:231 +#: builtin/rm.c:230 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -9367,7 +9522,7 @@ msgstr[0] "" msgstr[1] "" "följande filer har köat innehåll som skiljer sig både från filen och HEAD:" -#: builtin/rm.c:236 +#: builtin/rm.c:235 msgid "" "\n" "(use -f to force removal)" @@ -9375,13 +9530,13 @@ msgstr "" "\n" "(använd -f för att tvinga borttagning)" -#: builtin/rm.c:240 +#: builtin/rm.c:239 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "följande fil har ändringar köade i indexet:" msgstr[1] "följande filer har ändringar köade i indexet:" -#: builtin/rm.c:244 builtin/rm.c:255 +#: builtin/rm.c:243 builtin/rm.c:254 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -9389,43 +9544,43 @@ msgstr "" "\n" "(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: builtin/rm.c:252 +#: builtin/rm.c:251 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "följande fil har lokala ändringar:" msgstr[1] "följande filer har lokala ändringar:" -#: builtin/rm.c:270 +#: builtin/rm.c:269 msgid "do not list removed files" msgstr "lista inte borttagna filer" -#: builtin/rm.c:271 +#: builtin/rm.c:270 msgid "only remove from the index" msgstr "ta bara bort från indexet" -#: builtin/rm.c:272 +#: builtin/rm.c:271 msgid "override the up-to-date check" msgstr "överstyr àjour-testet" -#: builtin/rm.c:273 +#: builtin/rm.c:272 msgid "allow recursive removal" msgstr "tillåt rekursiv borttagning" -#: builtin/rm.c:275 +#: builtin/rm.c:274 msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus även om inget träffades" -#: builtin/rm.c:318 +#: 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:336 +#: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:375 +#: builtin/rm.c:374 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" @@ -9475,67 +9630,67 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:659 msgid "show remote-tracking and local branches" msgstr "visa fjärrspårande och lokala grenar" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:661 msgid "show remote-tracking branches" msgstr "visa fjärrspårande grenar" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:663 msgid "color '*!+-' corresponding to the branch" msgstr "färga \"*!+-\" enligt grenen" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:665 msgid "show <n> more commits after the common ancestor" msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:667 msgid "synonym to more=-1" msgstr "synonym till more=-1" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:668 msgid "suppress naming strings" msgstr "undertyck namnsträngar" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:670 msgid "include the current branch" msgstr "inkludera aktuell gren" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:672 msgid "name commits with their object names" msgstr "namnge incheckningar med deras objektnamn" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:674 msgid "show possible merge bases" msgstr "visa möjliga sammanslagningsbaser" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:676 msgid "show refs unreachable from any other ref" msgstr "visa referenser som inte kan nås från någon annan referens" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:678 msgid "show commits in topological order" msgstr "visa incheckningar i topologisk ordning" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:681 msgid "show only commits not on the first branch" msgstr "visa endast incheckningar inte på den första grenen" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:683 msgid "show merges reachable from only one tip" msgstr "visa sammanslagningar som endast kan nås från en spets" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:685 msgid "topologically sort, maintaining date order where possible" msgstr "sortera topologiskt, behåll datumordning när möjligt" -#: builtin/show-branch.c:681 +#: builtin/show-branch.c:688 msgid "<n>[,<base>]" msgstr "<n>[,<bas>]" -#: builtin/show-branch.c:682 +#: builtin/show-branch.c:689 msgid "show <n> most recent ref-log entries starting at base" msgstr "visa <n> nyaste refloggposter med början på bas" @@ -9551,35 +9706,35 @@ msgstr "" msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "git show-ref --exclude-existing[=mönster] < reflista" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:170 msgid "only show tags (can be combined with heads)" msgstr "visa endast taggar (kan kombineras med huvuden)" -#: builtin/show-ref.c:169 +#: builtin/show-ref.c:171 msgid "only show heads (can be combined with tags)" msgstr "visa endast huvuden (kan kombineras med taggar)" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:172 msgid "stricter reference checking, requires exact ref path" msgstr "striktare referenskontroll, kräver exakt referenssökväg" -#: builtin/show-ref.c:173 builtin/show-ref.c:175 +#: builtin/show-ref.c:175 builtin/show-ref.c:177 msgid "show the HEAD reference, even if it would be filtered out" msgstr "visa HEAD-refrens, även när den skulle filtreras ut" -#: builtin/show-ref.c:177 +#: builtin/show-ref.c:179 msgid "dereference tags into object IDs" msgstr "avreferera taggar till objekt-id" -#: builtin/show-ref.c:179 +#: builtin/show-ref.c:181 msgid "only show SHA1 hash using <n> digits" msgstr "visa SHA1-hash endast med <n> siffror" -#: builtin/show-ref.c:183 +#: builtin/show-ref.c:185 msgid "do not print results to stdout (useful with --verify)" msgstr "visa inte resultat på standard ut (användbart med --verify)" -#: builtin/show-ref.c:185 +#: builtin/show-ref.c:187 msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" @@ -9840,122 +9995,191 @@ msgstr "Uppdaterad tagg \"%s\" (var %s)\n" msgid "Unpacking objects" msgstr "Packar upp objekt" -#: builtin/update-index.c:403 +#: builtin/update-index.c:70 +#, c-format +msgid "failed to create directory %s" +msgstr "misslyckades skapa katalogen %s" + +#: builtin/update-index.c:76 +#, c-format +msgid "failed to stat %s" +msgstr "misslyckades ta status på %s" + +#: builtin/update-index.c:86 +#, c-format +msgid "failed to create file %s" +msgstr "misslyckades skapa filen %s" + +#: builtin/update-index.c:94 +#, c-format +msgid "failed to delete file %s" +msgstr "misslyckades ta bort filen %s" + +#: builtin/update-index.c:101 builtin/update-index.c:203 +#, c-format +msgid "failed to delete directory %s" +msgstr "misslyckades ta bort katalogen %s" + +#: builtin/update-index.c:124 +#, c-format +msgid "Testing " +msgstr "Testar" + +#: builtin/update-index.c:136 +msgid "directory stat info does not change after adding a new file" +msgstr "stat-informationen för en katalog ändras inte när nya filer läggs till" + +#: builtin/update-index.c:149 +msgid "directory stat info does not change after adding a new directory" +msgstr "" +"stat-informationen för en katalog ändras inte när nya kataloger läggs till" + +#: builtin/update-index.c:162 +msgid "directory stat info changes after updating a file" +msgstr "stat-informationen för en katalog ändras när filer uppdateras" + +#: builtin/update-index.c:173 +msgid "directory stat info changes after adding a file inside subdirectory" +msgstr "" +"stat-informationen för en katalog ändras när filer läggs till i en " +"underkatalog" + +#: builtin/update-index.c:184 +msgid "directory stat info does not change after deleting a file" +msgstr "stat-informationen för en katalog ändras inte när en fil tas bort" + +#: builtin/update-index.c:197 +msgid "directory stat info does not change after deleting a directory" +msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort" + +#: builtin/update-index.c:204 +msgid " OK" +msgstr " OK" + +#: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:757 +#: builtin/update-index.c:918 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:760 +#: builtin/update-index.c:921 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:763 +#: builtin/update-index.c:924 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:765 +#: builtin/update-index.c:926 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:767 +#: builtin/update-index.c:928 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:769 +#: builtin/update-index.c:930 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:772 +#: builtin/update-index.c:933 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:776 +#: builtin/update-index.c:937 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:780 +#: builtin/update-index.c:941 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:781 +#: builtin/update-index.c:942 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:785 +#: builtin/update-index.c:946 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:786 +#: builtin/update-index.c:947 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/update-index.c:790 +#: builtin/update-index.c:951 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:793 +#: builtin/update-index.c:954 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:796 +#: builtin/update-index.c:957 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:799 +#: builtin/update-index.c:960 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:802 +#: builtin/update-index.c:963 msgid "add to index only; do not add content to object database" msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen" -#: builtin/update-index.c:804 +#: builtin/update-index.c:965 msgid "remove named paths even if present in worktree" msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" -#: builtin/update-index.c:806 +#: builtin/update-index.c:967 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:808 +#: builtin/update-index.c:969 msgid "read list of paths to be updated from standard input" msgstr "läs lista över sökvägar att uppdatera från standard in" -#: builtin/update-index.c:812 +#: builtin/update-index.c:973 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:816 +#: builtin/update-index.c:977 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "återfyll etapp 2 och 3 från angivna sökvägar" -#: builtin/update-index.c:820 +#: builtin/update-index.c:981 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:824 +#: builtin/update-index.c:985 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:827 +#: builtin/update-index.c:988 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:829 +#: builtin/update-index.c:990 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:833 +#: builtin/update-index.c:994 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:835 +#: builtin/update-index.c:996 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" +#: builtin/update-index.c:998 +msgid "enable/disable untracked cache" +msgstr "aktivera/inaktivera ospårad cache" + +#: builtin/update-index.c:1000 +msgid "enable untracked cache without testing the filesystem" +msgstr "aktivera ospårad cache utan att testa filsystemet" + #: builtin/update-ref.c:9 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<flaggor>] -d <refnamn> [<gammaltvärde>]" @@ -10050,107 +10274,127 @@ 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." -#: common-cmds.h:8 +#: common-cmds.h:10 +msgid "start a working area (see also: git help tutorial)" +msgstr "starta arbetskatalog (se också: git help tutorial)" + +#: common-cmds.h:11 +msgid "work on the current change (see also: git help everyday)" +msgstr "jobba med aktuell förändring (se också: git help everyday)" + +#: common-cmds.h:12 +msgid "examine the history and state (see also: git help revisions)" +msgstr "utforska historiken och tillståndet (se också: git help revisions)" + +#: common-cmds.h:13 +msgid "grow, mark and tweak your common history" +msgstr "utöka, markera och justera din gemensamma historik" + +#: common-cmds.h:14 +msgid "collaborate (see also: git help workflows)" +msgstr "samarbeta (se också: git help workflows)" + +#: common-cmds.h:18 msgid "Add file contents to the index" msgstr "Lägg filinnehåll till indexet" -#: common-cmds.h:9 +#: common-cmds.h:19 msgid "Find by binary search the change that introduced a bug" msgstr "Binärsök för att hitta ändringen som introducerade ett fel" -#: common-cmds.h:10 +#: common-cmds.h:20 msgid "List, create, or delete branches" msgstr "Visa, skapa eller ta bort grenar" -#: common-cmds.h:11 +#: common-cmds.h:21 msgid "Checkout a branch or paths to the working tree" msgstr "Checka ut en gren eller filer i arbetskatalogen" -#: common-cmds.h:12 +#: common-cmds.h:22 msgid "Clone a repository into a new directory" msgstr "Klona ett arkiv till en ny katalog" -#: common-cmds.h:13 +#: common-cmds.h:23 msgid "Record changes to the repository" msgstr "Protokollför ändringar i arkivet" -#: common-cmds.h:14 +#: common-cmds.h:24 msgid "Show changes between commits, commit and working tree, etc" msgstr "Visa ändringar mellan incheckningar, med arbetskatalogen, osv" -#: common-cmds.h:15 +#: common-cmds.h:25 msgid "Download objects and refs from another repository" msgstr "Hämta objekt och referenser från annat arkiv" -#: common-cmds.h:16 +#: common-cmds.h:26 msgid "Print lines matching a pattern" msgstr "Visa rader som motsvarar mönster" -#: common-cmds.h:17 +#: common-cmds.h:27 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt" -#: common-cmds.h:18 +#: common-cmds.h:28 msgid "Show commit logs" msgstr "Visa incheckningsloggar" -#: common-cmds.h:19 +#: common-cmds.h:29 msgid "Join two or more development histories together" msgstr "Slå ihop två eller flera utvecklingshistorier" -#: common-cmds.h:20 +#: common-cmds.h:30 msgid "Move or rename a file, a directory, or a symlink" msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk" -#: common-cmds.h:21 +#: common-cmds.h:31 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Hämta från och integrera med annat arkiv eller en lokal gren" -#: common-cmds.h:22 +#: common-cmds.h:32 msgid "Update remote refs along with associated objects" msgstr "Uppdatera fjärr-referenser och tillhörande objekt" -#: common-cmds.h:23 +#: common-cmds.h:33 msgid "Forward-port local commits to the updated upstream head" msgstr "Framåtanpassa lokala kommandon på uppdaterat uppströmshuvud" -#: common-cmds.h:24 +#: common-cmds.h:34 msgid "Reset current HEAD to the specified state" msgstr "Återställ aktuell HEAD till angivet tillstånd" -#: common-cmds.h:25 +#: common-cmds.h:35 msgid "Remove files from the working tree and from the index" msgstr "Ta bort filer från arbetskatalogen och från indexet" -#: common-cmds.h:26 +#: common-cmds.h:36 msgid "Show various types of objects" msgstr "Visa olika sorters objekt" -#: common-cmds.h:27 +#: common-cmds.h:37 msgid "Show the working tree status" msgstr "Visa status för arbetskatalogen" -#: common-cmds.h:28 +#: common-cmds.h:38 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt" -#: parse-options.h:143 +#: parse-options.h:142 msgid "expiry-date" msgstr "giltig-till" -#: parse-options.h:158 +#: parse-options.h:157 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:232 +#: parse-options.h:231 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:234 +#: parse-options.h:233 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:240 +#: parse-options.h:239 msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" @@ -10162,7 +10406,7 @@ msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" msgid "You need to set your committer info first" msgstr "Du måste ställa in din incheckarinformation först" -#: git-am.sh:98 +#: git-am.sh:100 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10170,7 +10414,7 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: git-am.sh:108 +#: git-am.sh:110 #, sh-format msgid "" "When you have resolved this problem, run \"$cmdline --continue\".\n" @@ -10181,21 +10425,21 @@ msgstr "" "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n" "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"." -#: git-am.sh:124 +#: git-am.sh:126 msgid "Cannot fall back to three-way merge." msgstr "Kan inte falla tillbaka på trevägssammanslagning." -#: git-am.sh:140 +#: git-am.sh:142 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." -#: git-am.sh:142 +#: git-am.sh:144 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: git-am.sh:157 +#: git-am.sh:159 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10203,29 +10447,29 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: git-am.sh:166 +#: git-am.sh:168 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: git-am.sh:182 +#: git-am.sh:185 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: git-am.sh:277 +#: git-am.sh:280 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: git-am.sh:364 +#: git-am.sh:367 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "Patchformatet $patch_format stöds inte." -#: git-am.sh:366 +#: git-am.sh:369 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: git-am.sh:398 +#: git-am.sh:407 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." @@ -10233,16 +10477,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." -#: git-am.sh:496 +#: git-am.sh:507 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs." -#: git-am.sh:501 +#: git-am.sh:512 msgid "Please make up your mind. --skip or --abort?" msgstr "Bestäm dig. --skip eller --abort?" -#: git-am.sh:537 +#: git-am.sh:560 #, sh-format msgid "" "Stray $dotest directory found.\n" @@ -10251,16 +10495,16 @@ msgstr "" "Kvarbliven katalog $dotest hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: git-am.sh:545 +#: git-am.sh:568 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: git-am.sh:612 +#: git-am.sh:635 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: $files)" -#: git-am.sh:722 +#: git-am.sh:747 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -10271,32 +10515,32 @@ msgstr "" "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n" "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"." -#: git-am.sh:749 +#: git-am.sh:774 msgid "Patch does not have a valid e-mail address." msgstr "Patchen har inte någon giltig e-postadress." -#: git-am.sh:796 +#: git-am.sh:821 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "kan inte vara interaktiv om standard in inte är ansluten till en terminal." -#: git-am.sh:800 +#: git-am.sh:825 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:807 +#: git-am.sh:832 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 " -#: git-am.sh:843 +#: git-am.sh:868 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Tillämpar: $FIRSTLINE" -#: git-am.sh:864 +#: git-am.sh:889 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10306,7 +10550,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." -#: git-am.sh:872 +#: git-am.sh:897 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" @@ -10314,16 +10558,16 @@ msgstr "" "Du har fortfarande sökvägar som inte slagits samman i ditt index\n" "glömde du använda \"git add\"?" -#: git-am.sh:888 +#: git-am.sh:913 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: git-am.sh:898 +#: git-am.sh:923 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE" -#: git-am.sh:901 +#: git-am.sh:926 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" @@ -10332,7 +10576,7 @@ msgstr "" "En kopia av patchen som misslyckades finns i:\n" " $dotest/patch" -#: git-am.sh:919 +#: git-am.sh:945 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" @@ -10492,7 +10736,7 @@ msgstr "" msgid "bisect run success" msgstr "\"bisect\"-körningen lyckades" -#: git-pull.sh:21 +#: git-pull.sh:61 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" @@ -10502,11 +10746,11 @@ msgstr "" "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" "där det är lämpligt för att ange lösning och checka in." -#: git-pull.sh:25 +#: git-pull.sh:65 msgid "Pull is not possible because you have unmerged files." msgstr "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in." -#: git-pull.sh:31 +#: git-pull.sh:71 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -10514,11 +10758,11 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." -#: git-pull.sh:245 +#: git-pull.sh:285 msgid "updating an unborn branch with changes added to the index" msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet" -#: git-pull.sh:269 +#: git-pull.sh:311 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -10529,11 +10773,11 @@ msgstr "" "Varning: snabbspolar din arbetskatalog från\n" "Varning: incheckningen $orig_head." -#: git-pull.sh:294 +#: git-pull.sh:336 msgid "Cannot merge multiple branches into empty head" msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: git-pull.sh:298 +#: git-pull.sh:340 msgid "Cannot rebase onto multiple branches" msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar" @@ -10731,7 +10975,7 @@ msgstr "Kan inte uppdatera $ref_stash med $w_commit" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:238 +#: git-stash.sh:241 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -10740,85 +10984,90 @@ msgstr "" "fel: felaktig flagga för \"stash save\": $option\n" " För att ange ett meddelande, använd git stash save -- \"$option\"" -#: git-stash.sh:259 +#: git-stash.sh:262 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: git-stash.sh:263 +#: git-stash.sh:266 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: git-stash.sh:267 +#: git-stash.sh:270 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: git-stash.sh:285 +#: git-stash.sh:288 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: git-stash.sh:384 +#: git-stash.sh:389 +#, sh-format +msgid "unknown option: $opt" +msgstr "okänd flagga: $opt" + +#: git-stash.sh:399 msgid "No stash found." msgstr "Ingen \"stash\" hittades." -#: git-stash.sh:391 +#: git-stash.sh:406 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-stash.sh:397 +#: git-stash.sh:412 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-stash.sh:425 +#: git-stash.sh:440 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-stash.sh:436 +#: git-stash.sh:451 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-stash.sh:444 +#: git-stash.sh:459 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-stash.sh:448 +#: git-stash.sh:463 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning" -#: git-stash.sh:456 +#: git-stash.sh:471 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-stash.sh:458 +#: git-stash.sh:473 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-stash.sh:492 +#: git-stash.sh:507 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:507 +#: git-stash.sh:522 msgid "Index was not unstashed." msgstr "Indexet har inte tagits ur kön." -#: git-stash.sh:530 +#: git-stash.sh:545 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:531 +#: git-stash.sh:546 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:539 +#: git-stash.sh:554 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:611 +#: git-stash.sh:626 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" @@ -11122,6 +11371,18 @@ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" +#~ msgid "The most commonly used git commands are:" +#~ msgstr "De mest använda git-kommandona är:" + +#~ msgid "No such branch: '%s'" +#~ msgstr "Okänd gren: \"%s\"" + +#~ msgid "Could not create git link %s" +#~ msgstr "Kunde inte skapa gitlänk %s" + +#~ msgid "Invalid gc.pruneexpire: '%s'" +#~ msgstr "Ogiltig gc.pruneexpire: '%s'" + #~ msgid "server does not support --atomic push" #~ msgstr "servern stöder inte push med --atomic" @@ -11167,9 +11428,6 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\"" #~ msgid "cannot update HEAD ref" #~ msgstr "kunde inte uppdatera HEAD-referens" -#~ msgid "Invalid %s: '%s'" -#~ msgstr "Felaktigt %s: \"%s\"" - #~ msgid "cannot tell cwd" #~ msgstr "kan inte läsa aktuell katalog (cwd)" @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git v2.4.0\n" +"Project-Id-Version: git v2.5.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-04-03 08:13+0800\n" -"PO-Revision-Date: 2015-04-03 08:51+0700\n" +"POT-Creation-Date: 2015-06-27 19:17+0800\n" +"PO-Revision-Date: 2015-06-28 14:40+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-Basepath: ../\n" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Gtranslator 2.91.7\n" #: advice.c:55 #, c-format @@ -55,7 +55,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <kho> [--exec <lệnh>] --list" -#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào" @@ -78,9 +78,9 @@ msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150 msgid "file" msgstr "tập_tin" @@ -112,7 +112,7 @@ 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:449 builtin/archive.c:90 builtin/clone.c:86 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77 msgid "repo" msgstr "kho" @@ -128,7 +128,7 @@ msgstr "lệnh" msgid "path to the remote git-upload-archive command" msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ" -#: attr.c:264 +#: attr.c:265 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -268,8 +268,8 @@ 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 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 -#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 +#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330 +#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358 #: builtin/shortlog.c:158 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" @@ -503,16 +503,16 @@ msgstr "" "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n" "%s" -#: diff.c:2956 +#: diff.c:2997 #, 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:3351 +#: diff.c:3393 msgid "--follow requires exactly one pathspec" msgstr "--follow cần chính xác một đặc tả đường dẫn" -#: diff.c:3514 +#: diff.c:3556 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -521,11 +521,19 @@ msgstr "" "Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" "%s" -#: diff.c:3528 +#: diff.c:3570 #, 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:1852 +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:1945 +msgid "Untracked cache is disabled on this system." +msgstr "Bộ nhớ tạm không theo vết bị tắt trên hệ thống này." + #: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "không thể chạy gpg." @@ -572,11 +580,11 @@ msgstr "các lệnh git sẵn có trong thư mục “%s”:" msgid "git commands available from elsewhere on your $PATH" msgstr "các lệnh git sẵn có từ một nơi khác trong $PATH của bạn" -#: help.c:230 -msgid "The most commonly used git commands are:" -msgstr "Những lệnh git hay được dùng nhất là:" +#: help.c:246 +msgid "These are common Git commands used in various situations:" +msgstr "Có các lệnh Git chung được sử dụng trong các tình huống khác nhau:" -#: help.c:289 +#: help.c:311 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -585,11 +593,11 @@ msgstr "" "“%s” trông như là một lệnh git, nhưng chúng tôi không\n" "thể thực thi nó. Có lẽ là lệnh git-%s đã bị hỏng?" -#: help.c:346 +#: help.c:368 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ối chà. Hệ thống của bạn báo rằng chẳng có lệnh Git nào cả." -#: help.c:368 +#: help.c:390 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -598,17 +606,17 @@ msgstr "" "CẢNH BÁO: Bạn đã gọi lệnh Git có tên “%s”, mà nó lại không có sẵn.\n" "Tiếp tục và coi rằng ý bạn là “%s”" -#: help.c:373 +#: help.c:395 #, c-format msgid "in %0.1f seconds automatically..." msgstr "trong %0.1f giây một cách tự động…" -#: help.c:380 +#: help.c:402 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: “%s” không phải là một lệnh của git. Xem “git --help”." -#: help.c:384 help.c:444 +#: help.c:406 help.c:466 msgid "" "\n" "Did you mean this?" @@ -619,16 +627,16 @@ msgstr[0] "" "\n" "Có phải ý bạn là một trong số những cái này không?" -#: help.c:440 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: lockfile.c:283 +#: lockfile.c:345 msgid "BUG: reopen a lockfile that is still open" msgstr "LỖI: mở lại tập tin khóa mà nó lại đang được mở" -#: lockfile.c:285 +#: lockfile.c:347 msgid "BUG: reopen a lockfile that has been committed" msgstr "LỖI: mở lại tập tin khóa mà nó đã được chuyển giao" @@ -636,8 +644,8 @@ msgstr "LỖI: mở lại tập tin khóa mà nó đã được chuyển giao" msgid "failed to read the cache" msgstr "gặp lỗi khi đọc bộ nhớ đệm" -#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580 -#: builtin/clone.c:662 +#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594 +#: builtin/clone.c:654 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" @@ -655,64 +663,64 @@ msgstr "addinfo_cache gặp lỗi đối với đường dẫn “%s”" msgid "error building trees" msgstr "gặp lỗi khi xây dựng cây" -#: merge-recursive.c:688 +#: merge-recursive.c:687 #, c-format msgid "failed to create path '%s'%s" msgstr "gặp lỗi khi tạo đường dẫn “%s”%s" -#: merge-recursive.c:699 +#: merge-recursive.c:698 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Gỡ bỏ %s để tạo chỗ (room) cho thư mục con\n" -#: merge-recursive.c:713 merge-recursive.c:734 +#: merge-recursive.c:712 merge-recursive.c:733 msgid ": perhaps a D/F conflict?" msgstr ": có lẽ là một xung đột D/F?" -#: merge-recursive.c:724 +#: merge-recursive.c:723 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "từ chối đóng tập tin không được theo dõi tại “%s”" -#: merge-recursive.c:764 +#: merge-recursive.c:763 #, c-format msgid "cannot read object %s '%s'" msgstr "không thể đọc đối tượng %s “%s”" -#: merge-recursive.c:766 +#: merge-recursive.c:765 #, c-format msgid "blob expected for %s '%s'" msgstr "đối tượng blob được mong đợi cho %s “%s”" -#: merge-recursive.c:789 builtin/clone.c:321 +#: merge-recursive.c:788 builtin/clone.c:313 #, c-format msgid "failed to open '%s'" msgstr "gặp lỗi khi mở “%s”" -#: merge-recursive.c:797 +#: merge-recursive.c:796 #, c-format msgid "failed to symlink '%s'" msgstr "gặp lỗi khi tạo liên kết mềm (symlink) “%s”" -#: merge-recursive.c:800 +#: merge-recursive.c:799 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "không hiểu phải làm gì với %06o %s “%s”" -#: merge-recursive.c:938 +#: merge-recursive.c:937 msgid "Failed to execute internal merge" msgstr "Gặp lỗi khi thực hiện trộn nội bộ" -#: merge-recursive.c:942 +#: merge-recursive.c:941 #, c-format msgid "Unable to add %s to database" msgstr "Không thể thêm %s vào cơ sở dữ liệu" -#: merge-recursive.c:958 +#: merge-recursive.c:957 msgid "unsupported object type in the tree" msgstr "kiểu đối tượng không được hỗ trợ trong cây (tree)" -#: merge-recursive.c:1033 merge-recursive.c:1047 +#: merge-recursive.c:1032 merge-recursive.c:1046 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -721,7 +729,7 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " "còn lại trong cây (tree)." -#: merge-recursive.c:1039 merge-recursive.c:1052 +#: merge-recursive.c:1038 merge-recursive.c:1051 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -730,20 +738,20 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " "còn lại trong cây (tree) tại %s." -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "rename" msgstr "đổi tên" -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "renamed" msgstr "đã đổi tên" -#: merge-recursive.c:1149 +#: merge-recursive.c:1148 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s" -#: merge-recursive.c:1171 +#: merge-recursive.c:1170 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -752,145 +760,145 @@ msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi " "tên \"%s\"->\"%s\" trong \"%s\"%s" -#: merge-recursive.c:1176 +#: merge-recursive.c:1175 msgid " (left unresolved)" msgstr " (cần giải quyết)" -#: merge-recursive.c:1230 +#: merge-recursive.c:1229 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s. Đổi tên %s->%s trong %s" -#: merge-recursive.c:1260 +#: merge-recursive.c:1259 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Đang đổi tên %s thành %s thay vì %s thành %s" -#: merge-recursive.c:1459 +#: merge-recursive.c:1458 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm vào trong %s" -#: merge-recursive.c:1469 +#: merge-recursive.c:1468 #, c-format msgid "Adding merged %s" msgstr "Thêm hòa trộn %s" -#: merge-recursive.c:1474 merge-recursive.c:1672 +#: merge-recursive.c:1473 merge-recursive.c:1671 #, c-format msgid "Adding as %s instead" msgstr "Thay vào đó thêm vào %s" -#: merge-recursive.c:1525 +#: merge-recursive.c:1524 #, c-format msgid "cannot read object %s" msgstr "không thể đọc đối tượng %s" -#: merge-recursive.c:1528 +#: merge-recursive.c:1527 #, c-format msgid "object %s is not a blob" msgstr "đối tượng %s không phải là một blob" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modify" msgstr "sửa đổi" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modified" msgstr "đã sửa" -#: merge-recursive.c:1586 +#: merge-recursive.c:1585 msgid "content" msgstr "nội dung" -#: merge-recursive.c:1593 +#: merge-recursive.c:1592 msgid "add/add" msgstr "thêm/thêm" -#: merge-recursive.c:1627 +#: merge-recursive.c:1626 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)" -#: merge-recursive.c:1641 +#: merge-recursive.c:1640 #, c-format msgid "Auto-merging %s" msgstr "Tự-động-hòa-trộn %s" -#: merge-recursive.c:1645 git-submodule.sh:1150 +#: merge-recursive.c:1644 git-submodule.sh:1150 msgid "submodule" msgstr "mô-đun-con" -#: merge-recursive.c:1646 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s" -#: merge-recursive.c:1732 +#: merge-recursive.c:1731 #, c-format msgid "Removing %s" msgstr "Đang xóa %s" -#: merge-recursive.c:1757 +#: merge-recursive.c:1756 msgid "file/directory" msgstr "tập-tin/thư-mục" -#: merge-recursive.c:1763 +#: merge-recursive.c:1762 msgid "directory/file" msgstr "thư-mục/tập-tin" -#: merge-recursive.c:1768 +#: merge-recursive.c:1767 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "XUNG ĐỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là " "%s" -#: merge-recursive.c:1778 +#: merge-recursive.c:1777 #, c-format msgid "Adding %s" msgstr "Thêm \"%s\"" -#: merge-recursive.c:1795 +#: merge-recursive.c:1794 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:1814 +#: merge-recursive.c:1813 msgid "Already up-to-date!" msgstr "Đã cập nhật rồi!" -#: merge-recursive.c:1823 +#: merge-recursive.c:1822 #, c-format msgid "merging of trees %s and %s failed" msgstr "hòa trộn cây (tree) %s và %s gặp lỗi" -#: merge-recursive.c:1853 +#: merge-recursive.c:1852 #, c-format msgid "Unprocessed path??? %s" msgstr "Đường dẫn chưa được xử lý??? %s" -#: merge-recursive.c:1901 +#: merge-recursive.c:1900 msgid "Merging:" msgstr "Đang trộn:" -#: merge-recursive.c:1914 +#: merge-recursive.c:1913 #, 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:1951 +#: merge-recursive.c:1950 msgid "merge returned no commit" msgstr "hòa trộn không trả về lần chuyển giao nào" -#: merge-recursive.c:2008 +#: merge-recursive.c:2007 #, c-format msgid "Could not parse object '%s'" msgstr "Không thể phân tích đối tượng “%s”" -#: merge-recursive.c:2019 builtin/merge.c:667 +#: merge-recursive.c:2018 builtin/merge.c:645 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục" @@ -917,7 +925,7 @@ msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Giá trị %s sai: “%s”" -#: object.c:241 +#: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "không thể phân tích đối tượng: “%s”" @@ -1016,11 +1024,11 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "không thể phân tích định dạng --pretty" -#: progress.c:225 +#: progress.c:236 msgid "done" msgstr "xong" -#: read-cache.c:1275 +#: read-cache.c:1295 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1029,7 +1037,7 @@ msgstr "" "index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n" "Dùng phiên bản %i" -#: read-cache.c:1285 +#: read-cache.c:1305 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1038,51 +1046,94 @@ 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" -#: remote.c:782 +#: remote.c:792 #, 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:786 +#: remote.c:796 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s thường theo dõi %s, không phải %s" -#: remote.c:790 +#: remote.c:800 #, c-format msgid "%s tracks both %s and %s" msgstr "%s theo dõi cả %s và %s" -#: remote.c:798 +#: remote.c:808 msgid "Internal error" msgstr "Lỗi nội bộ" -#: remote.c:1980 +#: remote.c:1723 remote.c:1766 +msgid "HEAD does not point to a branch" +msgstr "HEAD không chỉ đến một nhánh nào cả" + +#: remote.c:1732 +#, c-format +msgid "no such branch: '%s'" +msgstr "không có nhánh nào như thế: “%s”" + +#: remote.c:1735 +#, 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:1741 +#, 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:1756 +#, 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:1771 +#, 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:1782 +#, c-format +msgid "push refspecs for '%s' do not include '%s'" +msgstr "đẩy refspecs cho '%s' không bao gồm '%s'" + +#: remote.c:1795 +msgid "push has no destination (push.default is 'nothing')" +msgstr "đẩy lên mà không có đíchn (push.default là 'nothing')" + +#: remote.c:1817 +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:2124 #, 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:1984 +#: remote.c:2128 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n" -#: remote.c:1987 +#: remote.c:2131 #, 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:1991 +#: remote.c:2135 #, 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:1997 +#: remote.c:2141 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:2000 +#: remote.c:2144 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1091,11 +1142,11 @@ msgstr[0] "" "Nhánh của bạn đứng đằng sau “%s” %d lần chuyển giao, và có thể được fast-" "forward.\n" -#: remote.c:2008 +#: remote.c:2152 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:2011 +#: remote.c:2155 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1108,13 +1159,13 @@ 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:2021 +#: remote.c:2165 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:2348 +#: revision.c:2366 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent xung khắc với --bisect" @@ -1131,22 +1182,22 @@ msgstr "dup2(%d,%d) gặp lỗi" msgid "failed to sign the push certificate" msgstr "gặp lỗi khi ký chứng thực đẩy" -#: send-pack.c:356 +#: send-pack.c:378 msgid "the receiving end does not support --signed push" msgstr "kết thúc nhận không hỗ trợ đẩy --signed" -#: send-pack.c:366 +#: send-pack.c:389 msgid "the receiving end does not support --atomic push" msgstr "kết thúc nhận không hỗ trợ đẩy --atomic" -#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 -#: builtin/merge.c:1005 +#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" msgstr "Không thể mở “%s” để ghi" -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 -#: builtin/merge.c:1010 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 +#: builtin/merge.c:988 #, c-format msgid "Could not write to '%s'" msgstr "Không thể ghi vào “%s”" @@ -1346,7 +1397,7 @@ 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:908 builtin/apply.c:4288 +#: sequencer.c:908 builtin/apply.c:4291 #, c-format msgid "cannot open %s: %s" msgstr "không thể mở %s: %s" @@ -1388,7 +1439,12 @@ msgstr "Không thể revert một lần chuyển giao khởi tạo" msgid "Can't cherry-pick into empty head" msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng" -#: sha1_name.c:440 +#: setup.c:243 +#, c-format +msgid "failed to read %s" +msgstr "gặp lỗi khi đọc %s" + +#: sha1_name.c:453 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" @@ -1412,26 +1468,6 @@ msgstr "" "này\n" "bằng cách chạy lệnh \"git config advice.objectNameWarning false\"" -#: sha1_name.c:1068 -msgid "HEAD does not point to a branch" -msgstr "HEAD không chỉ đến một nhánh nào cả" - -#: sha1_name.c:1071 -#, c-format -msgid "No such branch: '%s'" -msgstr "Không có nhánh nào như thế: “%s”" - -#: sha1_name.c:1073 -#, 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”" - -#: sha1_name.c:1077 -#, 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 “remote-tracking”" - #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -1457,12 +1493,7 @@ msgstr "Không thể gỡ bỏ mục .gitmodules dành cho %s" msgid "staging updated .gitmodules failed" msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật" -#: submodule.c:1109 builtin/init-db.c:371 -#, c-format -msgid "Could not create git link %s" -msgstr "Không thể tạo liên kết git “%s”" - -#: submodule.c:1120 +#: submodule.c:1115 #, c-format msgid "Could not set core.worktree in %s" msgstr "Không thể đặt “core.worktree” trong “%s”." @@ -1492,7 +1523,7 @@ msgstr "không đọc được tập tin đầu vào “%s”" msgid "could not read from stdin" msgstr "không thể đọc từ đầu vào tiêu chuẩn" -#: unpack-trees.c:202 +#: unpack-trees.c:203 msgid "Checking out files" msgstr "Đang lấy ra các tập tin" @@ -1548,6 +1579,21 @@ msgstr "không có người dùng như vậy" 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:575 +#, c-format +msgid "could not open %s for writing" +msgstr "không thể mở %s để ghi" + +#: wrapper.c:587 +#, c-format +msgid "could not write to %s" +msgstr "không thể ghi vào %s" + +#: wrapper.c:593 +#, c-format +msgid "could not close %s" +msgstr "không thể đóng %s" + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Những đường dẫn chưa được hòa trộn:" @@ -1575,11 +1621,11 @@ msgstr "" 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:198 wt-status.c:878 +#: 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:216 wt-status.c:887 +#: 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:" @@ -1693,15 +1739,15 @@ msgstr "nội dung chưa được theo dõi, " 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:753 +#: 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:755 +#: 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:835 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1709,72 +1755,72 @@ msgstr "" "Không động đến đường ở trên.\n" "Mọi thứ phía dưới sẽ được xóa bỏ." -#: wt-status.c:946 +#: 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:949 +#: 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:952 +#: wt-status.c:955 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:955 +#: wt-status.c:958 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:965 +#: wt-status.c:968 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:968 +#: wt-status.c:971 msgid "The current patch is empty." msgstr "Miếng vá hiện tại bị trống rỗng." -#: wt-status.c:972 +#: wt-status.c:975 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:974 +#: wt-status.c:977 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:976 +#: wt-status.c:979 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)" -#: wt-status.c:1036 wt-status.c:1053 +#: wt-status.c:1039 wt-status.c:1056 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Bạn hiện nay đang thực hiện việc “rebase” nhánh “%s” trên “%s”." -#: wt-status.c:1041 wt-status.c:1058 +#: wt-status.c:1044 wt-status.c:1061 msgid "You are currently rebasing." msgstr "Bạn hiện nay đang thực hiện việc “rebase” (“cải tổ”)." -#: wt-status.c:1044 +#: wt-status.c:1047 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (sửa các xung đột và sau đó chạy lệnh “cải tổ” \"git rebase --continue\")" -#: wt-status.c:1046 +#: wt-status.c:1049 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (dùng lệnh “cải tổ” \"git rebase --skip\" để bỏ qua lần vá này)" -#: wt-status.c:1048 +#: wt-status.c:1051 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (dùng lệnh “cải tổ” \"git rebase --abort\" để check-out nhánh nguyên thủy)" -#: wt-status.c:1061 +#: wt-status.c:1064 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ” \"git rebase --" "continue\")" -#: wt-status.c:1065 +#: wt-status.c:1068 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1782,126 +1828,126 @@ msgstr "" "Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi " "đang “rebase” nhánh “%s” trên “%s”." -#: wt-status.c:1070 +#: wt-status.c:1073 msgid "You are currently splitting a commit during a rebase." msgstr "" "Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc " "rebase." -#: wt-status.c:1073 +#: wt-status.c:1076 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Một khi thư mục làm việc của bạn đã gọn gàng, chạy lệnh “cải tổ” \"git " "rebase --continue\")" -#: wt-status.c:1077 +#: wt-status.c:1080 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang " "rebase nhánh “%s” trên “%s”." -#: wt-status.c:1082 +#: wt-status.c:1085 msgid "You are currently editing a commit during a rebase." msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase." -#: wt-status.c:1085 +#: wt-status.c:1088 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (dùng \"git commit --amend\" để “tu bổ” lần chuyển giao hiện tại)" -#: wt-status.c:1087 +#: wt-status.c:1090 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (chạy lệnh “cải tổ” \"git rebase --continue\" một khi bạn cảm thấy hài " "lòng về những thay đổi của mình)" -#: wt-status.c:1097 +#: wt-status.c:1100 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s." -#: wt-status.c:1102 +#: wt-status.c:1105 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")" -#: wt-status.c:1105 +#: wt-status.c:1108 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --" "continue\")" -#: wt-status.c:1107 +#: wt-status.c:1110 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)" -#: wt-status.c:1116 +#: wt-status.c:1119 #, c-format msgid "You are currently reverting commit %s." msgstr "Bạn hiện nay đang thực hiện thao tác revert lần chuyển giao “%s”." -#: wt-status.c:1121 +#: wt-status.c:1124 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")" -#: wt-status.c:1124 +#: wt-status.c:1127 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")" -#: wt-status.c:1126 +#: wt-status.c:1129 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (dùng \"git revert --abort\" để hủy bỏ thao tác revert)" -#: wt-status.c:1137 +#: wt-status.c:1140 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" "Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ " "nhánh “%s”." -#: wt-status.c:1141 +#: wt-status.c:1144 msgid "You are currently bisecting." msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)." -#: wt-status.c:1144 +#: wt-status.c:1147 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:1321 +#: wt-status.c:1324 msgid "On branch " msgstr "Trên nhánh " -#: wt-status.c:1328 +#: wt-status.c:1331 msgid "rebase in progress; onto " msgstr "rebase đang được thực hiện: lên trên " -#: wt-status.c:1333 +#: wt-status.c:1336 msgid "HEAD detached at " msgstr "HEAD được tách rời tại " -#: wt-status.c:1335 +#: wt-status.c:1338 msgid "HEAD detached from " msgstr "HEAD được tách rời từ " -#: wt-status.c:1338 +#: wt-status.c:1341 msgid "Not currently on any branch." msgstr "Hiện tại chẳng ở nhánh nào cả." -#: wt-status.c:1355 +#: wt-status.c:1358 msgid "Initial commit" msgstr "Lần chuyển giao khởi tạo" -#: wt-status.c:1369 +#: wt-status.c:1372 msgid "Untracked files" msgstr "Những tập tin chưa được theo dõi" -#: wt-status.c:1371 +#: wt-status.c:1374 msgid "Ignored files" msgstr "Những tập tin bị lờ đi" -#: wt-status.c:1375 +#: wt-status.c:1378 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1913,32 +1959,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:1381 +#: wt-status.c:1384 #, 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:1383 +#: wt-status.c:1386 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:1389 +#: wt-status.c:1392 msgid "No changes" msgstr "Không có thay đổi nào" -#: wt-status.c:1394 +#: wt-status.c:1397 #, 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:1397 +#: wt-status.c:1400 #, 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:1400 +#: wt-status.c:1403 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1947,53 +1993,53 @@ 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:1403 +#: wt-status.c:1406 #, 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:1406 +#: wt-status.c:1409 #, 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:1409 wt-status.c:1414 +#: wt-status.c:1412 wt-status.c:1417 #, c-format msgid "nothing to commit\n" msgstr "không có gì để chuyển giao\n" -#: wt-status.c:1412 +#: wt-status.c:1415 #, 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:1416 +#: wt-status.c:1419 #, 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:1525 +#: wt-status.c:1528 msgid "HEAD (no branch)" msgstr "HEAD (không nhánh)" -#: wt-status.c:1531 +#: wt-status.c:1534 msgid "Initial commit on " msgstr "Lần chuyển giao khởi tạo trên " -#: wt-status.c:1563 +#: wt-status.c:1561 msgid "gone" msgstr "đã ra đi" -#: wt-status.c:1565 wt-status.c:1573 +#: wt-status.c:1563 wt-status.c:1571 msgid "behind " msgstr "đằng sau " -#: compat/precompose_utf8.c:55 builtin/clone.c:360 +#: compat/precompose_utf8.c:55 builtin/clone.c:352 #, c-format msgid "failed to unlink '%s'" msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”" @@ -2021,7 +2067,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:785 +#: builtin/add.c:194 builtin/rev-parse.c:796 msgid "Could not read the index" msgstr "Không thể đọc bảng mục lục" @@ -2034,119 +2080,123 @@ msgstr "Không thể mở “%s” để ghi." msgid "Could not write patch" msgstr "Không thể ghi ra miếng vá" -#: builtin/add.c:214 +#: builtin/add.c:212 +msgid "editing patch failed" +msgstr "gặp lỗi khi sửa miếng vá" + +#: builtin/add.c:215 #, c-format msgid "Could not stat '%s'" msgstr "không thể lấy thông tin thống kê về “%s”" -#: builtin/add.c:216 +#: builtin/add.c:217 msgid "Empty patch. Aborted." msgstr "Miếng vá trống rỗng. Nên bỏ qua." -#: builtin/add.c:221 +#: builtin/add.c:222 #, c-format msgid "Could not apply '%s'" msgstr "Không thể áp dụng miếng vá “%s”" -#: builtin/add.c:231 +#: builtin/add.c:232 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore " "của bạn:\n" -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 -#: builtin/rm.c:269 +#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369 +#: builtin/rm.c:268 msgid "dry run" msgstr "chạy thử" -#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "chi tiết" -#: builtin/add.c:251 +#: builtin/add.c:252 msgid "interactive picking" msgstr "sửa bằng cách tương tác" -#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286 msgid "select hunks interactively" msgstr "chọn “hunks” theo kiểu tương tác" -#: builtin/add.c:253 +#: builtin/add.c:254 msgid "edit current diff and apply" msgstr "sửa diff hiện nay và áp dụng nó" -#: builtin/add.c:254 +#: builtin/add.c:255 msgid "allow adding otherwise ignored files" msgstr "cho phép thêm các tập tin bị bỏ qua khác" -#: builtin/add.c:255 +#: builtin/add.c:256 msgid "update tracked files" msgstr "cập nhật các tập tin được theo dõi" -#: builtin/add.c:256 +#: builtin/add.c:257 msgid "record only the fact that the path will be added later" msgstr "chỉ ghi lại sự việc mà đường dẫn sẽ được thêm vào sau" -#: builtin/add.c:257 +#: builtin/add.c:258 msgid "add changes from all tracked and untracked files" msgstr "" "thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu " "vết" -#: builtin/add.c:260 +#: builtin/add.c:261 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "lờ đi các đường dẫn bị gỡ bỏ trong cây thư mục làm việc (giống với --no-all)" -#: builtin/add.c:262 +#: builtin/add.c:263 msgid "don't add, only refresh the index" msgstr "không thêm, chỉ làm tươi mới bảng mục lục" -#: builtin/add.c:263 +#: builtin/add.c:264 msgid "just skip files which cannot be added because of errors" msgstr "chie bỏ qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi" -#: builtin/add.c:264 +#: builtin/add.c:265 msgid "check if - even missing - files are ignored in dry run" msgstr "" "kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử" -#: builtin/add.c:286 +#: builtin/add.c:287 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Sử dụng tùy chọn -f nếu bạn thực sự muốn thêm chúng vào.\n" -#: builtin/add.c:293 +#: builtin/add.c:294 msgid "adding files failed" msgstr "thêm tập tin gặp lỗi" -#: builtin/add.c:329 +#: builtin/add.c:330 msgid "-A and -u are mutually incompatible" msgstr "-A và -u xung khắc nhau" -#: builtin/add.c:336 +#: builtin/add.c:337 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run" -#: builtin/add.c:357 +#: builtin/add.c:358 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n" -#: builtin/add.c:358 +#: builtin/add.c:359 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Có lẽ ý bạn là “git add .” phải không?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 msgid "index file corrupt" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 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" @@ -2224,76 +2274,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:1656 +#: builtin/apply.c:1659 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:1658 +#: builtin/apply.c:1661 msgid "deleted file still has contents" msgstr "tập tin đã xóa vẫn còn nội dung" -#: builtin/apply.c:1684 +#: builtin/apply.c:1687 #, c-format msgid "corrupt patch at line %d" msgstr "miếng vá hỏng tại dòng %d" -#: builtin/apply.c:1720 +#: builtin/apply.c:1723 #, 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:1722 +#: builtin/apply.c:1725 #, 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:1725 +#: builtin/apply.c:1728 #, 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:1871 +#: builtin/apply.c:1874 #, 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:1900 +#: builtin/apply.c:1903 #, 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:2051 +#: builtin/apply.c:2054 #, 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:2141 +#: builtin/apply.c:2144 #, c-format msgid "unable to read symlink %s" msgstr "không thể đọc liên kết mềm %s" -#: builtin/apply.c:2145 +#: builtin/apply.c:2148 #, c-format msgid "unable to open or read %s" msgstr "không thể mở hay đọc %s" -#: builtin/apply.c:2778 +#: builtin/apply.c:2781 #, c-format msgid "invalid start of line: '%c'" msgstr "sai khởi đầu dòng: “%c”" -#: builtin/apply.c:2897 +#: builtin/apply.c:2900 #, 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:2909 +#: builtin/apply.c:2912 #, 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:2915 +#: builtin/apply.c:2918 #, c-format msgid "" "while searching for:\n" @@ -2302,341 +2352,341 @@ msgstr "" "trong khi đang tìm kiếm cho:\n" "%.*s" -#: builtin/apply.c:2935 +#: builtin/apply.c:2938 #, 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:3036 +#: builtin/apply.c:3039 #, 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:3042 +#: builtin/apply.c:3045 #, 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:3063 +#: builtin/apply.c:3066 #, c-format msgid "patch failed: %s:%ld" msgstr "gặp lỗi khi vá: %s:%ld" -#: builtin/apply.c:3187 +#: builtin/apply.c:3190 #, c-format msgid "cannot checkout %s" msgstr "không thể lấy ra %s" -#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 +#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291 #, c-format msgid "read of %s failed" msgstr "đọc %s gặp lỗi" -#: builtin/apply.c:3240 +#: builtin/apply.c:3243 #, 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:3268 builtin/apply.c:3490 +#: builtin/apply.c:3271 builtin/apply.c:3493 #, 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:3349 builtin/apply.c:3504 +#: builtin/apply.c:3352 builtin/apply.c:3507 #, 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:3353 builtin/apply.c:3496 builtin/apply.c:3518 +#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3358 builtin/apply.c:3512 +#: builtin/apply.c:3361 builtin/apply.c:3515 #, c-format msgid "%s: does not match index" msgstr "%s: không khớp trong mục lục" -#: builtin/apply.c:3460 +#: builtin/apply.c:3463 msgid "removal patch leaves file contents" msgstr "loại bỏ miếng vá để lại nội dung tập tin" -#: builtin/apply.c:3529 +#: builtin/apply.c:3532 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiểu" -#: builtin/apply.c:3531 +#: builtin/apply.c:3534 #, c-format msgid "%s has type %o, expected %o" msgstr "%s có kiểu %o, cần %o" -#: builtin/apply.c:3690 builtin/apply.c:3692 +#: builtin/apply.c:3693 builtin/apply.c:3695 #, c-format msgid "invalid path '%s'" msgstr "đường dẫn không hợp lệ “%s”" -#: builtin/apply.c:3747 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in index" msgstr "%s: đã có từ trước trong bảng mục lục" -#: builtin/apply.c:3750 +#: builtin/apply.c:3753 #, 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:3770 +#: builtin/apply.c:3773 #, 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:3775 +#: builtin/apply.c:3778 #, 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:3795 +#: builtin/apply.c:3798 #, 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:3799 +#: builtin/apply.c:3802 #, c-format msgid "%s: patch does not apply" msgstr "%s: miếng vá không được áp dụng" -#: builtin/apply.c:3813 +#: builtin/apply.c:3816 #, c-format msgid "Checking patch %s..." msgstr "Đang kiểm tra miếng vá %s…" -#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3909 builtin/checkout.c:237 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:4049 +#: builtin/apply.c:4052 #, c-format msgid "unable to remove %s from index" msgstr "không thể gỡ bỏ %s từ mục lục" -#: builtin/apply.c:4078 +#: builtin/apply.c:4081 #, c-format msgid "corrupt patch for submodule %s" msgstr "miếng vá sai hỏng cho mô-đun-con %s" -#: builtin/apply.c:4082 +#: builtin/apply.c:4085 #, 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:4087 +#: builtin/apply.c:4090 #, 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:4090 builtin/apply.c:4198 +#: builtin/apply.c:4093 builtin/apply.c:4201 #, 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:4123 +#: builtin/apply.c:4126 #, c-format msgid "closing file '%s'" msgstr "đang đóng tập tin “%s”" -#: builtin/apply.c:4172 +#: builtin/apply.c:4175 #, 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:4259 +#: builtin/apply.c:4262 #, 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:4267 +#: builtin/apply.c:4270 msgid "internal error" msgstr "lỗi nội bộ" -#: builtin/apply.c:4270 +#: builtin/apply.c:4273 #, 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:4280 +#: builtin/apply.c:4283 #, 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:4301 +#: builtin/apply.c:4304 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khối nhớ #%d được áp dụng gọn gàng." -#: builtin/apply.c:4304 +#: builtin/apply.c:4307 #, c-format msgid "Rejected hunk #%d." msgstr "đoạn dữ liệu #%d bị từ chối." -#: builtin/apply.c:4394 +#: builtin/apply.c:4397 msgid "unrecognized input" msgstr "không thừa nhận đầu vào" -#: builtin/apply.c:4405 +#: builtin/apply.c:4408 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:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85 #: builtin/fetch.c:92 msgid "path" msgstr "đường-dẫn" -#: builtin/apply.c:4523 +#: builtin/apply.c:4526 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:4526 +#: builtin/apply.c:4529 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:4528 +#: builtin/apply.c:4531 msgid "num" msgstr "số" -#: builtin/apply.c:4529 +#: builtin/apply.c:4532 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:4532 +#: builtin/apply.c:4535 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:4534 +#: builtin/apply.c:4537 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:4538 +#: builtin/apply.c:4541 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:4540 +#: builtin/apply.c:4543 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:4542 +#: builtin/apply.c:4545 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:4544 +#: builtin/apply.c:4547 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:4546 +#: builtin/apply.c:4549 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:4548 +#: builtin/apply.c:4551 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:4550 +#: builtin/apply.c:4553 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:4552 +#: builtin/apply.c:4555 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:4554 +#: builtin/apply.c:4557 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:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 +#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412 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:4559 +#: builtin/apply.c:4562 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:4560 +#: builtin/apply.c:4563 msgid "action" msgstr "hành động" -#: builtin/apply.c:4561 +#: builtin/apply.c:4564 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:4564 builtin/apply.c:4567 +#: builtin/apply.c:4567 builtin/apply.c:4570 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:4570 +#: builtin/apply.c:4573 msgid "apply the patch in reverse" msgstr "áp dụng miếng vá theo chiều ngược" -#: builtin/apply.c:4572 +#: builtin/apply.c:4575 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:4574 +#: builtin/apply.c:4577 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:4576 +#: builtin/apply.c:4579 msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhớ" -#: builtin/apply.c:4579 +#: builtin/apply.c:4582 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:4582 +#: builtin/apply.c:4585 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:4584 +#: builtin/apply.c:4587 msgid "root" msgstr "root" -#: builtin/apply.c:4585 +#: builtin/apply.c:4588 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:4607 +#: builtin/apply.c:4610 msgid "--3way outside a repository" msgstr "--3way ở ngoài một kho chứa" -#: builtin/apply.c:4615 +#: builtin/apply.c:4618 msgid "--index outside a repository" msgstr "--index ở ngoài một kho chứa" -#: builtin/apply.c:4618 +#: builtin/apply.c:4621 msgid "--cached outside a repository" msgstr "--cached ở ngoài một kho chứa" -#: builtin/apply.c:4637 +#: builtin/apply.c:4640 #, c-format msgid "can't open patch '%s'" msgstr "không thể mở miếng vá “%s”" -#: builtin/apply.c:4651 +#: builtin/apply.c:4654 #, 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:4657 builtin/apply.c:4667 +#: builtin/apply.c:4660 builtin/apply.c:4670 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2690,11 +2740,11 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" "cập nhật BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao hiện hành" -#: builtin/blame.c:30 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" -msgstr "git blame [<các-tùy-chọn>] [rev-opts] [rev] [--] tập-tin" +#: builtin/blame.c:31 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git blame [<các-tùy-chọn>] [<rev-opts>] [<rev>] [--] <tập-tin>" -#: builtin/blame.c:35 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)" @@ -2818,7 +2868,7 @@ msgstr "git branch [<các-tùy-chọn>] [-r] (-d | -D) <tên-nhánh> …" 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:152 +#: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2827,7 +2877,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:156 +#: builtin/branch.c:154 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2836,12 +2886,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:170 +#: builtin/branch.c:168 #, 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:174 +#: builtin/branch.c:172 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2850,306 +2900,306 @@ 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:187 +#: builtin/branch.c:185 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:215 +#: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "không thể dùng tùy chọn -a với -d" -#: builtin/branch.c:221 +#: builtin/branch.c:219 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:229 +#: builtin/branch.c:227 #, 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 ở." -#: builtin/branch.c:245 +#: builtin/branch.c:243 #, c-format -msgid "remote branch '%s' not found." -msgstr "không tìm thấy nhánh máy chủ “%s”." +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:246 +#: builtin/branch.c:244 #, c-format msgid "branch '%s' not found." msgstr "không tìm thấy nhánh “%s”." -#: builtin/branch.c:260 +#: builtin/branch.c:258 #, c-format -msgid "Error deleting remote branch '%s'" -msgstr "Gặp lỗi khi đang xóa nhánh trên máy chủ “%s”" +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:261 +#: builtin/branch.c:259 #, c-format msgid "Error deleting branch '%s'" msgstr "Gặp lỗi khi xóa bỏ nhánh “%s”" -#: builtin/branch.c:268 +#: builtin/branch.c:266 #, c-format -msgid "Deleted remote branch %s (was %s).\n" -msgstr "Nhánh trên máy chủ \"%s\" đã bị xóa (từng là %s).\n" +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:269 +#: builtin/branch.c:267 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n" -#: builtin/branch.c:370 +#: builtin/branch.c:368 #, c-format msgid "branch '%s' does not point at a commit" msgstr "nhánh “%s” không chỉ đến một lần chuyển giao nào cả" -#: builtin/branch.c:459 +#: builtin/branch.c:451 #, c-format msgid "[%s: gone]" msgstr "[%s: đã ra đi]" -#: builtin/branch.c:464 +#: builtin/branch.c:456 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:469 +#: builtin/branch.c:461 #, c-format msgid "[%s: behind %d]" msgstr "[%s: đứng sau %d]" -#: builtin/branch.c:471 +#: builtin/branch.c:463 #, c-format msgid "[behind %d]" msgstr "[đằng sau %d]" -#: builtin/branch.c:475 +#: builtin/branch.c:467 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: phía trước %d]" -#: builtin/branch.c:477 +#: builtin/branch.c:469 #, c-format msgid "[ahead %d]" msgstr "[phía trước %d]" -#: builtin/branch.c:480 +#: builtin/branch.c:472 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: trước %d, sau %d]" -#: builtin/branch.c:483 +#: builtin/branch.c:475 #, c-format msgid "[ahead %d, behind %d]" msgstr "[trước %d, sau %d]" -#: builtin/branch.c:496 +#: builtin/branch.c:488 msgid " **** invalid ref ****" msgstr " **** tham chiếu không hợp lệ ****" -#: builtin/branch.c:587 +#: builtin/branch.c:579 #, c-format msgid "(no branch, rebasing %s)" msgstr "(không nhánh, đang cải tổ %s)" -#: builtin/branch.c:590 +#: builtin/branch.c:582 #, 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:596 +#: builtin/branch.c:588 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD được tách rời tại %s)" -#: builtin/branch.c:599 +#: builtin/branch.c:591 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD được tách rời từ %s)" -#: builtin/branch.c:603 +#: builtin/branch.c:595 msgid "(no branch)" msgstr "(không nhánh)" -#: builtin/branch.c:650 +#: builtin/branch.c:642 #, c-format msgid "object '%s' does not point to a commit" msgstr "đối tượng “%s” không chỉ đến một lần chuyển giao nào cả" -#: builtin/branch.c:698 +#: builtin/branch.c:690 msgid "some refs could not be read" msgstr "một số tham chiếu đã không thể đọc được" -#: builtin/branch.c:711 +#: builtin/branch.c:703 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:721 +#: builtin/branch.c:713 #, c-format msgid "Invalid branch name: '%s'" msgstr "Tên nhánh không hợp lệ: “%s”" -#: builtin/branch.c:736 +#: builtin/branch.c:728 msgid "Branch rename failed" msgstr "Gặp lỗi khi đổi tên nhánh" -#: builtin/branch.c:740 +#: builtin/branch.c:732 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Đã đổi tên nhánh khuyết danh “%s” đi" -#: builtin/branch.c:744 +#: builtin/branch.c:736 #, 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:751 +#: builtin/branch.c:743 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:766 +#: builtin/branch.c:758 #, c-format msgid "malformed object name %s" msgstr "tên đối tượng dị hình %s" -#: builtin/branch.c:790 +#: builtin/branch.c:780 #, 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:820 +#: builtin/branch.c:810 msgid "Generic options" msgstr "Tùy chọn chung" -#: builtin/branch.c:822 +#: builtin/branch.c:812 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:823 +#: builtin/branch.c:813 msgid "suppress informational messages" msgstr "không xuất các thông tin" -#: builtin/branch.c:824 +#: builtin/branch.c:814 msgid "set up tracking mode (see git-pull(1))" msgstr "cài đặt chế độ theo dõi (xem git-pull(1))" -#: builtin/branch.c:826 +#: builtin/branch.c:816 msgid "change upstream info" msgstr "thay đổi thông tin thượng nguồn" -#: builtin/branch.c:830 +#: builtin/branch.c:820 msgid "use colored output" msgstr "tô màu kết xuất" -#: builtin/branch.c:831 +#: builtin/branch.c:821 msgid "act on remote-tracking branches" msgstr "thao tác trên nhánh “remote-tracking”" -#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 -#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 -#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 +#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851 +#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "lần_chuyển_giao" -#: builtin/branch.c:835 builtin/branch.c:841 +#: builtin/branch.c:825 builtin/branch.c:831 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:847 +#: builtin/branch.c:837 msgid "Specific git-branch actions:" msgstr "Hành động git-branch:" -#: builtin/branch.c:848 +#: builtin/branch.c:838 msgid "list both remote-tracking and local branches" msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ" -#: builtin/branch.c:850 +#: builtin/branch.c:840 msgid "delete fully merged branch" msgstr "xóa một toàn bộ nhánh đã hòa trộn" -#: builtin/branch.c:851 +#: builtin/branch.c:841 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:852 +#: builtin/branch.c:842 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:853 +#: builtin/branch.c:843 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:854 +#: builtin/branch.c:844 msgid "list branch names" msgstr "liệt kê các tên nhánh" -#: builtin/branch.c:855 +#: builtin/branch.c:845 msgid "create the branch's reflog" msgstr "tạo reflog của nhánh" -#: builtin/branch.c:857 +#: builtin/branch.c:847 msgid "edit the description for the branch" msgstr "sửa mô tả cho nhánh" -#: builtin/branch.c:858 +#: builtin/branch.c:848 msgid "force creation, move/rename, deletion" msgstr "buộc tạo, di chuyển/đổi tên, xóa" -#: builtin/branch.c:861 +#: builtin/branch.c:851 msgid "print only not merged branches" msgstr "chỉ hiển thị các nhánh chưa được hòa trộn" -#: builtin/branch.c:867 +#: builtin/branch.c:857 msgid "print only merged branches" msgstr "chỉ hiển thị các nhánh đã hòa trộn" -#: builtin/branch.c:871 +#: builtin/branch.c:861 msgid "list branches in columns" msgstr "liệt kê các nhánh trong các cột" -#: builtin/branch.c:884 +#: builtin/branch.c:874 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:888 builtin/clone.c:637 +#: builtin/branch.c:878 builtin/clone.c:629 msgid "HEAD not found below refs/heads!" msgstr "không tìm thấy HEAD ở dưới refs/heads!" -#: builtin/branch.c:910 +#: builtin/branch.c:900 msgid "--column and --verbose are incompatible" msgstr "tùy chọn --column và --verbose xung khắc nhau" -#: builtin/branch.c:921 builtin/branch.c:960 +#: builtin/branch.c:911 builtin/branch.c:950 msgid "branch name required" msgstr "cần chỉ ra tên nhánh" -#: builtin/branch.c:936 +#: builtin/branch.c:926 msgid "Cannot give description to detached HEAD" msgstr "Không thể đưa ra mô tả HEAD đã tách rời" -#: builtin/branch.c:941 +#: builtin/branch.c:931 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:948 +#: builtin/branch.c:938 #, 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:951 +#: builtin/branch.c:941 #, c-format msgid "No branch named '%s'." msgstr "Không có nhánh nào có tên “%s”." -#: builtin/branch.c:966 +#: builtin/branch.c:956 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:971 +#: builtin/branch.c:961 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:975 +#: builtin/branch.c:965 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3157,40 +3207,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:978 builtin/branch.c:1000 builtin/branch.c:1021 +#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011 #, c-format msgid "no such branch '%s'" msgstr "không có nhánh nào như thế “%s”" -#: builtin/branch.c:982 +#: builtin/branch.c:972 #, c-format msgid "branch '%s' does not exist" msgstr "chưa có nhánh “%s”" -#: builtin/branch.c:994 +#: builtin/branch.c:984 msgid "too many branches to unset upstream" msgstr "quá nhiều nhánh để bỏ đặt thượng nguồn" -#: builtin/branch.c:998 +#: builtin/branch.c:988 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:1004 +#: builtin/branch.c:994 #, 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:1018 +#: builtin/branch.c:1008 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:1024 +#: builtin/branch.c:1014 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:1027 +#: builtin/branch.c:1017 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3199,7 +3249,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:1044 +#: builtin/branch.c:1034 #, c-format msgid "" "\n" @@ -3210,70 +3260,86 @@ msgstr "" "Nếu bạn muốn “%s” theo dõi “%s”, thực hiện lệnh sau:\n" "\n" -#: builtin/branch.c:1045 +#: builtin/branch.c:1035 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1046 +#: builtin/branch.c:1036 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" -#: builtin/bundle.c:47 +#: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" msgstr "“%s” tốt\n" -#: builtin/bundle.c:56 +#: builtin/bundle.c:64 msgid "Need a repository to create a bundle." msgstr "Cần một kho chứa để có thể tạo một bundle." -#: builtin/bundle.c:60 +#: builtin/bundle.c:68 msgid "Need a repository to unbundle." msgstr "Cần một kho chứa để có thể giải nén một bundle." -#: builtin/cat-file.c:326 -msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" -msgstr "git cat-file (-t | -s | -e | -p | <kiểu> | --textconv) <đối_tượng>" +#: builtin/cat-file.c:369 +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|" +"<kiểu>|--textconv) <đối_tượng>" -#: builtin/cat-file.c:327 -msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" -msgstr "git cat-file (--batch | --batch-check) < <danh-sách-đối-tượng>" +#: builtin/cat-file.c:370 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-" +"objects>" +msgstr "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <danh-sách-đối-" +"tượng>" -#: builtin/cat-file.c:364 +#: builtin/cat-file.c:407 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<kiểu> là một trong số: blob, tree, commit hoặc tag" -#: builtin/cat-file.c:365 +#: builtin/cat-file.c:408 msgid "show object type" msgstr "hiển thị kiểu đối tượng" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:409 msgid "show object size" msgstr "hiển thị kích thước đối tượng" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:411 msgid "exit with zero when there's no error" msgstr "thoát với 0 khi không có lỗi" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:412 msgid "pretty-print object's content" msgstr "in nội dung đối tượng dạng dễ đọc" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:414 msgid "for blob objects, run textconv on object's content" msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:416 +msgid "allow -s and -t to work with broken/corrupt objects" +msgstr "cho phép -s và -t để làm việc với các đối tượng sai/hỏng" + +#: builtin/cat-file.c:418 msgid "show info and content of objects fed from the standard input" msgstr "" "hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:421 msgid "show info about objects fed from the standard input" msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn" +#: builtin/cat-file.c:424 +msgid "follow in-tree symlinks (used with --batch or --batch-check)" +msgstr "theo liên kết mềm trong-cây (được dùng với --batch hay --batch-check)" + #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <attr>…] [--] tên-đường-dẫn…" @@ -3291,7 +3357,7 @@ msgstr "báo cáo tất cả các thuộc tính đặt trên tập tin" msgid "use .gitattributes only from the index" msgstr "chỉ dùng .gitattributes từ bảng mục lục" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96 msgid "read file names from stdin" msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn" @@ -3299,7 +3365,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:1107 builtin/gc.c:274 +#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279 msgid "suppress progress reporting" msgstr "chặn các báo cáo tiến trình hoạt động" @@ -3397,114 +3463,114 @@ msgstr "khi tạo các tập tin, nối thêm <chuỗi>" msgid "copy out the files from named stage" msgstr "sao chép ra các tập tin từ bệ phóng có tên" -#: builtin/checkout.c:25 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<các-tùy-chọn>] <nhánh>" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<các-tùy-chọn>] [<nhánh>] -- <tập-tin>…" -#: builtin/checkout.c:132 builtin/checkout.c:165 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "đường dẫn “%s” không có các phiên bản của chúng ta" -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "đường dẫn “%s” không có các phiên bản của chúng" -#: builtin/checkout.c:150 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "đường dẫn “%s” không có tất cả các phiên bản cần thiết" -#: builtin/checkout.c:194 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "đường dẫn “%s” không có các phiên bản cần thiết" -#: builtin/checkout.c:211 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "đường dẫn “%s”: không thể hòa trộn" -#: builtin/checkout.c:228 +#: builtin/checkout.c:234 #, c-format 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:249 builtin/checkout.c:252 builtin/checkout.c:255 -#: builtin/checkout.c:258 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 builtin/checkout.c:277 #, 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:261 builtin/checkout.c:264 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "không được dùng “%s” với %s" -#: builtin/checkout.c:267 +#: builtin/checkout.c:273 #, 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:278 builtin/checkout.c:467 +#: builtin/checkout.c:287 builtin/checkout.c:481 msgid "corrupt index file" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: builtin/checkout.c:338 builtin/checkout.c:345 +#: builtin/checkout.c:347 builtin/checkout.c:354 #, c-format msgid "path '%s' is unmerged" msgstr "đường dẫn “%s” không được hòa trộn" -#: builtin/checkout.c:489 +#: builtin/checkout.c:503 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:615 +#: builtin/checkout.c:634 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Không thể thực hiện reflog cho “%s”\n" -#: builtin/checkout.c:653 +#: builtin/checkout.c:670 msgid "HEAD is now at" msgstr "HEAD hiện giờ tại" -#: builtin/checkout.c:660 +#: builtin/checkout.c:677 #, c-format msgid "Reset branch '%s'\n" msgstr "Đặt lại nhánh “%s”\n" -#: builtin/checkout.c:663 +#: builtin/checkout.c:680 #, c-format msgid "Already on '%s'\n" msgstr "Đã sẵn sàng trên “%s”\n" -#: builtin/checkout.c:667 +#: builtin/checkout.c:684 #, 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:669 builtin/checkout.c:1050 +#: builtin/checkout.c:686 builtin/checkout.c:1285 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Đã chuyển đến nhánh mới “%s”\n" -#: builtin/checkout.c:671 +#: builtin/checkout.c:688 #, c-format msgid "Switched to branch '%s'\n" msgstr "Đã chuyển đến nhánh “%s”\n" -#: builtin/checkout.c:723 +#: builtin/checkout.c:740 #, c-format msgid " ... and %d more.\n" msgstr " … và nhiều hơn %d.\n" -#: builtin/checkout.c:729 +#: builtin/checkout.c:746 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3523,156 +3589,200 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:747 +#: builtin/checkout.c:765 #, c-format msgid "" +"If you want to keep it by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch <new-branch-name> %s\n" +"\n" +msgid_plural "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" " git branch <new-branch-name> %s\n" "\n" -msgstr "" -"Nếu bạn muốn giữ chúng bằng cách tạo ra một nhánh mới, đây có lẽ là\n" +msgstr[0] "" +"Nếu bạn muốn giữ (chúng) nó bằng cách tạo ra một nhánh mới, đây có lẽ là\n" "một thời điểm thích hợp để làm thế bằng lệnh:\n" "\n" " git branch <tên_nhánh_mới> %s\n" "\n" -#: builtin/checkout.c:777 +#: builtin/checkout.c:801 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:781 +#: builtin/checkout.c:805 msgid "Previous HEAD position was" msgstr "Vị trí trước kia của HEAD là" -#: builtin/checkout.c:808 builtin/checkout.c:1045 +#: builtin/checkout.c:832 builtin/checkout.c:1280 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:952 +#: builtin/checkout.c:893 +msgid "no branch specified" +msgstr "chưa chỉ ra tên của nhánh" + +#: builtin/checkout.c:895 +#, c-format +msgid "'%s' already exists" +msgstr "`%s' đã có từ trước rồi" + +#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842 +#: builtin/clone.c:853 +#, 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/checkout.c:924 +#, c-format +msgid "could not create directory of '%s'" +msgstr "không thể tạo thư mục của “%s”" + +#: builtin/checkout.c:960 +#, c-format +msgid "Enter %s (identifier %s)" +msgstr "Nhập vào %s (định danh %s)" + +#: builtin/checkout.c:1070 +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "'%s' đã sẵn được lấy ra tại '%s'" + +#: builtin/checkout.c:1176 #, 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:991 +#: builtin/checkout.c:1215 #, c-format msgid "invalid reference: %s" msgstr "tham chiếu không hợp lệ: %s" -#: builtin/checkout.c:1020 +#: builtin/checkout.c:1255 #, 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:1059 +#: builtin/checkout.c:1294 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:1062 builtin/checkout.c:1066 +#: builtin/checkout.c:1297 builtin/checkout.c:1301 #, 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:1070 builtin/checkout.c:1073 builtin/checkout.c:1078 -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313 +#: builtin/checkout.c:1316 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "“%s” không thể được dùng với “%s”" -#: builtin/checkout.c:1086 +#: builtin/checkout.c:1321 #, 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:1108 builtin/checkout.c:1110 builtin/clone.c:90 +#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "nhánh" -#: builtin/checkout.c:1109 +#: builtin/checkout.c:1347 msgid "create and checkout a new branch" msgstr "tạo và checkout một nhánh mới" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1349 msgid "create/reset and checkout a branch" msgstr "tạo/đặt_lại và checkout một nhánh" -#: builtin/checkout.c:1112 +#: builtin/checkout.c:1350 msgid "create reflog for new branch" msgstr "tạo reflog cho nhánh mới" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1351 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:1114 +#: builtin/checkout.c:1352 msgid "set upstream info for new branch" msgstr "đặt thông tin thượng nguồn cho nhánh mới" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new-branch" msgstr "nhánh-mới" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new unparented branch" msgstr "nhánh không cha mới" -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1355 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:1119 +#: builtin/checkout.c:1357 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:1121 +#: builtin/checkout.c:1359 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:1122 +#: builtin/checkout.c:1360 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:1123 builtin/merge.c:227 +#: builtin/checkout.c:1361 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "cập nhật các tập tin bị bỏ qua (mặc định)" -#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 +#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244 msgid "style" msgstr "kiểu" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1363 msgid "conflict style (merge or diff3)" msgstr "xung đột kiểu (hòa trộn hoặc diff3)" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1366 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:1130 +#: builtin/checkout.c:1368 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:1153 +#: builtin/checkout.c:1370 +msgid "check a branch out in a separate working directory" +msgstr "lấy ra một nhánh trong một thư mục làm việc cách biệt" + +#: builtin/checkout.c:1372 +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:1406 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:1170 +#: builtin/checkout.c:1423 msgid "--track needs a branch name" msgstr "--track cần tên một nhánh" -#: builtin/checkout.c:1175 +#: builtin/checkout.c:1428 msgid "Missing branch name; try -b" msgstr "Thiếu tên nhánh; hãy thử -b" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1464 msgid "invalid path specification" msgstr "đường dẫn đã cho không hợp lệ" -#: builtin/checkout.c:1219 +#: builtin/checkout.c:1471 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3682,12 +3792,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:1224 +#: builtin/checkout.c:1476 #, 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:1228 +#: builtin/checkout.c:1480 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3758,36 +3868,36 @@ msgstr "" "* - chọn tất\n" " - (để trống) kết thúc việc chọn" -#: builtin/clean.c:517 +#: builtin/clean.c:515 #, c-format msgid "Huh (%s)?" msgstr "Hả (%s)?" -#: builtin/clean.c:659 +#: builtin/clean.c:657 #, c-format msgid "Input ignore patterns>> " msgstr "Mẫu để lọc các tập tin đầu vào cần lờ đi>> " -#: builtin/clean.c:696 +#: builtin/clean.c:694 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "CẢNH BÁO: Không tìm thấy các mục được khớp bởi: %s" -#: builtin/clean.c:717 +#: builtin/clean.c:715 msgid "Select items to delete" msgstr "Chọn mục muốn xóa" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:756 #, c-format msgid "Remove %s [y/N]? " msgstr "Xóa bỏ “%s” [y/N]? " -#: builtin/clean.c:783 +#: builtin/clean.c:781 msgid "Bye." msgstr "Tạm biệt." -#: builtin/clean.c:791 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3805,61 +3915,61 @@ msgstr "" "help - hiển thị chính trợ giúp này\n" "? - trợ giúp dành cho chọn bằng cách nhắc" -#: builtin/clean.c:818 +#: builtin/clean.c:816 msgid "*** Commands ***" msgstr "*** Lệnh ***" -#: builtin/clean.c:819 +#: builtin/clean.c:817 msgid "What now" msgstr "Giờ thì sao" -#: builtin/clean.c:827 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Có muốn gỡ bỏ (các) mục sau đây không:" -#: builtin/clean.c:844 +#: builtin/clean.c:842 msgid "No more files to clean, exiting." msgstr "Không còn tập-tin nào để dọn dẹp, đang thoát ra." -#: builtin/clean.c:875 +#: builtin/clean.c:873 msgid "do not print names of files removed" msgstr "không hiển thị tên của các tập tin đã gỡ bỏ" -#: builtin/clean.c:877 +#: builtin/clean.c:875 msgid "force" msgstr "ép buộc" -#: builtin/clean.c:878 +#: builtin/clean.c:876 msgid "interactive cleaning" msgstr "dọn bằng kiểu tương tác" -#: builtin/clean.c:880 +#: builtin/clean.c:878 msgid "remove whole directories" msgstr "gỡ bỏ toàn bộ thư mục" -#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 msgid "pattern" msgstr "mẫu" -#: builtin/clean.c:882 +#: builtin/clean.c:880 msgid "add <pattern> to ignore rules" msgstr "thêm <mẫu> vào trong qui tắc bỏ qua" -#: builtin/clean.c:883 +#: builtin/clean.c:881 msgid "remove ignored files, too" msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua" -#: builtin/clean.c:885 +#: builtin/clean.c:883 msgid "remove only ignored files" msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua" -#: builtin/clean.c:903 +#: builtin/clean.c:901 msgid "-x and -X cannot be used together" msgstr "-x và -X không thể dùng cùng nhau" -#: builtin/clean.c:907 +#: builtin/clean.c:905 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3867,7 +3977,7 @@ msgstr "" "clean.requireForce được đặt thành true và không đưa ra tùy chọn -i, -n mà " "cũng không -f; từ chối lệnh dọn dẹp (clean)" -#: builtin/clean.c:910 +#: builtin/clean.c:908 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3879,150 +3989,150 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<các-tùy-chọn>] [--] <kho> [<t.mục>]" -#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224 #: builtin/push.c:523 msgid "force progress reporting" msgstr "ép buộc báo cáo tiến triển công việc" -#: builtin/clone.c:68 +#: builtin/clone.c:59 msgid "don't create a checkout" msgstr "không tạo một checkout" -#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503 msgid "create a bare repository" msgstr "tạo kho thuần" -#: builtin/clone.c:73 +#: builtin/clone.c:64 msgid "create a mirror repository (implies bare)" msgstr "tạo kho bản sao (ý là kho thuần)" -#: builtin/clone.c:75 +#: builtin/clone.c:66 msgid "to clone from a local repository" msgstr "để nhân bản từ kho nội bộ" -#: builtin/clone.c:77 +#: builtin/clone.c:68 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:79 +#: builtin/clone.c:70 msgid "setup as shared repository" msgstr "cài đặt đây là kho chia sẻ" -#: builtin/clone.c:81 builtin/clone.c:83 +#: builtin/clone.c:72 builtin/clone.c:74 msgid "initialize submodules in the clone" msgstr "khởi tạo mô-đun-con trong bản sao" -#: builtin/clone.c:84 builtin/init-db.c:493 +#: builtin/clone.c:75 builtin/init-db.c:500 msgid "template-directory" msgstr "thư-mục-mẫu" -#: builtin/clone.c:85 builtin/init-db.c:494 +#: builtin/clone.c:76 builtin/init-db.c:501 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:87 +#: builtin/clone.c:78 msgid "reference repository" msgstr "kho tham chiếu" -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:80 +msgid "use --reference only while cloning" +msgstr "chỉ dùng --reference khi nhân bản" + +#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "tên" -#: builtin/clone.c:89 +#: builtin/clone.c:82 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:91 +#: builtin/clone.c:84 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:93 +#: builtin/clone.c:86 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:94 builtin/fetch.c:112 builtin/grep.c:659 +#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "độ-sâu" -#: builtin/clone.c:95 +#: builtin/clone.c:88 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:97 +#: builtin/clone.c:90 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:99 -msgid "use --reference only while cloning" -msgstr "chỉ dùng --reference khi nhân bản" - -#: builtin/clone.c:100 builtin/init-db.c:502 +#: builtin/clone.c:91 builtin/init-db.c:509 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:101 builtin/init-db.c:503 +#: builtin/clone.c:92 builtin/init-db.c:510 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:102 +#: builtin/clone.c:93 msgid "key=value" msgstr "khóa=giá_trị" -#: builtin/clone.c:103 +#: builtin/clone.c:94 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:256 +#: builtin/clone.c:247 #, 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:260 +#: builtin/clone.c:251 #, c-format msgid "reference repository '%s' is shallow" msgstr "kho tham chiếu “%s” là nông" -#: builtin/clone.c:263 +#: builtin/clone.c:254 #, c-format msgid "reference repository '%s' is grafted" msgstr "kho tham chiếu “%s” bị cấy ghép" -#: builtin/clone.c:325 +#: builtin/clone.c:317 #, c-format msgid "failed to create directory '%s'" msgstr "tạo thư mục \"%s\" gặp lỗi" -#: builtin/clone.c:327 builtin/diff.c:84 +#: builtin/clone.c:319 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:329 +#: builtin/clone.c:321 #, 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:343 +#: builtin/clone.c:335 #, 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:365 +#: builtin/clone.c:357 #, 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:369 +#: builtin/clone.c:361 #, 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:392 builtin/clone.c:566 +#: builtin/clone.c:384 builtin/clone.c:558 #, c-format msgid "done.\n" msgstr "hoàn tất.\n" -#: builtin/clone.c:404 +#: builtin/clone.c:396 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4032,120 +4142,115 @@ 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:481 +#: builtin/clone.c:473 #, 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:561 +#: builtin/clone.c:553 #, c-format msgid "Checking connectivity... " msgstr "Đang kiểm tra kết nối… " -#: builtin/clone.c:564 +#: builtin/clone.c:556 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:628 +#: builtin/clone.c:620 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:659 +#: builtin/clone.c:651 msgid "unable to checkout working tree" msgstr "không thể lấy ra (checkout) cây làm việc" -#: builtin/clone.c:746 +#: builtin/clone.c:738 msgid "cannot repack to clean up" msgstr "không thể đóng gói để dọn dẹp" -#: builtin/clone.c:748 +#: builtin/clone.c:740 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:778 +#: builtin/clone.c:770 msgid "Too many arguments." msgstr "Có quá nhiều đối số." -#: builtin/clone.c:782 +#: builtin/clone.c:774 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:793 +#: builtin/clone.c:785 #, 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:796 +#: builtin/clone.c:788 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:809 +#: builtin/clone.c:801 #, c-format msgid "repository '%s' does not exist" msgstr "kho chứa “%s” chưa tồn tại" -#: builtin/clone.c:815 builtin/fetch.c:1156 +#: builtin/clone.c:807 builtin/fetch.c:1160 #, 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:825 +#: builtin/clone.c:817 #, 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:835 +#: builtin/clone.c:827 #, 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:850 builtin/clone.c:861 -#, 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:853 +#: builtin/clone.c:845 #, 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:871 +#: builtin/clone.c:863 #, 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:873 +#: builtin/clone.c:865 #, c-format msgid "Cloning into '%s'...\n" msgstr "Đang nhân bản thành “%s”…\n" -#: builtin/clone.c:898 +#: builtin/clone.c:890 msgid "--dissociate given, but there is no --reference" msgstr "đã đưa ra --dissociate, nhưng ở đây lại không có --reference" -#: builtin/clone.c:913 +#: builtin/clone.c:907 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:916 +#: builtin/clone.c:910 msgid "source repository is shallow, ignoring --local" msgstr "kho nguồn là nông, nên bỏ qua --local" -#: builtin/clone.c:921 +#: builtin/clone.c:915 msgid "--local is ignored" msgstr "--local bị lờ đi" -#: builtin/clone.c:925 +#: builtin/clone.c:919 #, 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:976 builtin/clone.c:984 +#: builtin/clone.c:968 builtin/clone.c:976 #, 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:987 +#: builtin/clone.c:979 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." @@ -4396,7 +4501,7 @@ msgstr "không thể đọc MERGE_MSG" msgid "could not read SQUASH_MSG" msgstr "không thể đọc SQUASH_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:738 builtin/merge.c:1079 #, c-format msgid "could not read '%s'" msgstr "Không thể đọc “%s”." @@ -4568,32 +4673,32 @@ msgstr "Chế độ dọn dẹp không hợp lệ %s" 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:1604 +#: builtin/commit.c:1324 builtin/commit.c:1603 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:1606 +#: builtin/commit.c:1326 builtin/commit.c:1605 msgid "show branch information" msgstr "hiển thị thông tin nhánh" -#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 +#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509 msgid "machine-readable output" msgstr "kết xuất dạng máy-có-thể-đọc" -#: builtin/commit.c:1331 builtin/commit.c:1610 +#: builtin/commit.c:1331 builtin/commit.c:1609 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:1613 +#: builtin/commit.c:1334 builtin/commit.c:1612 msgid "terminate entries with NUL" msgstr "chấm dứt các mục bằng NUL" -#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "chế độ" -#: builtin/commit.c:1337 builtin/commit.c:1616 +#: builtin/commit.c:1337 builtin/commit.c:1615 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, " @@ -4603,7 +4708,7 @@ msgstr "" msgid "show ignored files" msgstr "hiển thị các tập tin ẩn" -#: builtin/commit.c:1341 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:152 msgid "when" msgstr "khi" @@ -4619,209 +4724,209 @@ msgstr "" 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:1431 +#: builtin/commit.c:1430 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:1433 +#: builtin/commit.c:1432 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:1478 +#: builtin/commit.c:1477 msgid "detached HEAD" msgstr "đã rời khỏi HEAD" -#: builtin/commit.c:1481 +#: builtin/commit.c:1480 msgid " (root-commit)" msgstr " (root-commit)" -#: builtin/commit.c:1574 +#: builtin/commit.c:1573 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:1575 +#: builtin/commit.c:1574 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:1577 +#: builtin/commit.c:1576 msgid "Commit message options" msgstr "Các tùy chọn ghi chú commit" -#: builtin/commit.c:1578 builtin/tag.c:601 +#: builtin/commit.c:1577 builtin/tag.c:601 msgid "read message from file" msgstr "đọc chú thích từ tập tin" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "author" msgstr "tác giả" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "override author for commit" msgstr "ghi đè tác giả cho commit" -#: builtin/commit.c:1580 builtin/gc.c:275 +#: builtin/commit.c:1579 builtin/gc.c:280 msgid "date" msgstr "ngày tháng" -#: builtin/commit.c:1580 +#: builtin/commit.c:1579 msgid "override date for commit" msgstr "ghi đè ngày tháng cho lần chuyển giao" -#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "chú thích" -#: builtin/commit.c:1581 +#: builtin/commit.c:1580 msgid "commit message" msgstr "chú thích của lần chuyển giao" -#: builtin/commit.c:1582 +#: builtin/commit.c:1581 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:1583 +#: builtin/commit.c:1582 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:1584 +#: builtin/commit.c:1583 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:1585 +#: builtin/commit.c:1584 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:1586 +#: builtin/commit.c:1585 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:1587 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "(nên dùng) thêm dòng Signed-off-by:" -#: builtin/commit.c:1588 +#: builtin/commit.c:1587 msgid "use specified template file" msgstr "sử dụng tập tin mẫu đã cho" -#: builtin/commit.c:1589 +#: builtin/commit.c:1588 msgid "force edit of commit" msgstr "ép buộc sửa lần commit" -#: builtin/commit.c:1590 +#: builtin/commit.c:1589 msgid "default" msgstr "mặc định" -#: builtin/commit.c:1590 builtin/tag.c:604 +#: builtin/commit.c:1589 builtin/tag.c:604 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:1591 +#: builtin/commit.c:1590 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:1592 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "mã-số-khóa" -#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "ký lần chuyển giao dùng GPG" -#: builtin/commit.c:1596 +#: builtin/commit.c:1595 msgid "Commit contents options" msgstr "Các tùy nội dung ghi chú commit" -#: builtin/commit.c:1597 +#: builtin/commit.c:1596 msgid "commit all changed files" msgstr "chuyển giao tất cả các tập tin có thay đổi" -#: builtin/commit.c:1598 +#: builtin/commit.c:1597 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:1599 +#: builtin/commit.c:1598 msgid "interactively add files" msgstr "thêm các tập-tin bằng tương tác" -#: builtin/commit.c:1600 +#: builtin/commit.c:1599 msgid "interactively add changes" msgstr "thêm các thay đổi bằng tương tác" -#: builtin/commit.c:1601 +#: builtin/commit.c:1600 msgid "commit only specified files" msgstr "chỉ chuyển giao các tập tin đã chỉ ra" -#: builtin/commit.c:1602 +#: builtin/commit.c:1601 msgid "bypass pre-commit hook" msgstr "vòng qua móc (hook) pre-commit" -#: builtin/commit.c:1603 +#: builtin/commit.c:1602 msgid "show what would be committed" msgstr "hiển thị xem cái gì có thể được chuyển giao" -#: builtin/commit.c:1614 +#: builtin/commit.c:1613 msgid "amend previous commit" msgstr "“tu bổ” (amend) lần commit trước" -#: builtin/commit.c:1615 +#: builtin/commit.c:1614 msgid "bypass post-rewrite hook" msgstr "vòng qua móc (hook) post-rewrite" -#: builtin/commit.c:1620 +#: builtin/commit.c:1619 msgid "ok to record an empty change" msgstr "ok để ghi lại một thay đổi trống rỗng" -#: builtin/commit.c:1622 +#: builtin/commit.c:1621 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:1651 +#: builtin/commit.c:1650 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" -#: builtin/commit.c:1690 builtin/merge.c:519 +#: builtin/commit.c:1689 builtin/merge.c:1076 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở “%s” để đọc" -#: builtin/commit.c:1697 +#: builtin/commit.c:1696 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1704 +#: builtin/commit.c:1703 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1723 +#: builtin/commit.c:1722 #, 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:1734 +#: builtin/commit.c:1733 #, 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:1739 +#: builtin/commit.c:1738 #, 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:1754 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854 msgid "failed to write commit object" msgstr "gặp lỗi khi ghi đối tượng chuyển giao" -#: builtin/commit.c:1787 +#: builtin/commit.c:1786 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4964,18 +5069,18 @@ msgstr "không thể phân tích giá trị màu mặc định" #, c-format msgid "" "# This is Git's per-user configuration file.\n" -"[core]\n" +"[user]\n" "# Please adapt and uncomment the following lines:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" msgstr "" "# Đây là tập tin cấu hình cho từng người dùng Git.\n" -"[core]\n" +"[user]\n" "# Vui lòng sửa lại cho thích hợp và bỏ dấu ghi chú các dòng sau:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:589 +#: builtin/config.c:587 #, c-format msgid "cannot create configuration file %s" msgstr "không thể tạo tập tin cấu hình “%s”" @@ -5307,81 +5412,81 @@ msgstr "refmap" msgid "specify fetch refmap" msgstr "chỉ ra refmap cần lấy về" -#: builtin/fetch.c:375 +#: builtin/fetch.c:377 msgid "Couldn't find remote ref HEAD" msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD" -#: builtin/fetch.c:455 +#: builtin/fetch.c:457 #, c-format msgid "object %s not found" msgstr "Không tìm thấy đối tượng %s" -#: builtin/fetch.c:460 +#: builtin/fetch.c:462 msgid "[up to date]" msgstr "[đã cập nhật]" -#: builtin/fetch.c:474 +#: builtin/fetch.c:476 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (không thể fetch (lấy) về nhánh hiện hành)" -#: builtin/fetch.c:475 builtin/fetch.c:561 +#: builtin/fetch.c:477 builtin/fetch.c:563 msgid "[rejected]" msgstr "[Bị từ chối]" -#: builtin/fetch.c:486 +#: builtin/fetch.c:488 msgid "[tag update]" msgstr "[cập nhật thẻ]" -#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 +#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543 msgid " (unable to update local ref)" msgstr " (không thể cập nhật tham chiếu nội bộ)" -#: builtin/fetch.c:506 +#: builtin/fetch.c:508 msgid "[new tag]" msgstr "[thẻ mới]" -#: builtin/fetch.c:509 +#: builtin/fetch.c:511 msgid "[new branch]" msgstr "[nhánh mới]" -#: builtin/fetch.c:512 +#: builtin/fetch.c:514 msgid "[new ref]" msgstr "[ref (tham chiếu) mới]" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "unable to update local ref" msgstr "không thể cập nhật tham chiếu nội bộ" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "forced update" msgstr "cưỡng bức cập nhật" -#: builtin/fetch.c:563 +#: builtin/fetch.c:565 msgid "(non-fast-forward)" msgstr "(non-fast-forward)" -#: builtin/fetch.c:596 builtin/fetch.c:829 +#: builtin/fetch.c:599 builtin/fetch.c:832 #, c-format msgid "cannot open %s: %s\n" msgstr "không thể mở %s: %s\n" -#: builtin/fetch.c:605 +#: builtin/fetch.c:608 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n" -#: builtin/fetch.c:623 +#: builtin/fetch.c:626 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật" -#: builtin/fetch.c:711 builtin/fetch.c:794 +#: builtin/fetch.c:714 builtin/fetch.c:797 #, c-format msgid "From %.*s\n" msgstr "Từ %.*s\n" -#: builtin/fetch.c:722 +#: builtin/fetch.c:725 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5390,57 +5495,57 @@ msgstr "" "một số tham chiếu nội bộ không thể được cập nhật; hãy thử chạy\n" " “git remote prune %s” để bỏ đi những nhánh cũ, hay bị xung đột" -#: builtin/fetch.c:774 +#: builtin/fetch.c:777 #, c-format msgid " (%s will become dangling)" msgstr " (%s sẽ trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:775 +#: builtin/fetch.c:778 #, c-format msgid " (%s has become dangling)" msgstr " (%s đã trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:799 +#: builtin/fetch.c:802 msgid "[deleted]" msgstr "[đã xóa]" -#: builtin/fetch.c:800 builtin/remote.c:1060 +#: builtin/fetch.c:803 builtin/remote.c:1057 msgid "(none)" msgstr "(không)" -#: builtin/fetch.c:819 +#: builtin/fetch.c:822 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho " "trần (bare)" -#: builtin/fetch.c:838 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s" -#: builtin/fetch.c:841 +#: builtin/fetch.c:844 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n" -#: builtin/fetch.c:897 +#: builtin/fetch.c:900 #, c-format msgid "Don't know how to fetch from %s" msgstr "Không biết làm cách nào để lấy về từ %s" -#: builtin/fetch.c:1059 +#: builtin/fetch.c:1063 #, c-format msgid "Fetching %s\n" msgstr "Đang lấy “%s” về\n" -#: builtin/fetch.c:1061 builtin/remote.c:90 +#: builtin/fetch.c:1065 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "không thể “%s” về" -#: builtin/fetch.c:1079 +#: builtin/fetch.c:1083 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5448,32 +5553,32 @@ msgstr "" "Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n" "tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)." -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1106 msgid "You need to specify a tag name." msgstr "Bạn phải định rõ tên thẻ." -#: builtin/fetch.c:1144 +#: builtin/fetch.c:1148 msgid "--depth and --unshallow cannot be used together" msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau" -#: builtin/fetch.c:1146 +#: builtin/fetch.c:1150 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý" -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1173 msgid "fetch --all does not take a repository argument" msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa" -#: builtin/fetch.c:1171 +#: builtin/fetch.c:1175 msgid "fetch --all does not make sense with refspecs" msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs" -#: builtin/fetch.c:1182 +#: builtin/fetch.c:1186 #, c-format msgid "No such remote or remote group: %s" msgstr "không có nhóm máy chủ hay máy chủ như thế: %s" -#: builtin/fetch.c:1190 +#: builtin/fetch.c:1194 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý" @@ -5484,130 +5589,130 @@ msgstr "" "git fmt-merge-msg [-m <chú_thích>] [--log[=<n>] | --no-log] [--file <tập-" "tin>]" -#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 +#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590 -#: parse-options.h:132 parse-options.h:239 +#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590 +#: parse-options.h:131 parse-options.h:238 msgid "n" msgstr "n" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:669 msgid "populate log with at most <n> entries from shortlog" msgstr "gắn nhật ký với ít nhất <n> mục từ lệnh “shortlog”" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:672 msgid "alias for --log (deprecated)" msgstr "bí danh cho --log (không được dùng)" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:675 msgid "text" msgstr "văn bản" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:676 msgid "use <text> as start of message" msgstr "dùng <văn bản thường> để bắt đầu ghi chú" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:677 msgid "file to read from" msgstr "tập tin để đọc dữ liệu từ đó" -#: builtin/for-each-ref.c:675 +#: builtin/for-each-ref.c:687 msgid "unable to parse format" msgstr "không thể phân tích định dạng" -#: builtin/for-each-ref.c:1063 +#: builtin/for-each-ref.c:1083 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<các-tùy-chọn>] [<mẫu>]" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1098 msgid "quote placeholders suitably for shells" msgstr "trích dẫn để phù hợp cho hệ vỏ (shell)" -#: builtin/for-each-ref.c:1080 +#: builtin/for-each-ref.c:1100 msgid "quote placeholders suitably for perl" msgstr "trích dẫn để phù hợp cho perl" -#: builtin/for-each-ref.c:1082 +#: builtin/for-each-ref.c:1102 msgid "quote placeholders suitably for python" msgstr "trích dẫn để phù hợp cho python" -#: builtin/for-each-ref.c:1084 +#: builtin/for-each-ref.c:1104 msgid "quote placeholders suitably for Tcl" msgstr "trích dẫn để phù hợp cho Tcl" -#: builtin/for-each-ref.c:1087 +#: builtin/for-each-ref.c:1107 msgid "show only <n> matched refs" msgstr "hiển thị chỉ <n> tham chiếu khớp" -#: builtin/for-each-ref.c:1088 builtin/replace.c:438 +#: builtin/for-each-ref.c:1108 builtin/replace.c:438 msgid "format" msgstr "định dạng" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1108 msgid "format to use for the output" msgstr "định dạng sẽ dùng cho đầu ra" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1109 msgid "key" msgstr "khóa" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1110 msgid "field name to sort on" msgstr "tên trường cần sắp xếp" -#: builtin/fsck.c:147 builtin/prune.c:137 +#: builtin/fsck.c:147 builtin/prune.c:236 msgid "Checking connectivity" msgstr "Đang kiểm tra kết nối" -#: builtin/fsck.c:540 +#: builtin/fsck.c:548 msgid "Checking object directories" msgstr "Đang kiểm tra các thư mục đối tượng" -#: builtin/fsck.c:603 +#: builtin/fsck.c:611 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<các-tùy-chọn>] [<đối-tượng>…]" -#: builtin/fsck.c:609 +#: builtin/fsck.c:617 msgid "show unreachable objects" msgstr "hiển thị các đối tượng không thể đọc được" -#: builtin/fsck.c:610 +#: builtin/fsck.c:618 msgid "show dangling objects" msgstr "hiển thị các đối tượng không được quản lý" -#: builtin/fsck.c:611 +#: builtin/fsck.c:619 msgid "report tags" msgstr "báo cáo các thẻ" -#: builtin/fsck.c:612 +#: builtin/fsck.c:620 msgid "report root nodes" msgstr "báo cáo node gốc" -#: builtin/fsck.c:613 +#: builtin/fsck.c:621 msgid "make index objects head nodes" msgstr "tạo “index objects head nodes”" -#: builtin/fsck.c:614 +#: builtin/fsck.c:622 msgid "make reflogs head nodes (default)" msgstr "tạo “reflogs head nodes” (mặc định)" -#: builtin/fsck.c:615 +#: builtin/fsck.c:623 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:616 +#: builtin/fsck.c:624 msgid "enable more strict checking" msgstr "cho phép kiểm tra hạn chế hơn" -#: builtin/fsck.c:618 +#: builtin/fsck.c:626 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:619 builtin/prune.c:108 +#: builtin/fsck.c:627 builtin/prune.c:198 msgid "show progress" msgstr "hiển thị quá trình" -#: builtin/fsck.c:669 +#: builtin/fsck.c:677 msgid "Checking objects" msgstr "Đang kiểm tra các đối tượng" @@ -5615,50 +5720,50 @@ msgstr "Đang kiểm tra các đối tượng" msgid "git gc [<options>]" msgstr "git gc [<các-tùy-chọn>]" -#: builtin/gc.c:79 +#: builtin/gc.c:67 #, c-format -msgid "Invalid gc.pruneexpire: '%s'" -msgstr "gc.pruneexpire không hợp lệ: “%s”" +msgid "Invalid %s: '%s'" +msgstr "%s không hợp lệ: “%s”" -#: builtin/gc.c:107 +#: builtin/gc.c:112 #, c-format msgid "insanely long object directory %.*s" msgstr "thư mục đối tượng dài một cách điên rồ %.*s" -#: builtin/gc.c:276 +#: builtin/gc.c:281 msgid "prune unreferenced objects" msgstr "xóa bỏ các đối tượng không được tham chiếu" -#: builtin/gc.c:278 +#: builtin/gc.c:283 msgid "be more thorough (increased runtime)" msgstr "cẩn thận hơn nữa (tăng thời gian chạy)" -#: builtin/gc.c:279 +#: builtin/gc.c:284 msgid "enable auto-gc mode" msgstr "bật chế độ auto-gc" -#: builtin/gc.c:280 +#: builtin/gc.c:285 msgid "force running gc even if there may be another gc running" msgstr "buộc gc chạy ngay cả khi có tiến trình gc khác đang chạy" -#: builtin/gc.c:321 +#: builtin/gc.c:327 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Tự động đóng gói kho chứa trên nền hệ thống để tối ưu hóa hiệu suất làm " "việc.\n" -#: builtin/gc.c:323 +#: builtin/gc.c:329 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n" -#: builtin/gc.c:324 +#: builtin/gc.c:330 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Xem \"git help gc\" để có hướng dẫn cụ thể về cách dọn dẹp kho git.\n" -#: builtin/gc.c:342 +#: builtin/gc.c:348 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5666,7 +5771,7 @@ msgstr "" "gc đang được thực hiện trên máy “%s” pid %<PRIuMAX> (dùng --force nếu không " "phải thế)" -#: builtin/gc.c:364 +#: builtin/gc.c:376 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5871,7 +5976,7 @@ msgstr "hiển thị các tập tin khớp trong trang giấy" 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:741 builtin/show-ref.c:187 +#: builtin/grep.c:741 builtin/show-ref.c:189 msgid "show usage" msgstr "hiển thị cách dùng" @@ -5901,7 +6006,7 @@ msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu d msgid "both --cached and trees are given." msgstr "cả hai --cached và các cây phải được chỉ ra." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:80 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -5909,36 +6014,36 @@ msgstr "" "git hash-object [-t <kiểu>] [-w] [--path=<tập-tin> | --no-filters] [--stdin] " "[--] <tập-tin>…" -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:81 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <danh-sách-đường-dẫn>" -#: builtin/hash-object.c:94 builtin/tag.c:612 +#: builtin/hash-object.c:92 builtin/tag.c:612 msgid "type" msgstr "kiểu" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:92 msgid "object type" msgstr "kiểu đối tượng" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:93 msgid "write the object into the object database" msgstr "ghi đối tượng vào dữ liệu đối tượng" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:95 msgid "read the object from stdin" msgstr "đọc đối tượng từ đầu vào tiêu chuẩn stdin" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:97 msgid "store file as is without filters" msgstr "lưu các tập tin mà nó không có các bộ lọc" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:98 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "chỉ cần băm rác ngẫu nhiên để tạo một đối tượng hỏng để mà gỡ lỗi Git" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:99 msgid "process file as it were from this path" msgstr "xử lý tập tin như là nó đang ở thư mục này" @@ -6066,286 +6171,286 @@ msgstr "cách dùng: %s%s" msgid "`git %s' is aliased to `%s'" msgstr "“git %s” được đặt bí danh thành “%s”" -#: builtin/index-pack.c:150 +#: builtin/index-pack.c:151 #, c-format msgid "unable to open %s" msgstr "không thể mở %s" -#: builtin/index-pack.c:200 +#: builtin/index-pack.c:201 #, c-format msgid "object type mismatch at %s" msgstr "kiểu đối tượng không khớp tại %s" -#: builtin/index-pack.c:220 +#: builtin/index-pack.c:221 #, c-format msgid "did not receive expected object %s" msgstr "Không thể lấy về đối tượng cần %s" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "object %s: expected type %s, found %s" msgstr "đối tượng %s: cần kiểu %s nhưng lại nhận được %s" -#: builtin/index-pack.c:265 +#: builtin/index-pack.c:266 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "không thể điền thêm vào %d byte" -#: builtin/index-pack.c:275 +#: builtin/index-pack.c:276 msgid "early EOF" msgstr "gặp kết thúc tập tin EOF quá sớm" -#: builtin/index-pack.c:276 +#: builtin/index-pack.c:277 msgid "read error on input" msgstr "lỗi đọc ở đầu vào" -#: builtin/index-pack.c:288 +#: builtin/index-pack.c:289 msgid "used more bytes than were available" msgstr "sử dụng nhiều hơn số lượng byte mà nó sẵn có" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:296 msgid "pack too large for current definition of off_t" msgstr "gói quá lớn so với định nghĩa hiện tại của kiểu off_t" -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:312 #, c-format msgid "unable to create '%s'" msgstr "không thể tạo “%s”" -#: builtin/index-pack.c:316 +#: builtin/index-pack.c:317 #, c-format msgid "cannot open packfile '%s'" msgstr "không thể mở packfile “%s”" -#: builtin/index-pack.c:330 +#: builtin/index-pack.c:331 msgid "pack signature mismatch" msgstr "chữ ký cho gói không khớp" -#: builtin/index-pack.c:332 +#: builtin/index-pack.c:333 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "không hỗ trợ phiên bản gói %<PRIu32>" -#: builtin/index-pack.c:350 +#: builtin/index-pack.c:351 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "gói có đối tượng sai khoảng bù (offset) %lu: %s" -#: builtin/index-pack.c:471 +#: builtin/index-pack.c:472 #, c-format msgid "inflate returned %d" msgstr "xả nén trả về %d" -#: builtin/index-pack.c:520 +#: builtin/index-pack.c:521 msgid "offset value overflow for delta base object" msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "delta base offset is out of bound" msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 #, c-format msgid "unknown object type %d" msgstr "không hiểu kiểu đối tượng %d" -#: builtin/index-pack.c:567 +#: builtin/index-pack.c:568 msgid "cannot pread pack file" msgstr "không thể chạy hàm pread cho tập tin gói" -#: builtin/index-pack.c:569 +#: builtin/index-pack.c:570 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "tập tin gói bị kết thúc sớm, thiếu %lu byte" -#: builtin/index-pack.c:595 +#: builtin/index-pack.c:596 msgid "serious inflate inconsistency" msgstr "sự mâu thuẫn xả nén nghiêm trọng" -#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715 -#: builtin/index-pack.c:749 builtin/index-pack.c:758 +#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771 +#: builtin/index-pack.c:805 builtin/index-pack.c:814 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!" -#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/index-pack.c:745 builtin/pack-objects.c:162 #: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "không thể đọc %s" -#: builtin/index-pack.c:755 +#: builtin/index-pack.c:811 #, c-format msgid "cannot read existing object %s" msgstr "không thể đọc đối tượng đã tồn tại %s" -#: builtin/index-pack.c:769 +#: builtin/index-pack.c:825 #, c-format msgid "invalid blob object %s" msgstr "đối tượng blob không hợp lệ %s" -#: builtin/index-pack.c:783 +#: builtin/index-pack.c:839 #, c-format msgid "invalid %s" msgstr "%s không hợp lệ" -#: builtin/index-pack.c:787 +#: builtin/index-pack.c:843 msgid "Error in object" msgstr "Lỗi trong đối tượng" -#: builtin/index-pack.c:789 +#: builtin/index-pack.c:845 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được" -#: builtin/index-pack.c:861 builtin/index-pack.c:890 +#: builtin/index-pack.c:917 builtin/index-pack.c:948 msgid "failed to apply delta" msgstr "gặp lỗi khi áp dụng delta" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Đang nhận về các đối tượng" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Các đối tượng bảng mục lục" -#: builtin/index-pack.c:1081 +#: builtin/index-pack.c:1150 msgid "pack is corrupted (SHA1 mismatch)" msgstr "gói bị sai hỏng (SHA1 không khớp)" -#: builtin/index-pack.c:1086 +#: builtin/index-pack.c:1155 msgid "cannot fstat packfile" msgstr "không thể lấy thông tin thống kê packfile" -#: builtin/index-pack.c:1089 +#: builtin/index-pack.c:1158 msgid "pack has junk at the end" msgstr "pack có phần thừa ở cuối" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1169 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1194 msgid "Resolving deltas" msgstr "Đang phân giải các delta" -#: builtin/index-pack.c:1133 +#: builtin/index-pack.c:1205 #, c-format msgid "unable to create thread: %s" msgstr "không thể tạo tuyến: %s" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1247 msgid "confusion beyond insanity" msgstr "lộn xộn hơn cả điên rồ" -#: builtin/index-pack.c:1181 +#: builtin/index-pack.c:1253 #, c-format msgid "completed with %d local objects" msgstr "đầy đủ với %d đối tượng nội bộ" -#: builtin/index-pack.c:1191 +#: builtin/index-pack.c:1263 #, 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?)" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1267 #, 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:1219 +#: builtin/index-pack.c:1291 #, 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:1298 +#: builtin/index-pack.c:1367 #, c-format msgid "local object %s is corrupt" msgstr "đối tượng nội bộ %s bị hỏng" -#: builtin/index-pack.c:1322 +#: builtin/index-pack.c:1391 msgid "error while closing pack file" msgstr "gặp lỗi trong khi đóng tập tin gói" -#: builtin/index-pack.c:1335 +#: builtin/index-pack.c:1404 #, c-format msgid "cannot write keep file '%s'" msgstr "không thể ghi tập tin giữ lại “%s”" -#: builtin/index-pack.c:1343 +#: builtin/index-pack.c:1412 #, 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:1356 +#: builtin/index-pack.c:1425 msgid "cannot store pack file" msgstr "không thể lưu tập tin gói" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1436 msgid "cannot store index file" msgstr "không thể lưu trữ tập tin ghi mục lục" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1469 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "sai pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1475 #, c-format msgid "invalid number of threads specified (%d)" msgstr "số tuyến chỉ ra không hợp lệ (%d)" -#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1658 #, c-format msgid "no threads support, ignoring %s" msgstr "không hỗ trợ đa tuyến, bỏ qua %s" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1537 #, 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:1470 +#: builtin/index-pack.c:1539 #, 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:1517 +#: builtin/index-pack.c:1586 #, 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:1524 +#: builtin/index-pack.c:1593 #, 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:1553 +#: builtin/index-pack.c:1622 msgid "Cannot come back to cwd" msgstr "Không thể quay lại cwd" -#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 -#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 +#: builtin/index-pack.c:1670 builtin/index-pack.c:1673 +#: builtin/index-pack.c:1685 builtin/index-pack.c:1689 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1634 +#: builtin/index-pack.c:1703 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:1638 builtin/index-pack.c:1647 +#: builtin/index-pack.c:1707 builtin/index-pack.c:1716 #, 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:1655 +#: builtin/index-pack.c:1724 msgid "--verify with no packfile name given" msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" @@ -6414,22 +6519,22 @@ msgstr "các mẫu không được tìm thấy %s" 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”" -#: builtin/init-db.c:197 +#: builtin/init-db.c:211 #, c-format msgid "insane git directory %s" msgstr "thư mục git điên rồ %s" -#: builtin/init-db.c:331 builtin/init-db.c:334 +#: builtin/init-db.c:343 builtin/init-db.c:346 #, c-format msgid "%s already exists" msgstr "%s đã có từ trước rồi" -#: builtin/init-db.c:363 +#: builtin/init-db.c:374 #, 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:366 +#: builtin/init-db.c:377 #, c-format msgid "unable to move %s to %s" msgstr "không di chuyển được %s vào %s" @@ -6437,54 +6542,54 @@ 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:426 +#: builtin/init-db.c:433 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s kho Git trong %s%s\n" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Reinitialized existing" msgstr "Khởi tạo lại đã sẵn có rồi" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Initialized empty" msgstr "Khởi tạo trống rỗng" -#: builtin/init-db.c:428 +#: builtin/init-db.c:435 msgid " shared" msgstr " đã chia sẻ" -#: builtin/init-db.c:475 +#: builtin/init-db.c:482 msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" -"[=<permissions>]] [<directory>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" +"shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-" "quyền>]] [thư-mục]" -#: builtin/init-db.c:498 +#: builtin/init-db.c:505 msgid "permissions" msgstr "các quyền" -#: builtin/init-db.c:499 +#: builtin/init-db.c:506 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:501 builtin/prune-packed.c:57 builtin/repack.c:171 +#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171 msgid "be quiet" msgstr "im lặng" -#: builtin/init-db.c:533 builtin/init-db.c:538 +#: builtin/init-db.c:540 builtin/init-db.c:545 #, c-format msgid "cannot mkdir %s" msgstr "không thể mkdir (tạo thư mục): %s" -#: builtin/init-db.c:542 +#: builtin/init-db.c:549 #, c-format msgid "cannot chdir to %s" msgstr "không thể chdir (chuyển đổi thư mục) sang %s" -#: builtin/init-db.c:563 +#: builtin/init-db.c:570 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6493,7 +6598,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:591 +#: builtin/init-db.c:598 #, c-format msgid "Cannot access work tree '%s'" msgstr "không thể truy cập cây (tree) làm việc “%s”" @@ -6519,8 +6624,8 @@ msgid "trailer(s) to add" msgstr "bộ dò vết cần thêm" #: builtin/log.c:41 -msgid "git log [<options>] [<revision range>] [[--] <path>...]" -msgstr "git log [<các-tùy-chọn>] [<vùng xem xét>] [[--] <đường-dẫn>…]" +msgid "git log [<options>] [<revision-range>] [[--] <path>...]" +msgstr "git log [<các-tùy-chọn>] [<vùng-xem-xét>] [[--] <đường-dẫn>…]" #: builtin/log.c:42 msgid "git show [<options>] <object>..." @@ -6588,7 +6693,7 @@ msgstr "Không thể mở tập tin miếng vá: %s" msgid "Need exactly one range." msgstr "Cần chính xác một vùng." -#: builtin/log.c:811 +#: builtin/log.c:813 msgid "Not a range." msgstr "Không phải là một vùng." @@ -6789,7 +6894,7 @@ msgstr "Gặp lỗi khi tạo các tập tin kết xuất" msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]" -#: builtin/log.c:1638 +#: builtin/log.c:1637 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -6797,7 +6902,7 @@ 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:1651 builtin/log.c:1653 builtin/log.c:1665 +#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662 #, c-format msgid "Unknown commit %s" msgstr "Không hiểu lần chuyển giao %s" @@ -7073,42 +7178,42 @@ msgstr "Không có lời chú thích hòa trộn -- nên không cập nhật HEA 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:559 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Chuỗi branch.%s.mergeoptions sai: %s" -#: builtin/merge.c:654 +#: builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "lệnh git write-tree gặp lỗi khi ghi một cây" -#: builtin/merge.c:678 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "Không cầm nắm gì ngoài hai head hòa trộn" -#: builtin/merge.c:692 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s" -#: builtin/merge.c:705 +#: builtin/merge.c:683 #, c-format msgid "unable to write %s" msgstr "không thể ghi %s" -#: builtin/merge.c:794 +#: builtin/merge.c:772 #, c-format msgid "Could not read from '%s'" msgstr "Không thể đọc từ “%s”" -#: builtin/merge.c:803 +#: builtin/merge.c:781 #, 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:809 +#: builtin/merge.c:787 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7126,50 +7231,55 @@ msgstr "" "rỗng\n" "sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/merge.c:833 +#: builtin/merge.c:811 msgid "Empty commit message." msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng." -#: builtin/merge.c:845 +#: builtin/merge.c:823 #, c-format msgid "Wonderful.\n" msgstr "Thần kỳ.\n" -#: builtin/merge.c:900 +#: builtin/merge.c:878 #, 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:916 +#: builtin/merge.c:894 #, 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:957 +#: builtin/merge.c:935 msgid "No current branch." msgstr "không phải nhánh hiện hành" -#: builtin/merge.c:959 +#: builtin/merge.c:937 msgid "No remote for the current branch." msgstr "Không có máy chủ cho nhánh hiện hành." -#: builtin/merge.c:961 +#: builtin/merge.c:939 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:966 +#: builtin/merge.c:944 #, 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:1122 +#: builtin/merge.c:1081 +#, c-format +msgid "could not close '%s'" +msgstr "không thể đóng “%s”" + +#: builtin/merge.c:1208 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:1138 +#: builtin/merge.c:1224 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7177,11 +7287,11 @@ 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:1141 git-pull.sh:34 +#: builtin/merge.c:1227 git-pull.sh:74 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)." -#: builtin/merge.c:1145 +#: builtin/merge.c:1231 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7189,103 +7299,103 @@ 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:1148 +#: builtin/merge.c:1234 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:1157 +#: builtin/merge.c:1243 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:1166 +#: builtin/merge.c:1251 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:1198 -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:1201 +#: builtin/merge.c:1268 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:1203 +#: builtin/merge.c:1270 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Chuyển giao không-fast-forward không hợp lý ở trong một head trống rỗng" -#: builtin/merge.c:1208 +#: builtin/merge.c:1276 #, 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:1259 +#: builtin/merge.c:1278 +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:1333 #, 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:1262 +#: builtin/merge.c:1336 #, 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:1265 +#: builtin/merge.c:1339 #, 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:1268 +#: builtin/merge.c:1342 #, 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:1349 +#: builtin/merge.c:1423 #, c-format msgid "Updating %s..%s\n" msgstr "Đang cập nhật %s..%s\n" -#: builtin/merge.c:1388 +#: builtin/merge.c:1462 #, 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:1395 +#: builtin/merge.c:1469 #, c-format msgid "Nope.\n" msgstr "Không.\n" -#: builtin/merge.c:1427 +#: builtin/merge.c:1501 msgid "Not possible to fast-forward, aborting." msgstr "Thực hiện lệnh fast-forward là không thể được, đang bỏ qua." -#: builtin/merge.c:1450 builtin/merge.c:1529 +#: builtin/merge.c:1524 builtin/merge.c:1603 #, 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:1454 +#: builtin/merge.c:1528 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Đang thử chiến lược hòa trộn %s…\n" -#: builtin/merge.c:1520 +#: builtin/merge.c:1594 #, 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:1522 +#: builtin/merge.c:1596 #, 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:1531 +#: builtin/merge.c:1605 #, 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:1543 +#: builtin/merge.c:1617 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7476,7 +7586,7 @@ 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:256 builtin/remote.c:728 builtin/repack.c:359 +#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361 #, c-format msgid "renaming '%s' failed" msgstr "gặp lỗi khi đổi tên “%s”" @@ -7852,7 +7962,7 @@ msgstr "notes-ref" msgid "use notes from <notes-ref>" msgstr "dùng “notes” từ <notes-ref>" -#: builtin/notes.c:989 builtin/remote.c:1621 +#: builtin/notes.c:989 builtin/remote.c:1618 #, c-format msgid "Unknown subcommand: %s" msgstr "Không hiểu câu lệnh con: %s" @@ -7878,172 +7988,172 @@ msgstr "lỗi giải nén (%d)" msgid "Writing objects" msgstr "Đang ghi lại các đối tượng" -#: builtin/pack-objects.c:1013 +#: builtin/pack-objects.c:1011 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:2173 +#: builtin/pack-objects.c:2171 msgid "Compressing objects" msgstr "Đang nén các đối tượng" -#: builtin/pack-objects.c:2570 +#: builtin/pack-objects.c:2568 #, 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:2574 +#: builtin/pack-objects.c:2572 #, c-format msgid "bad index version '%s'" msgstr "phiên bản mục lục sai “%s”" -#: builtin/pack-objects.c:2597 +#: builtin/pack-objects.c:2595 #, c-format msgid "option %s does not accept negative form" msgstr "tùy chọn %s không chấp nhận dạng thức âm" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2599 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "không thể phân tích giá trị “%s” cho tùy chọn %s" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2619 msgid "do not show progress meter" msgstr "không hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "show progress meter" msgstr "hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 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:2628 +#: builtin/pack-objects.c:2626 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:2629 +#: builtin/pack-objects.c:2627 msgid "version[,offset]" msgstr "phiên bản[,offset]" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 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:2633 +#: builtin/pack-objects.c:2631 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:2635 +#: builtin/pack-objects.c:2633 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:2637 +#: builtin/pack-objects.c:2635 msgid "ignore packed objects" msgstr "bỏ qua các đối tượng đóng gói" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 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:2641 +#: builtin/pack-objects.c:2639 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:2643 +#: builtin/pack-objects.c:2641 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:2645 +#: builtin/pack-objects.c:2643 msgid "reuse existing deltas" msgstr "dùng lại các delta sẵn có" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing objects" msgstr "dùng lại các đối tượng sẵn có" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "use OFS_DELTA objects" msgstr "dùng các đối tượng OFS_DELTA" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 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:2653 +#: builtin/pack-objects.c:2651 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:2655 +#: builtin/pack-objects.c:2653 msgid "read revision arguments from standard input" msgstr " đọc tham số “revision” từ thiết bị nhập chuẩn" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 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:2660 +#: builtin/pack-objects.c:2658 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:2663 +#: builtin/pack-objects.c:2661 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:2666 +#: builtin/pack-objects.c:2664 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:2669 +#: builtin/pack-objects.c:2667 msgid "output pack to stdout" msgstr "xuất gói ra đầu ra tiêu chuẩn" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 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:2673 +#: builtin/pack-objects.c:2671 msgid "keep unreachable objects" msgstr "giữ lại các đối tượng không thể đọc được" -#: builtin/pack-objects.c:2674 parse-options.h:140 +#: builtin/pack-objects.c:2672 parse-options.h:139 msgid "time" msgstr "thời-gian" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 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:2678 +#: builtin/pack-objects.c:2676 msgid "create thin packs" msgstr "tạo gói nhẹ" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 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:2682 +#: builtin/pack-objects.c:2680 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:2684 +#: builtin/pack-objects.c:2682 msgid "pack compression level" msgstr "mức nén gói" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 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:2688 +#: builtin/pack-objects.c:2686 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:2690 +#: builtin/pack-objects.c:2688 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:2781 +#: builtin/pack-objects.c:2779 msgid "Counting objects" msgstr "Đang đếm các đối tượng" @@ -8071,18 +8181,56 @@ 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:106 +#: builtin/prune.c:86 +#, 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/prune.c:92 +#, 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/prune.c:97 +#, 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/prune.c:108 +#, 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/prune.c:124 +#, 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/prune.c:159 +#, c-format +msgid "failed to remove: %s" +msgstr "gặp lỗi khi gỡ bỏ: %s" + +#: builtin/prune.c:196 msgid "do not remove, show only" msgstr "không gỡ bỏ, chỉ hiển thị" -#: builtin/prune.c:107 +#: builtin/prune.c:197 msgid "report pruned objects" msgstr "báo cáo các đối tượng đã prune" -#: builtin/prune.c:110 +#: builtin/prune.c:199 +msgid "prune .git/worktrees" +msgstr "xén .git/worktrees" + +#: builtin/prune.c:201 msgid "expire objects older than <time>" msgstr "các đối tượng hết hạn cũ hơn khoảng <thời gian>" +#: builtin/prune.c:216 +msgid "--worktrees does not take extra arguments" +msgstr "--worktrees không nhận các đối số thêm" + #: builtin/push.c:14 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]" @@ -8494,12 +8642,12 @@ 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/reflog.c:429 +#: builtin/reflog.c:430 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "giá trị %s dành cho “%s” không phải là dấu vết thời gian hợp lệ" -#: builtin/reflog.c:546 builtin/reflog.c:551 +#: builtin/reflog.c:547 builtin/reflog.c:552 #, c-format msgid "'%s' is not a valid timestamp" msgstr "“%s” không phải là dấu thời gian hợp lệ" @@ -8636,12 +8784,12 @@ msgstr "đang chỉ định một nhánh master không hợp lý với tùy ch msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "chỉ định những nhánh để theo dõi chỉ hợp lý với các “fetch mirror”" -#: builtin/remote.c:187 builtin/remote.c:643 +#: builtin/remote.c:187 builtin/remote.c:640 #, c-format msgid "remote %s already exists." msgstr "máy chủ %s đã tồn tại rồi." -#: builtin/remote.c:191 builtin/remote.c:647 +#: builtin/remote.c:191 builtin/remote.c:644 #, c-format msgid "'%s' is not a valid remote name" msgstr "“%s” không phải tên máy chủ hợp lệ" @@ -8664,27 +8812,27 @@ msgstr "(khớp)" msgid "(delete)" msgstr "(xóa)" -#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604 +#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Không thể nối thêm “%s” vào “%s”" -#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895 +#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892 #, c-format msgid "No such remote: %s" msgstr "Không có máy chủ nào như thế: %s" -#: builtin/remote.c:653 +#: builtin/remote.c:650 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Không thể đổi tên phần của cấu hình từ “%s” thành “%s”" -#: builtin/remote.c:659 builtin/remote.c:847 +#: builtin/remote.c:656 builtin/remote.c:844 #, c-format msgid "Could not remove config section '%s'" msgstr "Không thể gỡ bỏ phần cấu hình “%s”" -#: builtin/remote.c:674 +#: builtin/remote.c:671 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8695,32 +8843,32 @@ msgstr "" "\t%s\n" "\tXin hãy cập nhật phần cấu hình một cách thủ công nếu thấy cần thiết." -#: builtin/remote.c:680 +#: builtin/remote.c:677 #, c-format msgid "Could not append '%s'" msgstr "Không thể nối thêm “%s”" -#: builtin/remote.c:691 +#: builtin/remote.c:688 #, c-format msgid "Could not set '%s'" msgstr "Không thể đặt “%s”" -#: builtin/remote.c:713 +#: builtin/remote.c:710 #, c-format msgid "deleting '%s' failed" msgstr "gặp lỗi khi xóa “%s”" -#: builtin/remote.c:747 +#: builtin/remote.c:744 #, c-format msgid "creating '%s' failed" msgstr "gặp lỗi khi tạo “%s”" -#: builtin/remote.c:766 +#: builtin/remote.c:763 #, c-format msgid "Could not remove branch %s" msgstr "Không thể gỡ bỏ nhánh “%s”" -#: builtin/remote.c:833 +#: builtin/remote.c:830 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8732,259 +8880,259 @@ msgstr[0] "" "đi;\n" "để xóa đi, sử dụng:" -#: builtin/remote.c:948 +#: builtin/remote.c:945 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " mới (lần lấy về tiếp theo sẽ lưu trong remotes/%s)" -#: builtin/remote.c:951 +#: builtin/remote.c:948 msgid " tracked" msgstr " được theo dõi" -#: builtin/remote.c:953 +#: builtin/remote.c:950 msgid " stale (use 'git remote prune' to remove)" msgstr " cũ rích (dùng “git remote prune” để gỡ bỏ)" -#: builtin/remote.c:955 +#: builtin/remote.c:952 msgid " ???" msgstr " ???" -#: builtin/remote.c:996 +#: builtin/remote.c:993 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge không hợp lệ; không thể cải tổ về phía > 1 nhánh" -#: builtin/remote.c:1003 +#: builtin/remote.c:1000 #, c-format msgid "rebases onto remote %s" msgstr "thực hiện rebase trên máy chủ %s" -#: builtin/remote.c:1006 +#: builtin/remote.c:1003 #, c-format msgid " merges with remote %s" msgstr " hòa trộn với máy chủ %s" -#: builtin/remote.c:1007 +#: builtin/remote.c:1004 msgid " and with remote" msgstr " và với máy chủ" -#: builtin/remote.c:1009 +#: builtin/remote.c:1006 #, c-format msgid "merges with remote %s" msgstr "hòa trộn với máy chủ %s" -#: builtin/remote.c:1010 +#: builtin/remote.c:1007 msgid " and with remote" msgstr " và với máy chủ" -#: builtin/remote.c:1056 +#: builtin/remote.c:1053 msgid "create" msgstr "tạo" -#: builtin/remote.c:1059 +#: builtin/remote.c:1056 msgid "delete" msgstr "xóa" -#: builtin/remote.c:1063 +#: builtin/remote.c:1060 msgid "up to date" msgstr "đã cập nhật" -#: builtin/remote.c:1066 +#: builtin/remote.c:1063 msgid "fast-forwardable" msgstr "có-thể-fast-forward" -#: builtin/remote.c:1069 +#: builtin/remote.c:1066 msgid "local out of date" msgstr "dữ liệu nội bộ đã cũ" -#: builtin/remote.c:1076 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s ép buộc thành %-*s (%s)" -#: builtin/remote.c:1079 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s đẩy lên thành %-*s (%s)" -#: builtin/remote.c:1083 +#: builtin/remote.c:1080 #, c-format msgid " %-*s forces to %s" msgstr " %-*s ép buộc thành %s" -#: builtin/remote.c:1086 +#: builtin/remote.c:1083 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s đẩy lên thành %s" -#: builtin/remote.c:1154 +#: builtin/remote.c:1151 msgid "do not query remotes" msgstr "không truy vấn các máy chủ" -#: builtin/remote.c:1181 +#: builtin/remote.c:1178 #, c-format msgid "* remote %s" msgstr "* máy chủ %s" -#: builtin/remote.c:1182 +#: builtin/remote.c:1179 #, c-format msgid " Fetch URL: %s" msgstr " URL để lấy về: %s" -#: builtin/remote.c:1183 builtin/remote.c:1334 +#: builtin/remote.c:1180 builtin/remote.c:1331 msgid "(no URL)" msgstr "(không có URL)" -#: builtin/remote.c:1192 builtin/remote.c:1194 +#: builtin/remote.c:1189 builtin/remote.c:1191 #, c-format msgid " Push URL: %s" msgstr " URL để đẩy lên: %s" -#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200 +#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " HEAD branch: %s" msgstr " Nhánh HEAD: %s" -#: builtin/remote.c:1202 +#: builtin/remote.c:1199 #, 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:1214 +#: builtin/remote.c:1211 #, 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:1217 builtin/remote.c:1244 +#: builtin/remote.c:1214 builtin/remote.c:1241 msgid " (status not queried)" msgstr " (trạng thái không được yêu cầu)" -#: builtin/remote.c:1226 +#: builtin/remote.c:1223 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:1234 +#: builtin/remote.c:1231 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:1241 +#: builtin/remote.c:1238 #, 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:1262 +#: builtin/remote.c:1259 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:1264 +#: builtin/remote.c:1261 msgid "delete refs/remotes/<name>/HEAD" msgstr "xóa refs/remotes/<tên>/HEAD" -#: builtin/remote.c:1279 +#: builtin/remote.c:1276 msgid "Cannot determine remote HEAD" msgstr "Không thể xác định được HEAD máy chủ" -#: builtin/remote.c:1281 +#: builtin/remote.c:1278 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:1291 +#: builtin/remote.c:1288 #, c-format msgid "Could not delete %s" msgstr "Không thể xóa bỏ %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1296 #, c-format msgid "Not a valid ref: %s" msgstr "Không phải là tham chiếu hợp lệ: %s" -#: builtin/remote.c:1301 +#: builtin/remote.c:1298 #, c-format msgid "Could not setup %s" msgstr "Không thể cài đặt %s" -#: builtin/remote.c:1319 +#: builtin/remote.c:1316 #, 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:1320 +#: builtin/remote.c:1317 #, c-format msgid " %s has become dangling!" msgstr " %s đã trở thành không đầu (không được quản lý)!" -#: builtin/remote.c:1330 +#: builtin/remote.c:1327 #, c-format msgid "Pruning %s" msgstr "Đang xén bớt %s" -#: builtin/remote.c:1331 +#: builtin/remote.c:1328 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1354 +#: builtin/remote.c:1351 #, c-format msgid " * [would prune] %s" msgstr " * [nên xén bớt] %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1354 #, c-format msgid " * [pruned] %s" msgstr " * [đã bị xén] %s" -#: builtin/remote.c:1402 +#: builtin/remote.c:1399 msgid "prune remotes after fetching" msgstr "cắt máy chủ sau khi lấy về" -#: builtin/remote.c:1468 builtin/remote.c:1542 +#: builtin/remote.c:1465 builtin/remote.c:1539 #, c-format msgid "No such remote '%s'" msgstr "Không có máy chủ nào có tên “%s”" -#: builtin/remote.c:1488 +#: builtin/remote.c:1485 msgid "add branch" msgstr "thêm nhánh" -#: builtin/remote.c:1495 +#: builtin/remote.c:1492 msgid "no remote specified" msgstr "chưa chỉ ra máy chủ nào" -#: builtin/remote.c:1517 +#: builtin/remote.c:1514 msgid "manipulate push URLs" msgstr "đẩy các “URL” bằng tay" -#: builtin/remote.c:1519 +#: builtin/remote.c:1516 msgid "add URL" msgstr "thêm URL" -#: builtin/remote.c:1521 +#: builtin/remote.c:1518 msgid "delete URLs" msgstr "xóa URLs" -#: builtin/remote.c:1528 +#: builtin/remote.c:1525 msgid "--add --delete doesn't make sense" msgstr "--add --delete không hợp lý" -#: builtin/remote.c:1568 +#: builtin/remote.c:1565 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Kiểu mẫu URL cũ không hợp lệ: %s" -#: builtin/remote.c:1576 +#: builtin/remote.c:1573 #, c-format msgid "No such URL found: %s" msgstr "Không tìm thấy URL như vậy: %s" -#: builtin/remote.c:1578 +#: builtin/remote.c:1575 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:1592 +#: builtin/remote.c:1589 msgid "be verbose; must be placed before a subcommand" msgstr "chi tiết; phải được đặt trước một lệnh-con" @@ -9056,7 +9204,7 @@ msgstr "kcíh thước tối đa cho từng tập tin gói" msgid "repack objects in packs marked with .keep" msgstr "đóng gói lại các đối tượng trong các gói đã đánh dấu bằng .keep" -#: builtin/repack.c:375 +#: builtin/repack.c:377 #, c-format msgid "removing '%s' failed" msgstr "gặp lỗi khi xóa bỏ “%s”" @@ -9432,7 +9580,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)" -#: builtin/rm.c:231 +#: builtin/rm.c:230 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -9443,7 +9591,7 @@ msgstr[0] "" "các tập tin sau đây có trạng thái khác biệt nội dung từ cả tập tin\n" "và cả HEAD:" -#: builtin/rm.c:236 +#: builtin/rm.c:235 msgid "" "\n" "(use -f to force removal)" @@ -9451,12 +9599,12 @@ msgstr "" "\n" "(dùng -f để buộc gỡ bỏ)" -#: builtin/rm.c:240 +#: builtin/rm.c:239 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "các tập tin sau đây có thay đổi trạng thái trong bảng mục lục:" -#: builtin/rm.c:244 builtin/rm.c:255 +#: builtin/rm.c:243 builtin/rm.c:254 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -9464,43 +9612,43 @@ msgstr "" "\n" "(dùng tùy chọn --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)" -#: builtin/rm.c:252 +#: builtin/rm.c:251 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "những tập tin sau đây có những thay đổi nội bộ:" -#: builtin/rm.c:270 +#: builtin/rm.c:269 msgid "do not list removed files" msgstr "không liệt kê các tập tin đã gỡ bỏ" -#: builtin/rm.c:271 +#: builtin/rm.c:270 msgid "only remove from the index" msgstr "chỉ gỡ bỏ từ mục lục" -#: builtin/rm.c:272 +#: builtin/rm.c:271 msgid "override the up-to-date check" msgstr "ghi đè lên kiểm tra cập nhật" -#: builtin/rm.c:273 +#: builtin/rm.c:272 msgid "allow recursive removal" msgstr "cho phép gỡ bỏ đệ qui" -#: builtin/rm.c:275 +#: builtin/rm.c:274 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:318 +#: 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:336 +#: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" msgstr "không thể gỡ bỏ “%s” một cách đệ qui mà không có tùy chọn -r" -#: builtin/rm.c:375 +#: builtin/rm.c:374 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: không thể gỡ bỏ %s" @@ -9550,67 +9698,67 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<nền>]] [--list] [<ref>]" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:659 msgid "show remote-tracking and local branches" msgstr "hiển thị các nhánh remote-tracking và nội bộ" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:661 msgid "show remote-tracking branches" msgstr "hiển thị các nhánh remote-tracking" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:663 msgid "color '*!+-' corresponding to the branch" msgstr "màu “*!+-” tương ứng với nhánh" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:665 msgid "show <n> more commits after the common ancestor" msgstr "hiển thị thêm <n> lần chuyển giao sau cha mẹ chung" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:667 msgid "synonym to more=-1" msgstr "đồng nghĩa với more=-1" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:668 msgid "suppress naming strings" msgstr "chặn các chuỗi đặt tên" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:670 msgid "include the current branch" msgstr "bao gồm nhánh hiện hành" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:672 msgid "name commits with their object names" msgstr "đặt tên các lần chuyển giao bằng các tên của đối tượng của chúng" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:674 msgid "show possible merge bases" msgstr "hiển thị mọi cơ sở có thể dùng để hòa trộn" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:676 msgid "show refs unreachable from any other ref" msgstr "hiển thị các tham chiếu không thể được đọc bởi bất kỳ tham chiếu khác" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:678 msgid "show commits in topological order" msgstr "hiển thị các lần chuyển giao theo thứ tự tôpô" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:681 msgid "show only commits not on the first branch" msgstr "chỉ hiển thị các lần chuyển giao không nằm trên nhánh đầu tiên" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:683 msgid "show merges reachable from only one tip" msgstr "hiển thị các lần hòa trộn có thể đọc được chỉ từ một đầu mút" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:685 msgid "topologically sort, maintaining date order where possible" msgstr "sắp xếp hình thái học, bảo trì thứ tự ngày nếu có thể" -#: builtin/show-branch.c:681 +#: builtin/show-branch.c:688 msgid "<n>[,<base>]" msgstr "<n>[,<cơ_sở>]" -#: builtin/show-branch.c:682 +#: builtin/show-branch.c:689 msgid "show <n> most recent ref-log entries starting at base" msgstr "hiển thị <n> các mục “ref-log” gần nhất kể từ nền (base)" @@ -9619,44 +9767,44 @@ 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] [--] [<mẫu>…] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mẫu>…] " #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "git show-ref --exclude-existing[=mẫu] < ref-list" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:170 msgid "only show tags (can be combined with heads)" msgstr "chỉ hiển thị thẻ (có thể tổ hợp cùng với đầu)" -#: builtin/show-ref.c:169 +#: builtin/show-ref.c:171 msgid "only show heads (can be combined with tags)" msgstr "chỉ hiển thị đầu (có thể tổ hợp cùng với thẻ)" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:172 msgid "stricter reference checking, requires exact ref path" msgstr "" "việc kiểm tra tham chiếu chính xác, đòi hỏi chính xác đường dẫn tham chiếu" -#: builtin/show-ref.c:173 builtin/show-ref.c:175 +#: builtin/show-ref.c:175 builtin/show-ref.c:177 msgid "show the HEAD reference, even if it would be filtered out" msgstr "hiển thị tham chiếu HEAD, ngay cả khi nó đã được lọc ra" -#: builtin/show-ref.c:177 +#: builtin/show-ref.c:179 msgid "dereference tags into object IDs" msgstr "bãi bỏ tham chiếu các thẻ thành ra các ID đối tượng" -#: builtin/show-ref.c:179 +#: builtin/show-ref.c:181 msgid "only show SHA1 hash using <n> digits" msgstr "chỉ hiển thị mã băm SHA1 sử dụng <n> chữ số" -#: builtin/show-ref.c:183 +#: builtin/show-ref.c:185 msgid "do not print results to stdout (useful with --verify)" msgstr "" "không hiển thị kết quả ra đầu ra chuẩn (stdout) (chỉ hữu dụng với --verify)" -#: builtin/show-ref.c:185 +#: builtin/show-ref.c:187 msgid "show refs from stdin that aren't in local repository" msgstr "" "hiển thị các tham chiếu từ đầu vào tiêu chuẩn (stdin) cái mà không ở kho nội " @@ -9919,126 +10067,194 @@ msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n" msgid "Unpacking objects" msgstr "Đang giải nén các đối tượng" -#: builtin/update-index.c:403 +#: builtin/update-index.c:70 +#, c-format +msgid "failed to create directory %s" +msgstr "tạo thư mục \"%s\" gặp lỗi" + +#: builtin/update-index.c:76 +#, c-format +msgid "failed to stat %s" +msgstr "gặp lỗi khi lấy thông tin thống kê về %s" + +#: builtin/update-index.c:86 +#, c-format +msgid "failed to create file %s" +msgstr "gặp lỗi khi tạo tập tin %s" + +#: builtin/update-index.c:94 +#, c-format +msgid "failed to delete file %s" +msgstr "gặp lỗi khi xóa tập tin %s" + +#: builtin/update-index.c:101 builtin/update-index.c:203 +#, c-format +msgid "failed to delete directory %s" +msgstr "gặp lỗi khi xóa thư mục %s" + +#: builtin/update-index.c:124 +#, c-format +msgid "Testing " +msgstr "Đang thử" + +#: builtin/update-index.c:136 +msgid "directory stat info does not change after adding a new file" +msgstr "thông tin thống kê thư mục không thay đổi sau khi thêm tập tin mới" + +#: builtin/update-index.c:149 +msgid "directory stat info does not change after adding a new directory" +msgstr "thông tin thống kê thư mục không thay đổi sau khi thêm thư mục mới" + +#: builtin/update-index.c:162 +msgid "directory stat info changes after updating a file" +msgstr "thông tin thống kê thư mục thay đổi sau khi cập nhật tập tin" + +#: builtin/update-index.c:173 +msgid "directory stat info changes after adding a file inside subdirectory" +msgstr "" +"thông tin thống kê thư mục thay đổi sau khi thêm tập tin mới vào trong thư " +"mục con" + +#: builtin/update-index.c:184 +msgid "directory stat info does not change after deleting a file" +msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa tập tin" + +#: builtin/update-index.c:197 +msgid "directory stat info does not change after deleting a directory" +msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa thư mục" + +#: builtin/update-index.c:204 +msgid " OK" +msgstr " Đồng ý" + +#: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<các-tùy-chọn>] [--] [<tập-tin>…]" -#: builtin/update-index.c:757 +#: builtin/update-index.c:918 msgid "continue refresh even when index needs update" msgstr "tiếp tục làm mới ngay cả khi bảng mục lục cần được cập nhật" -#: builtin/update-index.c:760 +#: builtin/update-index.c:921 msgid "refresh: ignore submodules" msgstr "refresh: lờ đi mô-đun-con" -#: builtin/update-index.c:763 +#: builtin/update-index.c:924 msgid "do not ignore new files" msgstr "không bỏ qua các tập tin mới tạo" -#: builtin/update-index.c:765 +#: builtin/update-index.c:926 msgid "let files replace directories and vice-versa" msgstr "để các tập tin thay thế các thư mục và “vice-versa”" -#: builtin/update-index.c:767 +#: builtin/update-index.c:928 msgid "notice files missing from worktree" msgstr "thông báo các tập-tin thiếu trong thư-mục làm việc" -#: builtin/update-index.c:769 +#: builtin/update-index.c:930 msgid "refresh even if index contains unmerged entries" msgstr "" "làm tươi mới thậm chí khi bảng mục lục chứa các mục tin chưa được hòa trộn" -#: builtin/update-index.c:772 +#: builtin/update-index.c:933 msgid "refresh stat information" msgstr "lấy lại thông tin thống kê" -#: builtin/update-index.c:776 +#: builtin/update-index.c:937 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "giống --refresh, nhưng bỏ qua các cài đặt “assume-unchanged”" -#: builtin/update-index.c:780 +#: builtin/update-index.c:941 msgid "<mode>,<object>,<path>" msgstr "<chế_độ>,<đối_tượng>,<đường_dẫn>" -#: builtin/update-index.c:781 +#: builtin/update-index.c:942 msgid "add the specified entry to the index" msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục" -#: builtin/update-index.c:785 +#: builtin/update-index.c:946 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:786 +#: builtin/update-index.c:947 msgid "override the executable bit of the listed files" msgstr "ghi đè lên bít thi hành của các tập tin được liệt kê" -#: builtin/update-index.c:790 +#: builtin/update-index.c:951 msgid "mark files as \"not changing\"" msgstr "Đánh dấu các tập tin là \"không thay đổi\"" -#: builtin/update-index.c:793 +#: builtin/update-index.c:954 msgid "clear assumed-unchanged bit" msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)" -#: builtin/update-index.c:796 +#: builtin/update-index.c:957 msgid "mark files as \"index-only\"" msgstr "đánh dấu các tập tin là “chỉ-đọc”" -#: builtin/update-index.c:799 +#: builtin/update-index.c:960 msgid "clear skip-worktree bit" msgstr "xóa bít skip-worktree" -#: builtin/update-index.c:802 +#: builtin/update-index.c:963 msgid "add to index only; do not add content to object database" msgstr "" "chỉ thêm vào bảng mục lục; không thêm nội dung vào cơ sở dữ liệu đối tượng" -#: builtin/update-index.c:804 +#: builtin/update-index.c:965 msgid "remove named paths even if present in worktree" msgstr "" "gỡ bỏ các đường dẫn được đặt tên thậm chí cả khi nó hiện diện trong thư mục " "làm việc" -#: builtin/update-index.c:806 +#: builtin/update-index.c:967 msgid "with --stdin: input lines are terminated by null bytes" msgstr "với tùy chọn --stdin: các dòng đầu vào được chấm dứt bởi ký tự null" -#: builtin/update-index.c:808 +#: builtin/update-index.c:969 msgid "read list of paths to be updated from standard input" msgstr "đọc danh sách đường dẫn cần cập nhật từ đầu vào tiêu chuẩn" -#: builtin/update-index.c:812 +#: builtin/update-index.c:973 msgid "add entries from standard input to the index" msgstr "không thể đọc các mục từ đầu vào tiêu chuẩn vào bảng mục lục" -#: builtin/update-index.c:816 +#: builtin/update-index.c:977 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "phục hồi các trạng thái #2 và #3 cho các đường dẫn được liệt kê" -#: builtin/update-index.c:820 +#: builtin/update-index.c:981 msgid "only update entries that differ from HEAD" msgstr "chỉ cập nhật các mục tin mà nó khác biệt so với HEAD" -#: builtin/update-index.c:824 +#: builtin/update-index.c:985 msgid "ignore files missing from worktree" msgstr "bỏ qua các tập-tin thiếu trong thư-mục làm việc" -#: builtin/update-index.c:827 +#: builtin/update-index.c:988 msgid "report actions to standard output" msgstr "báo cáo các thao tác ra thiết bị xuất chuẩn" -#: builtin/update-index.c:829 +#: builtin/update-index.c:990 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(cho “porcelains”) quên các xung đột chưa được giải quyết đã ghi" -#: builtin/update-index.c:833 +#: builtin/update-index.c:994 msgid "write index in this format" msgstr "ghi mục lục ở định dạng này" -#: builtin/update-index.c:835 +#: builtin/update-index.c:996 msgid "enable or disable split index" msgstr "bật/tắt chia cắt bảng mục lục" +#: builtin/update-index.c:998 +msgid "enable/disable untracked cache" +msgstr "bật/tắt bộ đệm không theo vết" + +#: builtin/update-index.c:1000 +msgid "enable untracked cache without testing the filesystem" +msgstr "bật bộ đệm không theo vết mà không kiểm tra hệ thống tập tin" + #: builtin/update-ref.c:9 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<các-tùy-chọn>] -d <refname> [<biến-cũ>]" @@ -10133,111 +10349,131 @@ 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ể." -#: common-cmds.h:8 +#: common-cmds.h:10 +msgid "start a working area (see also: git help tutorial)" +msgstr "bắt đâù một vùng làm việc (xem thêm: git help tutorial)" + +#: common-cmds.h:11 +msgid "work on the current change (see also: git help everyday)" +msgstr "làm việc trên thay đổi hiện tại (xem thêm: git help everyday)" + +#: common-cmds.h:12 +msgid "examine the history and state (see also: git help revisions)" +msgstr "xem xét lịch sử tình trạng (xem thêm: git help revisions)" + +#: common-cmds.h:13 +msgid "grow, mark and tweak your common history" +msgstr "thêm, ghi dấu và chỉnh lịch sử chung của bạn" + +#: common-cmds.h:14 +msgid "collaborate (see also: git help workflows)" +msgstr "làm việc nhóm (xem thêm: git help workflows)" + +#: common-cmds.h:18 msgid "Add file contents to the index" msgstr "Thêm nội dung tập tin vào bảng mục lục" -#: common-cmds.h:9 +#: common-cmds.h:19 msgid "Find by binary search the change that introduced a bug" msgstr "Tìm kiếm bằng điều tra nhị phân các thay đổi mà nó bắt đầu lỗi" -#: common-cmds.h:10 +#: common-cmds.h:20 msgid "List, create, or delete branches" msgstr "Liệt kê, tạo hay là xóa các nhánh" -#: common-cmds.h:11 +#: common-cmds.h:21 msgid "Checkout a branch or paths to the working tree" msgstr "Lấy ra một nhánh hay các đường dẫn tới cây làm việc" -#: common-cmds.h:12 +#: common-cmds.h:22 msgid "Clone a repository into a new directory" msgstr "Nhân bản một kho chứa đến một thư mục mới" -#: common-cmds.h:13 +#: common-cmds.h:23 msgid "Record changes to the repository" msgstr "Ghi các thay đổi vào kho chứa" -#: common-cmds.h:14 +#: common-cmds.h:24 msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Xem các thay đổi giữa những lần chuyển giao,\n" " giữa một lần chuyển giao và cây làm việc, v.v.." -#: common-cmds.h:15 +#: common-cmds.h:25 msgid "Download objects and refs from another repository" msgstr "Tải về các đối tượng và tham chiếu từ kho chứa khác" -#: common-cmds.h:16 +#: common-cmds.h:26 msgid "Print lines matching a pattern" msgstr "In ra những dòng khớp với một mẫu" -#: common-cmds.h:17 +#: common-cmds.h:27 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Tạo một kho git mới hay khởi tạo lại một kho đã tồn tại từ trước" -#: common-cmds.h:18 +#: common-cmds.h:28 msgid "Show commit logs" msgstr "Hiển thị nhật ký các lần chuyển giao" -#: common-cmds.h:19 +#: common-cmds.h:29 msgid "Join two or more development histories together" msgstr "Hợp nhất hai hay nhiều hơn lịch sử của các nhà phát triển" -#: common-cmds.h:20 +#: common-cmds.h:30 msgid "Move or rename a file, a directory, or a symlink" msgstr "Di chuyển hay đổi tên một tập tin, thư mục hoặc liên kết mềm" -#: common-cmds.h:21 +#: common-cmds.h:31 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Lấy về và hợp nhất với kho khác hay một nhánh nội bộ" -#: common-cmds.h:22 +#: common-cmds.h:32 msgid "Update remote refs along with associated objects" msgstr "Cập nhật th.chiếu máy chủ cùng với các đối tượng liên quan đến nó" -#: common-cmds.h:23 +#: common-cmds.h:33 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ộ\n" " tới head thượng nguồn đã cập nhật" -#: common-cmds.h:24 +#: common-cmds.h:34 msgid "Reset current HEAD to the specified state" msgstr "Đặt lại HEAD hiện hành thành trạng thái đã cho" -#: common-cmds.h:25 +#: common-cmds.h:35 msgid "Remove files from the working tree and from the index" msgstr "Gỡ bỏ các tập tin từ cây làm việc và từ bảng mục lục" -#: common-cmds.h:26 +#: common-cmds.h:36 msgid "Show various types of objects" msgstr "Hiển thị các kiểu khác nhau của các đối tượng" -#: common-cmds.h:27 +#: common-cmds.h:37 msgid "Show the working tree status" msgstr "Hiển thị trạng thái cây làm việc" -#: common-cmds.h:28 +#: common-cmds.h:38 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Tạo, liệt kê, xóa hay xác thực một đối tượng thẻ được ký bằng GPG" -#: parse-options.h:143 +#: parse-options.h:142 msgid "expiry-date" msgstr "ngày hết hạn" -#: parse-options.h:158 +#: parse-options.h:157 msgid "no-op (backward compatibility)" msgstr "no-op (tương thích ngược)" -#: parse-options.h:232 +#: parse-options.h:231 msgid "be more verbose" msgstr "chi tiết hơn nữa" -#: parse-options.h:234 +#: parse-options.h:233 msgid "be more quiet" msgstr "im lặng hơn nữa" -#: parse-options.h:240 +#: parse-options.h:239 msgid "use <n> digits to display SHA-1s" msgstr "sử dụng <n> chữ số để hiển thị SHA-1s" @@ -10249,7 +10485,7 @@ msgstr "cập nhật bảng mục lục với phân giải xung đột dùng l msgid "You need to set your committer info first" msgstr "Bạn cần đặt thông tin về người chuyển giao mã nguồn trước đã" -#: git-am.sh:98 +#: git-am.sh:100 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10257,7 +10493,7 @@ 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" -#: git-am.sh:108 +#: git-am.sh:110 #, sh-format msgid "" "When you have resolved this problem, run \"$cmdline --continue\".\n" @@ -10270,20 +10506,20 @@ 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 " "\"$cmdline --abort\"." -#: git-am.sh:124 +#: git-am.sh:126 msgid "Cannot fall back to three-way merge." msgstr "Đang trở lại để hòa trộn kiểu “three-way”." -#: git-am.sh:140 +#: git-am.sh:142 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”." -#: git-am.sh:142 +#: git-am.sh:144 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ở…" -#: git-am.sh:157 +#: git-am.sh:159 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10291,28 +10527,28 @@ 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ó." -#: git-am.sh:166 +#: git-am.sh:168 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”…" -#: git-am.sh:182 +#: git-am.sh:185 msgid "Failed to merge in the changes." msgstr "Gặp lỗi khi trộn vào các thay đổi." -#: git-am.sh:277 +#: git-am.sh:280 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" -#: git-am.sh:364 +#: git-am.sh:367 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "Định dạng miếng vá $patch_format không được hỗ trợ." -#: git-am.sh:366 +#: git-am.sh:369 msgid "Patch format detection failed." msgstr "Dò tìm định dạng miếng vá gặp lỗi." -#: git-am.sh:398 +#: git-am.sh:407 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." @@ -10320,16 +10556,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." -#: git-am.sh:496 +#: git-am.sh:507 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "thư mục rebase trước $dotest vẫn chưa sẵn sàng nhưng mbox được đưa ra." -#: git-am.sh:501 +#: git-am.sh:512 msgid "Please make up your mind. --skip or --abort?" msgstr "Xin hãy rõ ràng. --skip hay --abort?" -#: git-am.sh:537 +#: git-am.sh:560 #, sh-format msgid "" "Stray $dotest directory found.\n" @@ -10338,16 +10574,16 @@ msgstr "" "Tìm thấy thư mục lạc $dotest.\n" "Dùng \"git am --abort\" để loại bỏ nó đi." -#: git-am.sh:545 +#: git-am.sh:568 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." -#: git-am.sh:612 +#: git-am.sh:635 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "Bảng mục lục sai: không thể áp dụng các miếng vá (sai: $files)" -#: git-am.sh:722 +#: git-am.sh:747 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -10360,34 +10596,34 @@ msgstr "" "Để phục hồi lại nhánh nguyên thủy và dừng vá lại hãy chạy lệnh \"$cmdline --" "abort\"." -#: git-am.sh:749 +#: git-am.sh:774 msgid "Patch does not have a valid e-mail address." msgstr "Miếng vá không có địa chỉ thư điện tử hợp lệ." -#: git-am.sh:796 +#: git-am.sh:821 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" -#: git-am.sh:800 +#: git-am.sh:825 msgid "Commit Body is:" msgstr "Thân của lần chuyển giao là:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:807 +#: git-am.sh:832 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]á/đồng ý tất cả " "[a] " -#: git-am.sh:843 +#: git-am.sh:868 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Đang áp dụng (miếng vá): $FIRSTLINE" -#: git-am.sh:864 +#: git-am.sh:889 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10398,7 +10634,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." -#: git-am.sh:872 +#: git-am.sh:897 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" @@ -10406,16 +10642,16 @@ 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” à?" -#: git-am.sh:888 +#: git-am.sh:913 msgid "No changes -- Patch already applied." msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi." -#: git-am.sh:898 +#: git-am.sh:923 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Gặp lỗi khi vá tại $msgnum $FIRSTLINE" -#: git-am.sh:901 +#: git-am.sh:926 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" @@ -10424,7 +10660,7 @@ msgstr "" "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong:\n" " $dotest/patch" -#: git-am.sh:919 +#: git-am.sh:945 msgid "applying to an empty history" msgstr "áp dụng vào một lịch sử trống rỗng" @@ -10584,7 +10820,7 @@ msgstr "" msgid "bisect run success" msgstr "bisect chạy thành công" -#: git-pull.sh:21 +#: git-pull.sh:61 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" @@ -10595,12 +10831,12 @@ msgstr "" "để phê chuẩn việc đánh dấu đây cần được giải quyết và tạo một lần chuyển " "giao." -#: git-pull.sh:25 +#: git-pull.sh:65 msgid "Pull is not possible because you have unmerged files." msgstr "" "Full là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn." -#: git-pull.sh:31 +#: git-pull.sh:71 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -10608,13 +10844,13 @@ msgstr "" "Bạn chưa kết thúc việc hòa trộng (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." -#: git-pull.sh:245 +#: git-pull.sh:285 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" -#: git-pull.sh:269 +#: git-pull.sh:311 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -10625,11 +10861,11 @@ msgstr "" "Cảnh báo: đang fast-forward cây làm việc của bạn từ\n" "Cảnh báo: commit $orig_head." -#: git-pull.sh:294 +#: git-pull.sh:336 msgid "Cannot merge multiple branches into empty head" msgstr "Không thể hòa trộn nhiều nhánh và trong một head trống rỗng" -#: git-pull.sh:298 +#: git-pull.sh:340 msgid "Cannot rebase onto multiple branches" msgstr "Không thể thực hiện lệnh rebase (cơ cấu lại) trên nhiều nhánh" @@ -10836,7 +11072,7 @@ msgstr "Không thể cập nhật $ref_stash với $w_commit" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:238 +#: git-stash.sh:241 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -10846,85 +11082,90 @@ msgstr "" " Để có thể dùng lời chú thích có chứa -- ở đầu,\n" " dùng git stash save -- \"$option\"" -#: git-stash.sh:259 +#: git-stash.sh:262 msgid "No local changes to save" msgstr "Không có thay đổi nội bộ nào được ghi lại" -#: git-stash.sh:263 +#: git-stash.sh:266 msgid "Cannot initialize stash" msgstr "Không thể khởi tạo stash" -#: git-stash.sh:267 +#: git-stash.sh:270 msgid "Cannot save the current status" msgstr "Không thể ghi lại trạng thái hiện hành" -#: git-stash.sh:285 +#: git-stash.sh:288 msgid "Cannot remove worktree changes" msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc" -#: git-stash.sh:384 +#: git-stash.sh:389 +#, sh-format +msgid "unknown option: $opt" +msgstr "không hiểu tùy chọn: $opt" + +#: git-stash.sh:399 msgid "No stash found." msgstr "Không tìm thấy lần chuyển giao cất đi (stash) nào." -#: git-stash.sh:391 +#: git-stash.sh:406 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Chỉ ra quá nhiều điểm xét duyệt: $REV" -#: git-stash.sh:397 +#: git-stash.sh:412 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference không phải là tham chiếu hợp lệ" -#: git-stash.sh:425 +#: git-stash.sh:440 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "“$args” không phải là lần chuyển giao kiểu-stash (cất đi)" -#: git-stash.sh:436 +#: git-stash.sh:451 #, sh-format msgid "'$args' is not a stash reference" msgstr "”$args” không phải tham chiếu đến stash" -#: git-stash.sh:444 +#: git-stash.sh:459 msgid "unable to refresh index" msgstr "không thể làm tươi mới bảng mục lục" -#: git-stash.sh:448 +#: git-stash.sh:463 msgid "Cannot apply a stash in the middle of a merge" msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn" -#: git-stash.sh:456 +#: git-stash.sh:471 msgid "Conflicts in index. Try without --index." msgstr "Xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index." -#: git-stash.sh:458 +#: git-stash.sh:473 msgid "Could not save index tree" msgstr "Không thể ghi lại cây chỉ mục" -#: git-stash.sh:492 +#: git-stash.sh:507 msgid "Cannot unstage modified files" msgstr "Không thể bỏ ra khỏi bệ phóng các tập tin đã được sửa chữa" -#: git-stash.sh:507 +#: git-stash.sh:522 msgid "Index was not unstashed." msgstr "Bảng mục lục đã không được bỏ stash." -#: git-stash.sh:530 +#: git-stash.sh:545 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Đã xóa ${REV} ($s)" -#: git-stash.sh:531 +#: git-stash.sh:546 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Không thể xóa bỏ mục stash" -#: git-stash.sh:539 +#: git-stash.sh:554 msgid "No branch name specified" msgstr "Chưa chỉ ra tên của nhánh" -#: git-stash.sh:611 +#: git-stash.sh:626 msgid "(To restore them type \"git stash apply\")" msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")" @@ -11234,6 +11475,18 @@ msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$sm msgid "Synchronizing submodule url for '$displaypath'" msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”" +#~ msgid "The most commonly used git commands are:" +#~ msgstr "Những lệnh git hay được dùng nhất là:" + +#~ msgid "No such branch: '%s'" +#~ msgstr "Không có nhánh nào như thế: “%s”" + +#~ msgid "Could not create git link %s" +#~ msgstr "Không thể tạo liên kết git “%s”" + +#~ msgid "Invalid gc.pruneexpire: '%s'" +#~ msgstr "gc.pruneexpire không hợp lệ: “%s”" + #~ msgid "server does not support --atomic push" #~ msgstr "máy phục vụ không hỗ trợ đẩy lên --atomic" @@ -11282,9 +11535,6 @@ msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”" #~ msgid "cannot update HEAD ref" #~ msgstr "không thể cập nhật ref (tham chiếu) HEAD" -#~ msgid "Invalid %s: '%s'" -#~ msgstr "%s không hợp lệ: “%s”" - #~ msgid "Failed to chdir: %s" #~ msgstr "Gặp lỗi với lệnh chdir: %s" diff --git a/po/zh_CN.po b/po/zh_CN.po index dd2948c322..ba8f7e0344 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,10 +12,10 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-04-03 08:13+0800\n" -"PO-Revision-Date: 2015-04-03 08:35+0800\n" +"POT-Creation-Date: 2015-06-27 19:17+0800\n" +"PO-Revision-Date: 2015-07-05 23:12+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" -"Language-Team: GitHub <https://github.com/gotgit/git/>\n" +"Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,7 +53,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <版本库> [--exec <命令>] --list" -#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规则 '%s' 未匹配任何文件" @@ -76,9 +76,9 @@ msgstr "为归档中每个路径名加上前缀" #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150 msgid "file" msgstr "文件" @@ -110,7 +110,7 @@ msgstr "压缩效果更好" msgid "list supported archive formats" msgstr "列出支持的归档格式" -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77 msgid "repo" msgstr "版本库" @@ -126,7 +126,7 @@ msgstr "命令" msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" -#: attr.c:264 +#: attr.c:265 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -261,8 +261,8 @@ msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的提交：" #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 -#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 +#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330 +#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "版本遍历设置失败" @@ -509,16 +509,16 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:2956 +#: diff.c:2997 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" -#: diff.c:3351 +#: diff.c:3393 msgid "--follow requires exactly one pathspec" msgstr "--follow 参数后只跟一个 pathspec" -#: diff.c:3514 +#: diff.c:3556 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -527,11 +527,19 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:3528 +#: diff.c:3570 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" +#: dir.c:1852 +msgid "failed to get kernel name and information" +msgstr "无法获得内核名称和信息" + +#: dir.c:1945 +msgid "Untracked cache is disabled on this system." +msgstr "缓存未跟踪文件在本系统被禁用" + #: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "不能执行 gpg。" @@ -578,11 +586,11 @@ msgstr "在 '%s' 下可用的 git 命令" msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" -#: help.c:230 -msgid "The most commonly used git commands are:" -msgstr "最常用的 git 命令有：" +#: help.c:246 +msgid "These are common Git commands used in various situations:" +msgstr "这些是各种场合常见的 Git 命令：" -#: help.c:289 +#: help.c:311 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -591,11 +599,11 @@ msgstr "" "'%s' 像是一个 git 命令，但却无法运行。\n" "可能是 git-%s 受损？" -#: help.c:346 +#: help.c:368 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" -#: help.c:368 +#: help.c:390 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -604,17 +612,17 @@ msgstr "" "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" "是 '%s'" -#: help.c:373 +#: help.c:395 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟后自动运行..." -#: help.c:380 +#: help.c:402 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:384 help.c:444 +#: help.c:406 help.c:466 msgid "" "\n" "Did you mean this?" @@ -628,16 +636,16 @@ msgstr[1] "" "\n" "您指的是这其中的某一个么？" -#: help.c:440 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s：%s - %s" -#: lockfile.c:283 +#: lockfile.c:345 msgid "BUG: reopen a lockfile that is still open" msgstr "BUG: 重新打开一个仍打开着的锁文件" -#: lockfile.c:285 +#: lockfile.c:347 msgid "BUG: reopen a lockfile that has been committed" msgstr "BUG: 重新打开一个已提交的锁文件" @@ -645,8 +653,8 @@ msgstr "BUG: 重新打开一个已提交的锁文件" msgid "failed to read the cache" msgstr "无法读取缓存" -#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580 -#: builtin/clone.c:662 +#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594 +#: builtin/clone.c:654 msgid "unable to write new index file" msgstr "无法写新的索引文件" @@ -664,64 +672,64 @@ msgstr "为路径 '%s' addinfo_cache 失败" msgid "error building trees" msgstr "无法创建树" -#: merge-recursive.c:688 +#: merge-recursive.c:687 #, c-format msgid "failed to create path '%s'%s" msgstr "无法创建路径 '%s'%s" -#: merge-recursive.c:699 +#: merge-recursive.c:698 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" -#: merge-recursive.c:713 merge-recursive.c:734 +#: merge-recursive.c:712 merge-recursive.c:733 msgid ": perhaps a D/F conflict?" msgstr "：可能是一个目录/文件冲突？" -#: merge-recursive.c:724 +#: merge-recursive.c:723 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" -#: merge-recursive.c:764 +#: merge-recursive.c:763 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" -#: merge-recursive.c:766 +#: merge-recursive.c:765 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据（blob）对象" -#: merge-recursive.c:789 builtin/clone.c:321 +#: merge-recursive.c:788 builtin/clone.c:313 #, c-format msgid "failed to open '%s'" msgstr "无法打开 '%s'" -#: merge-recursive.c:797 +#: merge-recursive.c:796 #, c-format msgid "failed to symlink '%s'" msgstr "无法创建符号链接 '%s'" -#: merge-recursive.c:800 +#: merge-recursive.c:799 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:938 +#: merge-recursive.c:937 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" -#: merge-recursive.c:942 +#: merge-recursive.c:941 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" -#: merge-recursive.c:958 +#: merge-recursive.c:957 msgid "unsupported object type in the tree" msgstr "在树中有不支持的对象类型" -#: merge-recursive.c:1033 merge-recursive.c:1047 +#: merge-recursive.c:1032 merge-recursive.c:1046 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -730,7 +738,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本被保留。" -#: merge-recursive.c:1039 merge-recursive.c:1052 +#: merge-recursive.c:1038 merge-recursive.c:1051 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -739,20 +747,20 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本保留于 %8$s 中。" -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "rename" msgstr "重命名" -#: merge-recursive.c:1093 +#: merge-recursive.c:1092 msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1149 +#: merge-recursive.c:1148 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" -#: merge-recursive.c:1171 +#: merge-recursive.c:1170 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -761,144 +769,144 @@ msgstr "" "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1176 +#: merge-recursive.c:1175 msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1230 +#: merge-recursive.c:1229 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->" "%5$s" -#: merge-recursive.c:1260 +#: merge-recursive.c:1259 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是重命名 %s 至 %s，以及 %s 至 %s" -#: merge-recursive.c:1459 +#: merge-recursive.c:1458 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" -#: merge-recursive.c:1469 +#: merge-recursive.c:1468 #, c-format msgid "Adding merged %s" msgstr "添加合并后的 %s" -#: merge-recursive.c:1474 merge-recursive.c:1672 +#: merge-recursive.c:1473 merge-recursive.c:1671 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" -#: merge-recursive.c:1525 +#: merge-recursive.c:1524 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" -#: merge-recursive.c:1528 +#: merge-recursive.c:1527 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个数据（blob）对象" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modify" msgstr "修改" -#: merge-recursive.c:1576 +#: merge-recursive.c:1575 msgid "modified" msgstr "修改" -#: merge-recursive.c:1586 +#: merge-recursive.c:1585 msgid "content" msgstr "内容" -#: merge-recursive.c:1593 +#: merge-recursive.c:1592 msgid "add/add" msgstr "添加/添加" -#: merge-recursive.c:1627 +#: merge-recursive.c:1626 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:1641 +#: merge-recursive.c:1640 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-recursive.c:1645 git-submodule.sh:1150 +#: merge-recursive.c:1644 git-submodule.sh:1150 msgid "submodule" msgstr "子模组" -#: merge-recursive.c:1646 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" -#: merge-recursive.c:1732 +#: merge-recursive.c:1731 #, c-format msgid "Removing %s" msgstr "删除 %s" -#: merge-recursive.c:1757 +#: merge-recursive.c:1756 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:1763 +#: merge-recursive.c:1762 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:1768 +#: merge-recursive.c:1767 #, c-format 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:1778 +#: merge-recursive.c:1777 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:1795 +#: merge-recursive.c:1794 msgid "Fatal merge failure, shouldn't happen." msgstr "严重的合并错误，不应发生。" -#: merge-recursive.c:1814 +#: merge-recursive.c:1813 msgid "Already up-to-date!" msgstr "已经是最新的！" -#: merge-recursive.c:1823 +#: merge-recursive.c:1822 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:1853 +#: merge-recursive.c:1852 #, c-format msgid "Unprocessed path??? %s" msgstr "未处理的路径??? %s" -#: merge-recursive.c:1901 +#: merge-recursive.c:1900 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:1914 +#: merge-recursive.c:1913 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:1951 +#: merge-recursive.c:1950 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:2008 +#: merge-recursive.c:2007 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:2019 builtin/merge.c:667 +#: merge-recursive.c:2018 builtin/merge.c:645 msgid "Unable to write index." msgstr "不能写入索引。" @@ -923,7 +931,7 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" -#: object.c:241 +#: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "不能解析对象：%s" @@ -1020,11 +1028,11 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" -#: progress.c:225 +#: progress.c:236 msgid "done" msgstr "完成" -#: read-cache.c:1275 +#: read-cache.c:1295 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1033,7 +1041,7 @@ msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1285 +#: read-cache.c:1305 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1042,51 +1050,93 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" -#: remote.c:782 +#: remote.c:792 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同时获取 %s 和 %s 至 %s" -#: remote.c:786 +#: remote.c:796 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %s，而非 %s" -#: remote.c:790 +#: remote.c:800 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同时跟踪 %s 和 %s" -#: remote.c:798 +#: remote.c:808 msgid "Internal error" msgstr "内部错误" -#: remote.c:1980 +#: remote.c:1723 remote.c:1766 +msgid "HEAD does not point to a branch" +msgstr "HEAD 没有指向一个分支" + +#: remote.c:1732 +#, c-format +msgid "no such branch: '%s'" +msgstr "没有此分支：'%s'" + +#: remote.c:1735 +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "尚未给分支 '%s' 设置上游" + +#: remote.c:1741 +#, c-format +msgid "upstream branch '%s' not stored as a remote-tracking branch" +msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" + +#: remote.c:1756 +#, c-format +msgid "push destination '%s' on remote '%s' has no local tracking branch" +msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" + +#: remote.c:1771 +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "分支 '%s' 没有设置要推送的远程服务器" + +#: remote.c:1782 +#, c-format +msgid "push refspecs for '%s' do not include '%s'" +msgstr "向 '%s' 推送引用表达式未包含 '%s'" + +#: remote.c:1795 +msgid "push has no destination (push.default is 'nothing')" +msgstr "推送无目标（push.default 是 'nothing'）" + +#: remote.c:1817 +msgid "cannot resolve 'simple' push to a single destination" +msgstr "无法解析 'simple' 推送至一个单独的目标" + +#: remote.c:2124 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n" -#: remote.c:1984 +#: remote.c:2128 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n" -#: remote.c:1987 +#: remote.c:2131 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" -#: remote.c:1991 +#: remote.c:2135 #, 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:1997 +#: remote.c:2141 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 来发布您的本地提交）\n" -#: remote.c:2000 +#: remote.c:2144 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1095,11 +1145,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" # 译者：注意保持前导空格 -#: remote.c:2008 +#: remote.c:2152 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" -#: remote.c:2011 +#: remote.c:2155 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1115,11 +1165,11 @@ msgstr[1] "" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者：注意保持前导空格 -#: remote.c:2021 +#: remote.c:2165 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" -#: revision.c:2348 +#: revision.c:2366 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 与 --bisect 不兼容" @@ -1136,22 +1186,22 @@ msgstr "不能调用 dup2(%d,%d)" msgid "failed to sign the push certificate" msgstr "无法为推送证书签名" -#: send-pack.c:356 +#: send-pack.c:378 msgid "the receiving end does not support --signed push" msgstr "接收端不支持签名推送" -#: send-pack.c:366 +#: send-pack.c:389 msgid "the receiving end does not support --atomic push" msgstr "接收端不支持原子推送" -#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 -#: builtin/merge.c:1005 +#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" msgstr "不能为写入打开 '%s'" -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 -#: builtin/merge.c:1010 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 +#: builtin/merge.c:988 #, c-format msgid "Could not write to '%s'" msgstr "不能写入 '%s'" @@ -1348,7 +1398,7 @@ msgstr "不能解析 HEAD" msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:908 builtin/apply.c:4288 +#: sequencer.c:908 builtin/apply.c:4291 #, c-format msgid "cannot open %s: %s" msgstr "不能打开 %s：%s" @@ -1390,7 +1440,12 @@ msgstr "不能作为初始提交还原" msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" -#: sha1_name.c:440 +#: setup.c:243 +#, c-format +msgid "failed to read %s" +msgstr "无法读取 %s" + +#: sha1_name.c:453 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" @@ -1411,25 +1466,6 @@ msgstr "" "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" "命令关闭本消息通知。" -#: sha1_name.c:1068 -msgid "HEAD does not point to a branch" -msgstr "HEAD 没有指向一个分支" - -#: sha1_name.c:1071 -#, c-format -msgid "No such branch: '%s'" -msgstr "没有此分支：'%s'" - -#: sha1_name.c:1073 -#, c-format -msgid "No upstream configured for branch '%s'" -msgstr "尚未给分支 '%s' 设置上游" - -#: sha1_name.c:1077 -#, c-format -msgid "Upstream branch '%s' not stored as a remote-tracking branch" -msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" - #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "无法修改未合并的 .gitmodules，先解决合并冲突" @@ -1453,12 +1489,7 @@ msgstr "无法移除 %s 的 .gitmodules 条目" msgid "staging updated .gitmodules failed" msgstr "将更新后 .gitmodules 添加暂存区失败" -#: submodule.c:1109 builtin/init-db.c:371 -#, c-format -msgid "Could not create git link %s" -msgstr "不能创建 git link %s" - -#: submodule.c:1120 +#: submodule.c:1115 #, c-format msgid "Could not set core.worktree in %s" msgstr "不能在 %s 中设置 core.worktree" @@ -1488,7 +1519,7 @@ msgstr "不能读取输入文件 '%s'" msgid "could not read from stdin" msgstr "不能自标准输入读取" -#: unpack-trees.c:202 +#: unpack-trees.c:203 msgid "Checking out files" msgstr "正在检出文件" @@ -1544,6 +1575,21 @@ msgstr "无此用户" msgid "unable to get current working directory" msgstr "不能获取当前工作目录" +#: wrapper.c:575 +#, c-format +msgid "could not open %s for writing" +msgstr "不能写入 %s" + +#: wrapper.c:587 +#, c-format +msgid "could not write to %s" +msgstr "不能写入 %s" + +#: wrapper.c:593 +#, c-format +msgid "could not close %s" +msgstr "不能关闭 %s" + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "未合并的路径：" @@ -1574,11 +1620,11 @@ msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <文件>...\" 标记解决方案）" -#: wt-status.c:198 wt-status.c:878 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:216 wt-status.c:887 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" @@ -1694,15 +1740,15 @@ msgstr "未跟踪的内容, " msgid "bug: unhandled diff status %c" msgstr "bug：无法处理的差异状态 %c" -#: wt-status.c:753 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:755 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:835 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1710,198 +1756,198 @@ msgstr "" "不要改动上面的一行。\n" "下面的所有内容均将被删除。" -#: wt-status.c:946 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:949 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" -#: wt-status.c:952 +#: wt-status.c:955 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:955 +#: wt-status.c:958 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:965 +#: wt-status.c:968 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:968 +#: wt-status.c:971 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:972 +#: wt-status.c:975 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:974 +#: wt-status.c:977 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:976 +#: wt-status.c:979 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:1036 wt-status.c:1053 +#: wt-status.c:1039 wt-status.c:1056 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:1041 wt-status.c:1058 +#: wt-status.c:1044 wt-status.c:1061 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者：注意保持前导空格 -#: wt-status.c:1044 +#: wt-status.c:1047 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1046 +#: wt-status.c:1049 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1048 +#: wt-status.c:1051 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:1061 +#: wt-status.c:1064 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:1065 +#: wt-status.c:1068 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:1070 +#: wt-status.c:1073 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 -#: wt-status.c:1073 +#: wt-status.c:1076 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:1077 +#: wt-status.c:1080 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:1082 +#: wt-status.c:1085 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 -#: wt-status.c:1085 +#: wt-status.c:1088 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:1087 +#: wt-status.c:1090 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:1097 +#: wt-status.c:1100 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1102 +#: wt-status.c:1105 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1105 +#: wt-status.c:1108 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1107 +#: wt-status.c:1110 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1116 +#: wt-status.c:1119 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1121 +#: wt-status.c:1124 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1124 +#: wt-status.c:1127 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1126 +#: wt-status.c:1129 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1137 +#: wt-status.c:1140 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1141 +#: wt-status.c:1144 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1144 +#: wt-status.c:1147 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1321 +#: wt-status.c:1324 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1328 +#: wt-status.c:1331 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1333 +#: wt-status.c:1336 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1335 +#: wt-status.c:1338 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1338 +#: wt-status.c:1341 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1355 +#: wt-status.c:1358 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1369 +#: wt-status.c:1372 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1371 +#: wt-status.c:1374 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1375 +#: wt-status.c:1378 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1911,84 +1957,84 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1381 +#: wt-status.c:1384 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1383 +#: wt-status.c:1386 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1389 +#: wt-status.c:1392 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1394 +#: wt-status.c:1397 #, 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:1397 +#: wt-status.c:1400 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1400 +#: wt-status.c:1403 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1403 +#: wt-status.c:1406 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1406 +#: wt-status.c:1409 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1409 wt-status.c:1414 +#: wt-status.c:1412 wt-status.c:1417 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1412 +#: wt-status.c:1415 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1416 +#: wt-status.c:1419 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1525 +#: wt-status.c:1528 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" # 译者：注意保持句尾空格 -#: wt-status.c:1531 +#: wt-status.c:1534 msgid "Initial commit on " msgstr "初始提交于 " -#: wt-status.c:1563 +#: wt-status.c:1561 msgid "gone" msgstr "丢失" # 译者：注意保持句尾空格 -#: wt-status.c:1565 wt-status.c:1573 +#: wt-status.c:1563 wt-status.c:1571 msgid "behind " msgstr "落后 " -#: compat/precompose_utf8.c:55 builtin/clone.c:360 +#: compat/precompose_utf8.c:55 builtin/clone.c:352 #, c-format msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" @@ -2015,7 +2061,7 @@ msgstr "删除 '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:194 builtin/rev-parse.c:785 +#: builtin/add.c:194 builtin/rev-parse.c:796 msgid "Could not read the index" msgstr "不能读取索引" @@ -2028,113 +2074,117 @@ msgstr "不能打开 '%s' 以写入。" msgid "Could not write patch" msgstr "不能生成补丁" -#: builtin/add.c:214 +#: builtin/add.c:212 +msgid "editing patch failed" +msgstr "编辑补丁失败" + +#: builtin/add.c:215 #, c-format msgid "Could not stat '%s'" msgstr "不能查看文件状态 '%s'" -#: builtin/add.c:216 +#: builtin/add.c:217 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" -#: builtin/add.c:221 +#: builtin/add.c:222 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" -#: builtin/add.c:231 +#: builtin/add.c:232 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 -#: builtin/rm.c:269 +#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369 +#: builtin/rm.c:268 msgid "dry run" msgstr "演习" -#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "冗长输出" -#: builtin/add.c:251 +#: builtin/add.c:252 msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286 msgid "select hunks interactively" msgstr "交互式挑选数据块" -#: builtin/add.c:253 +#: builtin/add.c:254 msgid "edit current diff and apply" msgstr "编辑当前差异并应用" -#: builtin/add.c:254 +#: builtin/add.c:255 msgid "allow adding otherwise ignored files" msgstr "允许添加忽略的文件" -#: builtin/add.c:255 +#: builtin/add.c:256 msgid "update tracked files" msgstr "更新已跟踪的文件" -#: builtin/add.c:256 +#: builtin/add.c:257 msgid "record only the fact that the path will be added later" msgstr "只记录，该路径稍后再添加" -#: builtin/add.c:257 +#: builtin/add.c:258 msgid "add changes from all tracked and untracked files" msgstr "添加所有改变的已跟踪文件和未跟踪文件" -#: builtin/add.c:260 +#: builtin/add.c:261 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区中移除的路径（和 --no-all 相同）" -#: builtin/add.c:262 +#: builtin/add.c:263 msgid "don't add, only refresh the index" msgstr "不添加，只刷新索引" -#: builtin/add.c:263 +#: builtin/add.c:264 msgid "just skip files which cannot be added because of errors" msgstr "跳过因出错不能添加的文件" -#: builtin/add.c:264 +#: builtin/add.c:265 msgid "check if - even missing - files are ignored in dry run" msgstr "检查在演习模式下文件（即使不存在）是否被忽略" -#: builtin/add.c:286 +#: builtin/add.c:287 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 参数如果您确实要添加它们。\n" -#: builtin/add.c:293 +#: builtin/add.c:294 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:329 +#: builtin/add.c:330 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" -#: builtin/add.c:336 +#: builtin/add.c:337 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" -#: builtin/add.c:357 +#: builtin/add.c:358 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" -#: builtin/add.c:358 +#: builtin/add.c:359 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "无法写入新索引文件" @@ -2208,77 +2258,77 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: builtin/apply.c:1656 +#: builtin/apply.c:1659 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: builtin/apply.c:1658 +#: builtin/apply.c:1661 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: builtin/apply.c:1684 +#: builtin/apply.c:1687 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" -#: builtin/apply.c:1720 +#: builtin/apply.c:1723 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: builtin/apply.c:1722 +#: builtin/apply.c:1725 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: builtin/apply.c:1725 +#: builtin/apply.c:1728 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: builtin/apply.c:1871 +#: builtin/apply.c:1874 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" -#: builtin/apply.c:1900 +#: builtin/apply.c:1903 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: builtin/apply.c:2051 +#: builtin/apply.c:2054 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: builtin/apply.c:2141 +#: builtin/apply.c:2144 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: builtin/apply.c:2145 +#: builtin/apply.c:2148 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: builtin/apply.c:2778 +#: builtin/apply.c:2781 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: builtin/apply.c:2897 +#: builtin/apply.c:2900 #, 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:2909 +#: builtin/apply.c:2912 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: builtin/apply.c:2915 +#: builtin/apply.c:2918 #, c-format msgid "" "while searching for:\n" @@ -2287,336 +2337,336 @@ msgstr "" "当查询：\n" "%.*s" -#: builtin/apply.c:2935 +#: builtin/apply.c:2938 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: builtin/apply.c:3036 +#: builtin/apply.c:3039 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: builtin/apply.c:3042 +#: builtin/apply.c:3045 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" -#: builtin/apply.c:3063 +#: builtin/apply.c:3066 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: builtin/apply.c:3187 +#: builtin/apply.c:3190 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 +#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291 #, c-format msgid "read of %s failed" msgstr "读取 %s 失败" -#: builtin/apply.c:3240 +#: builtin/apply.c:3243 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" -#: builtin/apply.c:3268 builtin/apply.c:3490 +#: builtin/apply.c:3271 builtin/apply.c:3493 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: builtin/apply.c:3349 builtin/apply.c:3504 +#: builtin/apply.c:3352 builtin/apply.c:3507 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 +#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: builtin/apply.c:3358 builtin/apply.c:3512 +#: builtin/apply.c:3361 builtin/apply.c:3515 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: builtin/apply.c:3460 +#: builtin/apply.c:3463 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: builtin/apply.c:3529 +#: builtin/apply.c:3532 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: builtin/apply.c:3531 +#: builtin/apply.c:3534 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: builtin/apply.c:3690 builtin/apply.c:3692 +#: builtin/apply.c:3693 builtin/apply.c:3695 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" -#: builtin/apply.c:3747 +#: builtin/apply.c:3750 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: builtin/apply.c:3750 +#: builtin/apply.c:3753 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: builtin/apply.c:3770 +#: builtin/apply.c:3773 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: builtin/apply.c:3775 +#: builtin/apply.c:3778 #, 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:3795 +#: builtin/apply.c:3798 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" -#: builtin/apply.c:3799 +#: builtin/apply.c:3802 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: builtin/apply.c:3813 +#: builtin/apply.c:3816 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." -#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: builtin/apply.c:4049 +#: builtin/apply.c:4052 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: builtin/apply.c:4078 +#: builtin/apply.c:4081 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: builtin/apply.c:4082 +#: builtin/apply.c:4085 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能枚举新建文件 '%s' 的状态" -#: builtin/apply.c:4087 +#: builtin/apply.c:4090 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: builtin/apply.c:4090 builtin/apply.c:4198 +#: builtin/apply.c:4093 builtin/apply.c:4201 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: builtin/apply.c:4123 +#: builtin/apply.c:4126 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: builtin/apply.c:4172 +#: builtin/apply.c:4175 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: builtin/apply.c:4259 +#: builtin/apply.c:4262 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: builtin/apply.c:4267 +#: builtin/apply.c:4270 msgid "internal error" msgstr "内部错误" -#: builtin/apply.c:4270 +#: builtin/apply.c:4273 #, 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:4280 +#: builtin/apply.c:4283 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: builtin/apply.c:4301 +#: builtin/apply.c:4304 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: builtin/apply.c:4304 +#: builtin/apply.c:4307 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: builtin/apply.c:4394 +#: builtin/apply.c:4397 msgid "unrecognized input" msgstr "未能识别的输入" -#: builtin/apply.c:4405 +#: builtin/apply.c:4408 msgid "unable to read index file" msgstr "无法读取索引文件" -#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 +#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85 #: builtin/fetch.c:92 msgid "path" msgstr "路径" -#: builtin/apply.c:4523 +#: builtin/apply.c:4526 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: builtin/apply.c:4526 +#: builtin/apply.c:4529 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: builtin/apply.c:4528 +#: builtin/apply.c:4531 msgid "num" msgstr "数字" -#: builtin/apply.c:4529 +#: builtin/apply.c:4532 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: builtin/apply.c:4532 +#: builtin/apply.c:4535 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: builtin/apply.c:4534 +#: builtin/apply.c:4537 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: builtin/apply.c:4538 +#: builtin/apply.c:4541 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: builtin/apply.c:4540 +#: builtin/apply.c:4543 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: builtin/apply.c:4542 +#: builtin/apply.c:4545 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: builtin/apply.c:4544 +#: builtin/apply.c:4547 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: builtin/apply.c:4546 +#: builtin/apply.c:4549 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: builtin/apply.c:4548 +#: builtin/apply.c:4551 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" -#: builtin/apply.c:4550 +#: builtin/apply.c:4553 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: builtin/apply.c:4552 +#: builtin/apply.c:4555 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三路合并" -#: builtin/apply.c:4554 +#: builtin/apply.c:4557 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 +#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: builtin/apply.c:4559 +#: builtin/apply.c:4562 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: builtin/apply.c:4560 +#: builtin/apply.c:4563 msgid "action" msgstr "动作" -#: builtin/apply.c:4561 +#: builtin/apply.c:4564 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: builtin/apply.c:4564 builtin/apply.c:4567 +#: builtin/apply.c:4567 builtin/apply.c:4570 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: builtin/apply.c:4570 +#: builtin/apply.c:4573 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: builtin/apply.c:4572 +#: builtin/apply.c:4575 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: builtin/apply.c:4574 +#: builtin/apply.c:4577 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: builtin/apply.c:4576 +#: builtin/apply.c:4579 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: builtin/apply.c:4579 +#: builtin/apply.c:4582 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: builtin/apply.c:4582 +#: builtin/apply.c:4585 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: builtin/apply.c:4584 +#: builtin/apply.c:4587 msgid "root" msgstr "根目录" -#: builtin/apply.c:4585 +#: builtin/apply.c:4588 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: builtin/apply.c:4607 +#: builtin/apply.c:4610 msgid "--3way outside a repository" msgstr "--3way 在一个版本库之外" -#: builtin/apply.c:4615 +#: builtin/apply.c:4618 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" -#: builtin/apply.c:4618 +#: builtin/apply.c:4621 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" -#: builtin/apply.c:4637 +#: builtin/apply.c:4640 #, c-format msgid "can't open patch '%s'" msgstr "不能打开补丁 '%s'" -#: builtin/apply.c:4651 +#: builtin/apply.c:4654 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: builtin/apply.c:4657 builtin/apply.c:4667 +#: builtin/apply.c:4660 builtin/apply.c:4670 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2670,11 +2720,11 @@ msgstr "执行 'git bisect next'" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "更新 BISECT_HEAD 而非检出当前提交" -#: builtin/blame.c:30 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" -msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] 文件" +#: builtin/blame.c:31 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" -#: builtin/blame.c:35 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" @@ -2797,7 +2847,7 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:152 +#: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2807,7 +2857,7 @@ msgstr "" " '%s'，但未合并到 HEAD。" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:156 +#: builtin/branch.c:154 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2816,12 +2866,12 @@ msgstr "" "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" " 然而却尚未被合并到分支 '%s' 。" -#: builtin/branch.c:170 +#: builtin/branch.c:168 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "无法查询 '%s' 指向的提交对象" -#: builtin/branch.c:174 +#: builtin/branch.c:172 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2830,343 +2880,343 @@ msgstr "" "分支 '%s' 没有完全合并。\n" "如果您确认要删除它，执行 'git branch -D %s'。" -#: builtin/branch.c:187 +#: builtin/branch.c:185 msgid "Update of config-file failed" msgstr "无法更新 config 文件" -#: builtin/branch.c:215 +#: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" -#: builtin/branch.c:221 +#: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "无法查询 HEAD 指向的提交对象" -#: builtin/branch.c:229 +#: builtin/branch.c:227 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "无法删除您当前所在的分支 '%s'。" -#: builtin/branch.c:245 +#: builtin/branch.c:243 #, c-format -msgid "remote branch '%s' not found." -msgstr "远程分支 '%s' 未发现。" +msgid "remote-tracking branch '%s' not found." +msgstr "未能找到远程跟踪分支 '%s'。" -#: builtin/branch.c:246 +#: builtin/branch.c:244 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未发现。" -#: builtin/branch.c:260 +#: builtin/branch.c:258 #, c-format -msgid "Error deleting remote branch '%s'" -msgstr "删除远程分支 '%s' 时出错" +msgid "Error deleting remote-tracking branch '%s'" +msgstr "无法删除远程跟踪分支 '%s'" -#: builtin/branch.c:261 +#: builtin/branch.c:259 #, c-format msgid "Error deleting branch '%s'" -msgstr "删除分支 '%s' 时出错" +msgstr "无法删除分支 '%s'" -#: builtin/branch.c:268 +#: builtin/branch.c:266 #, c-format -msgid "Deleted remote branch %s (was %s).\n" -msgstr "已删除远程分支 %s（曾为 %s）。\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" +msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n" -#: builtin/branch.c:269 +#: builtin/branch.c:267 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s（曾为 %s）。\n" -#: builtin/branch.c:370 +#: builtin/branch.c:368 #, c-format msgid "branch '%s' does not point at a commit" msgstr "分支 '%s' 未指向一个提交" -#: builtin/branch.c:459 +#: builtin/branch.c:451 #, c-format msgid "[%s: gone]" msgstr "[%s: 丢失]" -#: builtin/branch.c:464 +#: builtin/branch.c:456 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:469 +#: builtin/branch.c:461 #, c-format msgid "[%s: behind %d]" msgstr "[%s：落后 %d]" -#: builtin/branch.c:471 +#: builtin/branch.c:463 #, c-format msgid "[behind %d]" msgstr "[落后 %d]" -#: builtin/branch.c:475 +#: builtin/branch.c:467 #, c-format msgid "[%s: ahead %d]" msgstr "[%s：领先 %d]" -#: builtin/branch.c:477 +#: builtin/branch.c:469 #, c-format msgid "[ahead %d]" msgstr "[领先 %d]" -#: builtin/branch.c:480 +#: builtin/branch.c:472 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s：领先 %d，落后 %d]" -#: builtin/branch.c:483 +#: builtin/branch.c:475 #, c-format msgid "[ahead %d, behind %d]" msgstr "[领先 %d，落后 %d]" -#: builtin/branch.c:496 +#: builtin/branch.c:488 msgid " **** invalid ref ****" msgstr " **** 无效引用 ****" -#: builtin/branch.c:587 +#: builtin/branch.c:579 #, c-format msgid "(no branch, rebasing %s)" msgstr "（非分支，正变基 %s）" -#: builtin/branch.c:590 +#: builtin/branch.c:582 #, c-format msgid "(no branch, bisect started on %s)" msgstr "（非分支，二分查找开始于 %s）" -#: builtin/branch.c:596 +#: builtin/branch.c:588 #, c-format msgid "(HEAD detached at %s)" msgstr "（头指针分离于 %s）" -#: builtin/branch.c:599 +#: builtin/branch.c:591 #, c-format msgid "(HEAD detached from %s)" msgstr "（头指针分离自 %s）" -#: builtin/branch.c:603 +#: builtin/branch.c:595 msgid "(no branch)" msgstr "（非分支）" -#: builtin/branch.c:650 +#: builtin/branch.c:642 #, c-format msgid "object '%s' does not point to a commit" msgstr "对象 '%s' 没有指向一个提交" -#: builtin/branch.c:698 +#: builtin/branch.c:690 msgid "some refs could not be read" msgstr "一些引用不能读取" -#: builtin/branch.c:711 +#: builtin/branch.c:703 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" -#: builtin/branch.c:721 +#: builtin/branch.c:713 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c:736 +#: builtin/branch.c:728 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:740 +#: builtin/branch.c:732 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "重命名掉一个错误命名的旧分支 '%s'" -#: builtin/branch.c:744 +#: builtin/branch.c:736 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: builtin/branch.c:751 +#: builtin/branch.c:743 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新 config 文件失败" -#: builtin/branch.c:766 +#: builtin/branch.c:758 #, c-format msgid "malformed object name %s" msgstr "非法的对象名 %s" -#: builtin/branch.c:790 +#: builtin/branch.c:780 #, c-format msgid "could not write branch description template: %s" msgstr "不能写分支描述模版：%s" -#: builtin/branch.c:820 +#: builtin/branch.c:810 msgid "Generic options" msgstr "通用选项" -#: builtin/branch.c:822 +#: builtin/branch.c:812 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" -#: builtin/branch.c:823 +#: builtin/branch.c:813 msgid "suppress informational messages" msgstr "不显示信息" -#: builtin/branch.c:824 +#: builtin/branch.c:814 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模式（参见 git-pull(1)）" -#: builtin/branch.c:826 +#: builtin/branch.c:816 msgid "change upstream info" msgstr "改变上游信息" -#: builtin/branch.c:830 +#: builtin/branch.c:820 msgid "use colored output" msgstr "使用彩色输出" -#: builtin/branch.c:831 +#: builtin/branch.c:821 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" -#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 -#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 -#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 +#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851 +#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "提交" -#: builtin/branch.c:835 builtin/branch.c:841 +#: builtin/branch.c:825 builtin/branch.c:831 msgid "print only branches that contain the commit" msgstr "只打印包含该提交的分支" -#: builtin/branch.c:847 +#: builtin/branch.c:837 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作：" -#: builtin/branch.c:848 +#: builtin/branch.c:838 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪及本地分支" -#: builtin/branch.c:850 +#: builtin/branch.c:840 msgid "delete fully merged branch" msgstr "删除完全合并的分支" -#: builtin/branch.c:851 +#: builtin/branch.c:841 msgid "delete branch (even if not merged)" msgstr "删除分支（即使没有合并）" -#: builtin/branch.c:852 +#: builtin/branch.c:842 msgid "move/rename a branch and its reflog" msgstr "移动/重命名一个分支，以及它的引用日志" -#: builtin/branch.c:853 +#: builtin/branch.c:843 msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支，即使目标已存在" -#: builtin/branch.c:854 +#: builtin/branch.c:844 msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c:855 +#: builtin/branch.c:845 msgid "create the branch's reflog" msgstr "创建分支的引用日志" -#: builtin/branch.c:857 +#: builtin/branch.c:847 msgid "edit the description for the branch" msgstr "标记分支的描述" -#: builtin/branch.c:858 +#: builtin/branch.c:848 msgid "force creation, move/rename, deletion" msgstr "强制创建、移动/重命名、删除" -#: builtin/branch.c:861 +#: builtin/branch.c:851 msgid "print only not merged branches" msgstr "只打印没有合并的分支" -#: builtin/branch.c:867 +#: builtin/branch.c:857 msgid "print only merged branches" msgstr "只打印合并的分支" -#: builtin/branch.c:871 +#: builtin/branch.c:861 msgid "list branches in columns" msgstr "以列的方式显示分支" -#: builtin/branch.c:884 +#: builtin/branch.c:874 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:888 builtin/clone.c:637 +#: builtin/branch.c:878 builtin/clone.c:629 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c:910 +#: builtin/branch.c:900 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" -#: builtin/branch.c:921 builtin/branch.c:960 +#: builtin/branch.c:911 builtin/branch.c:950 msgid "branch name required" msgstr "必须提供分支名" -#: builtin/branch.c:936 +#: builtin/branch.c:926 msgid "Cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" -#: builtin/branch.c:941 +#: builtin/branch.c:931 msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" -#: builtin/branch.c:948 +#: builtin/branch.c:938 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚无提交。" -#: builtin/branch.c:951 +#: builtin/branch.c:941 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" -#: builtin/branch.c:966 +#: builtin/branch.c:956 msgid "too many branches for a rename operation" msgstr "为重命名操作提供了太多的分支名" -#: builtin/branch.c:971 +#: builtin/branch.c:961 msgid "too many branches to set new upstream" msgstr "为设置新上游提供了太多的分支名" -#: builtin/branch.c:975 +#: builtin/branch.c:965 #, 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:978 builtin/branch.c:1000 builtin/branch.c:1021 +#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011 #, c-format msgid "no such branch '%s'" msgstr "没有此分支 '%s'" -#: builtin/branch.c:982 +#: builtin/branch.c:972 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:994 +#: builtin/branch.c:984 msgid "too many branches to unset upstream" msgstr "为取消上游设置操作提供了太多的分支名" -#: builtin/branch.c:998 +#: builtin/branch.c:988 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" -#: builtin/branch.c:1004 +#: builtin/branch.c:994 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" -#: builtin/branch.c:1018 +#: builtin/branch.c:1008 msgid "it does not make sense to create 'HEAD' manually" msgstr "手工创建 'HEAD' 没有意义" -#: builtin/branch.c:1024 +#: builtin/branch.c:1014 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" -#: builtin/branch.c:1027 +#: builtin/branch.c:1017 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3174,7 +3224,7 @@ msgid "" msgstr "" "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" -#: builtin/branch.c:1044 +#: builtin/branch.c:1034 #, c-format msgid "" "\n" @@ -3185,69 +3235,84 @@ msgstr "" "如果你想用 '%s' 跟踪 '%s', 这么做：\n" "\n" -#: builtin/branch.c:1045 +#: builtin/branch.c:1035 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1046 +#: builtin/branch.c:1036 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" -#: builtin/bundle.c:47 +#: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" -#: builtin/bundle.c:56 +#: builtin/bundle.c:64 msgid "Need a repository to create a bundle." msgstr "需要一个版本库来创建包。" -#: builtin/bundle.c:60 +#: builtin/bundle.c:68 msgid "Need a repository to unbundle." msgstr "需要一个版本库来解包。" -#: builtin/cat-file.c:326 -msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" -msgstr "git cat-file (-t | -s | -e | -p | <类型> | --textconv) <对象>" +#: builtin/cat-file.c:369 +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|<类型" +">|--textconv) <对象>" -#: builtin/cat-file.c:327 -msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" -msgstr "git cat-file (--batch | --batch-check) < <对象列表>" +#: builtin/cat-file.c:370 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-" +"objects>" +msgstr "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>" -#: builtin/cat-file.c:364 +#: builtin/cat-file.c:407 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:365 +#: builtin/cat-file.c:408 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:409 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:411 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:412 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:414 msgid "for blob objects, run textconv on object's content" msgstr "对于数据（blob）对象，对其内容执行 textconv" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:416 +msgid "allow -s and -t to work with broken/corrupt objects" +msgstr "允许 -s 和 -t 对损坏的对象生效" + +#: builtin/cat-file.c:418 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:421 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" +#: builtin/cat-file.c:424 +msgid "follow in-tree symlinks (used with --batch or --batch-check)" +msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）" + #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." @@ -3264,7 +3329,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:98 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96 msgid "read file names from stdin" msgstr "从标准输入读出文件名" @@ -3272,7 +3337,7 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274 +#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279 msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -3369,114 +3434,114 @@ msgstr "在创建文件时，在前面加上<字符串>" msgid "copy out the files from named stage" msgstr "从指定暂存区中拷出文件" -#: builtin/checkout.c:25 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<选项>] <分支>" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<选项>] [<分支>] -- <文件>..." -#: builtin/checkout.c:132 builtin/checkout.c:165 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" -#: builtin/checkout.c:150 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必须的版本" -#: builtin/checkout.c:194 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必须的版本" -#: builtin/checkout.c:211 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" -#: builtin/checkout.c:228 +#: builtin/checkout.c:234 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255 -#: builtin/checkout.c:258 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 builtin/checkout.c:277 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路径时使用" -#: builtin/checkout.c:261 builtin/checkout.c:264 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同时使用" -#: builtin/checkout.c:267 +#: builtin/checkout.c:273 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" -#: builtin/checkout.c:278 builtin/checkout.c:467 +#: builtin/checkout.c:287 builtin/checkout.c:481 msgid "corrupt index file" msgstr "损坏的索引文件" -#: builtin/checkout.c:338 builtin/checkout.c:345 +#: builtin/checkout.c:347 builtin/checkout.c:354 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:489 +#: builtin/checkout.c:503 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:615 +#: builtin/checkout.c:634 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "不能对 '%s' 执行 reflog 操作\n" -#: builtin/checkout.c:653 +#: builtin/checkout.c:670 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:660 +#: builtin/checkout.c:677 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:663 +#: builtin/checkout.c:680 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:667 +#: builtin/checkout.c:684 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:669 builtin/checkout.c:1050 +#: builtin/checkout.c:686 builtin/checkout.c:1285 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:671 +#: builtin/checkout.c:688 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:723 +#: builtin/checkout.c:740 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c:729 +#: builtin/checkout.c:746 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3497,154 +3562,204 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:747 +#: builtin/checkout.c:765 #, c-format msgid "" +"If you want to keep it by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch <new-branch-name> %s\n" +"\n" +msgid_plural "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" " git branch <new-branch-name> %s\n" "\n" -msgstr "" -"如果您想要通过创建新分支保存他们，这可能是一个好时候。\n" +msgstr[0] "" +"如果您想要通过创建新分支保存它，这可能是一个好时候。\n" +"如下操作：\n" +"\n" +" git branch <新分支名> %s\n" +"\n" +msgstr[1] "" +"如果您想要通过创建新分支保存它们，这可能是一个好时候。\n" "如下操作：\n" "\n" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:777 +#: builtin/checkout.c:801 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:781 +#: builtin/checkout.c:805 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:808 builtin/checkout.c:1045 +#: builtin/checkout.c:832 builtin/checkout.c:1280 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:952 +#: builtin/checkout.c:893 +msgid "no branch specified" +msgstr "未指定分支名" + +#: builtin/checkout.c:895 +#, c-format +msgid "'%s' already exists" +msgstr "'%s' 已经存在" + +#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842 +#: builtin/clone.c:853 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "不能为 '%s' 创建先导目录" + +#: builtin/checkout.c:924 +#, c-format +msgid "could not create directory of '%s'" +msgstr "不能创建目录 '%s'" + +#: builtin/checkout.c:960 +#, c-format +msgid "Enter %s (identifier %s)" +msgstr "输入 %s （标识符 %s）" + +#: builtin/checkout.c:1070 +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "'%s' 已经检出到 '%s'" + +#: builtin/checkout.c:1176 #, c-format msgid "only one reference expected, %d given." msgstr "只要一个引用，却给出了 %d 个" -#: builtin/checkout.c:991 +#: builtin/checkout.c:1215 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#: builtin/checkout.c:1020 +#: builtin/checkout.c:1255 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:1059 +#: builtin/checkout.c:1294 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1062 builtin/checkout.c:1066 +#: builtin/checkout.c:1297 builtin/checkout.c:1301 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078 -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313 +#: builtin/checkout.c:1316 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1086 +#: builtin/checkout.c:1321 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90 +#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1109 +#: builtin/checkout.c:1347 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1349 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1112 +#: builtin/checkout.c:1350 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1351 msgid "detach the HEAD at named commit" msgstr "成为指向该提交的分离头指针" -#: builtin/checkout.c:1114 +#: builtin/checkout.c:1352 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1354 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1355 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1119 +#: builtin/checkout.c:1357 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1121 +#: builtin/checkout.c:1359 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1360 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三路合并" -#: builtin/checkout.c:1123 builtin/merge.c:227 +#: builtin/checkout.c:1361 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 +#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244 msgid "style" msgstr "风格" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1363 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1366 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1368 msgid "second guess 'git checkout <no-such-branch>'" msgstr "二次猜测'git checkout <无此分支>'" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1370 +msgid "check a branch out in a separate working directory" +msgstr "检出一个分支到单独的工作目录" + +#: builtin/checkout.c:1372 +msgid "do not check if another worktree is holding the given ref" +msgstr "不检查指定的引用是否被其他工作区所占用" + +#: builtin/checkout.c:1406 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b、-B 和 --orphan 是互斥的" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1423 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1175 +#: builtin/checkout.c:1428 msgid "Missing branch name; try -b" msgstr "缺少分支名；尝试 -b" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1464 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1219 +#: builtin/checkout.c:1471 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3653,12 +3768,12 @@ msgstr "" "不能同时更新路径并切换到分支'%s'。\n" "您是想要检出 '%s' 但其未能解析为提交么？" -#: builtin/checkout.c:1224 +#: builtin/checkout.c:1476 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1228 +#: builtin/checkout.c:1480 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3728,36 +3843,36 @@ msgstr "" "* - 选择所有选项\n" " - （空）结束选择" -#: builtin/clean.c:517 +#: builtin/clean.c:515 #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: builtin/clean.c:659 +#: builtin/clean.c:657 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除条目>> " -#: builtin/clean.c:696 +#: builtin/clean.c:694 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：无法找到和 %s 匹配的条目" -#: builtin/clean.c:717 +#: builtin/clean.c:715 msgid "Select items to delete" msgstr "选择要删除的条目" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:756 #, c-format msgid "Remove %s [y/N]? " msgstr "删除 %s [y/N]？" -#: builtin/clean.c:783 +#: builtin/clean.c:781 msgid "Bye." msgstr "再见。" -#: builtin/clean.c:791 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3775,69 +3890,69 @@ msgstr "" "help - 显示本帮助\n" "? - 显示如何在提示符下选择的帮助" -#: builtin/clean.c:818 +#: builtin/clean.c:816 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: builtin/clean.c:819 +#: builtin/clean.c:817 msgid "What now" msgstr "请选择" -#: builtin/clean.c:827 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "将删除如下条目：" msgstr[1] "将删除如下条目：" -#: builtin/clean.c:844 +#: builtin/clean.c:842 msgid "No more files to clean, exiting." msgstr "没有要清理的文件，退出。" -#: builtin/clean.c:875 +#: builtin/clean.c:873 msgid "do not print names of files removed" msgstr "不打印删除文件的名称" -#: builtin/clean.c:877 +#: builtin/clean.c:875 msgid "force" msgstr "强制" -#: builtin/clean.c:878 +#: builtin/clean.c:876 msgid "interactive cleaning" msgstr "交互式清除" -#: builtin/clean.c:880 +#: builtin/clean.c:878 msgid "remove whole directories" msgstr "删除整个目录" -#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 msgid "pattern" msgstr "模式" -#: builtin/clean.c:882 +#: builtin/clean.c:880 msgid "add <pattern> to ignore rules" msgstr "添加<模式>到忽略规则" -#: builtin/clean.c:883 +#: builtin/clean.c:881 msgid "remove ignored files, too" msgstr "也删除忽略的文件" -#: builtin/clean.c:885 +#: builtin/clean.c:883 msgid "remove only ignored files" msgstr "只删除忽略的文件" -#: builtin/clean.c:903 +#: builtin/clean.c:901 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" -#: builtin/clean.c:907 +#: builtin/clean.c:905 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:910 +#: builtin/clean.c:908 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3848,150 +3963,150 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<选项>] [--] <版本库> [<路径>]" -#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224 #: builtin/push.c:523 msgid "force progress reporting" msgstr "强制显示进度报告" -#: builtin/clone.c:68 +#: builtin/clone.c:59 msgid "don't create a checkout" msgstr "不创建一个检出" -#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503 msgid "create a bare repository" msgstr "创建一个纯版本库" -#: builtin/clone.c:73 +#: builtin/clone.c:64 msgid "create a mirror repository (implies bare)" msgstr "创建一个镜像版本库（也是纯版本库）" -#: builtin/clone.c:75 +#: builtin/clone.c:66 msgid "to clone from a local repository" msgstr "从本地版本库克隆" -#: builtin/clone.c:77 +#: builtin/clone.c:68 msgid "don't use local hardlinks, always copy" msgstr "不使用本地硬链接，始终复制" -#: builtin/clone.c:79 +#: builtin/clone.c:70 msgid "setup as shared repository" msgstr "设置为共享版本库" -#: builtin/clone.c:81 builtin/clone.c:83 +#: builtin/clone.c:72 builtin/clone.c:74 msgid "initialize submodules in the clone" msgstr "在克隆时初始化子模组" -#: builtin/clone.c:84 builtin/init-db.c:493 +#: builtin/clone.c:75 builtin/init-db.c:500 msgid "template-directory" msgstr "模板目录" -#: builtin/clone.c:85 builtin/init-db.c:494 +#: builtin/clone.c:76 builtin/init-db.c:501 msgid "directory from which templates will be used" msgstr "模板目录将被使用" -#: builtin/clone.c:87 +#: builtin/clone.c:78 msgid "reference repository" msgstr "参考版本库" -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:80 +msgid "use --reference only while cloning" +msgstr "仅在克隆时参考 --reference 指向的本地版本库" + +#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "名称" -#: builtin/clone.c:89 +#: builtin/clone.c:82 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用<名称>而不是 'origin' 去跟踪上游" -#: builtin/clone.c:91 +#: builtin/clone.c:84 msgid "checkout <branch> instead of the remote's HEAD" msgstr "检出<分支>而不是远程HEAD" -#: builtin/clone.c:93 +#: builtin/clone.c:86 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 +#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "深度" -#: builtin/clone.c:95 +#: builtin/clone.c:88 msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:97 +#: builtin/clone.c:90 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" -#: builtin/clone.c:99 -msgid "use --reference only while cloning" -msgstr "仅在克隆时参考 --reference 指向的本地版本库" - -#: builtin/clone.c:100 builtin/init-db.c:502 +#: builtin/clone.c:91 builtin/init-db.c:509 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:101 builtin/init-db.c:503 +#: builtin/clone.c:92 builtin/init-db.c:510 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" -#: builtin/clone.c:102 +#: builtin/clone.c:93 msgid "key=value" msgstr "key=value" -#: builtin/clone.c:103 +#: builtin/clone.c:94 msgid "set config inside the new repository" msgstr "在新版本库中设置配置信息" -#: builtin/clone.c:256 +#: builtin/clone.c:247 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "参考版本库 '%s' 不是一个本地版本库。" -#: builtin/clone.c:260 +#: builtin/clone.c:251 #, c-format msgid "reference repository '%s' is shallow" msgstr "参考版本库 '%s' 是一个浅克隆" -#: builtin/clone.c:263 +#: builtin/clone.c:254 #, c-format msgid "reference repository '%s' is grafted" msgstr "参考版本库 '%s' 已被嫁接" -#: builtin/clone.c:325 +#: builtin/clone.c:317 #, c-format msgid "failed to create directory '%s'" msgstr "无法创建目录 '%s'" -#: builtin/clone.c:327 builtin/diff.c:84 +#: builtin/clone.c:319 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "无法枚举 '%s' 状态" -#: builtin/clone.c:329 +#: builtin/clone.c:321 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" -#: builtin/clone.c:343 +#: builtin/clone.c:335 #, c-format msgid "failed to stat %s\n" msgstr "无法枚举 %s 状态\n" -#: builtin/clone.c:365 +#: builtin/clone.c:357 #, c-format msgid "failed to create link '%s'" msgstr "无法创建链接 '%s'" -#: builtin/clone.c:369 +#: builtin/clone.c:361 #, c-format msgid "failed to copy file to '%s'" msgstr "无法拷贝文件至 '%s'" -#: builtin/clone.c:392 builtin/clone.c:566 +#: builtin/clone.c:384 builtin/clone.c:558 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:404 +#: builtin/clone.c:396 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4001,120 +4116,115 @@ msgstr "" "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" "'git checkout -f HEAD' 重试\n" -#: builtin/clone.c:481 +#: builtin/clone.c:473 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:561 +#: builtin/clone.c:553 #, c-format msgid "Checking connectivity... " msgstr "检查连接... " -#: builtin/clone.c:564 +#: builtin/clone.c:556 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必须的对象" -#: builtin/clone.c:628 +#: builtin/clone.c:620 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:659 +#: builtin/clone.c:651 msgid "unable to checkout working tree" msgstr "不能检出工作区" -#: builtin/clone.c:746 +#: builtin/clone.c:738 msgid "cannot repack to clean up" msgstr "无法执行 repack 来清理" -#: builtin/clone.c:748 +#: builtin/clone.c:740 msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" -#: builtin/clone.c:778 +#: builtin/clone.c:770 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:782 +#: builtin/clone.c:774 msgid "You must specify a repository to clone." msgstr "您必须指定一个版本库来克隆。" -#: builtin/clone.c:793 +#: builtin/clone.c:785 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:796 +#: builtin/clone.c:788 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 选项不兼容。" -#: builtin/clone.c:809 +#: builtin/clone.c:801 #, c-format msgid "repository '%s' does not exist" msgstr "版本库 '%s' 不存在" -#: builtin/clone.c:815 builtin/fetch.c:1156 +#: builtin/clone.c:807 builtin/fetch.c:1160 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" -#: builtin/clone.c:825 +#: builtin/clone.c:817 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:835 +#: builtin/clone.c:827 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:850 builtin/clone.c:861 -#, c-format -msgid "could not create leading directories of '%s'" -msgstr "不能为 '%s' 创建先导目录" - -#: builtin/clone.c:853 +#: builtin/clone.c:845 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能创建工作区目录 '%s'" -#: builtin/clone.c:871 +#: builtin/clone.c:863 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯版本库 '%s'...\n" -#: builtin/clone.c:873 +#: builtin/clone.c:865 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:898 +#: builtin/clone.c:890 msgid "--dissociate given, but there is no --reference" msgstr "提供了参数 --dissociate，但未提供 --reference" -#: builtin/clone.c:913 +#: builtin/clone.c:907 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" -#: builtin/clone.c:916 +#: builtin/clone.c:910 msgid "source repository is shallow, ignoring --local" msgstr "源版本库是浅克隆，忽略 --local" -#: builtin/clone.c:921 +#: builtin/clone.c:915 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:925 +#: builtin/clone.c:919 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" -#: builtin/clone.c:976 builtin/clone.c:984 +#: builtin/clone.c:968 builtin/clone.c:976 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:987 +#: builtin/clone.c:979 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" @@ -4344,7 +4454,7 @@ msgstr "不能读取 MERGE_MSG" msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:738 builtin/merge.c:1079 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" @@ -4502,32 +4612,32 @@ msgstr "无效的清理模式 %s" msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项同时使用没有意义。" -#: builtin/commit.c:1324 builtin/commit.c:1604 +#: builtin/commit.c:1324 builtin/commit.c:1603 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1326 builtin/commit.c:1606 +#: builtin/commit.c:1326 builtin/commit.c:1605 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 +#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1331 builtin/commit.c:1610 +#: builtin/commit.c:1331 builtin/commit.c:1609 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1334 builtin/commit.c:1613 +#: builtin/commit.c:1334 builtin/commit.c:1612 msgid "terminate entries with NUL" msgstr "条目以NUL字符结尾" -#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 +#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "模式" -#: builtin/commit.c:1337 builtin/commit.c:1616 +#: builtin/commit.c:1337 builtin/commit.c:1615 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" @@ -4535,7 +4645,7 @@ msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、 msgid "show ignored files" msgstr "显示忽略的文件" -#: builtin/commit.c:1341 parse-options.h:153 +#: builtin/commit.c:1341 parse-options.h:152 msgid "when" msgstr "何时" @@ -4550,204 +4660,204 @@ msgstr "" msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1431 +#: builtin/commit.c:1430 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1433 +#: builtin/commit.c:1432 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1478 +#: builtin/commit.c:1477 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:1481 +#: builtin/commit.c:1480 msgid " (root-commit)" msgstr "（根提交）" -#: builtin/commit.c:1574 +#: builtin/commit.c:1573 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1575 +#: builtin/commit.c:1574 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1577 +#: builtin/commit.c:1576 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1578 builtin/tag.c:601 +#: builtin/commit.c:1577 builtin/tag.c:601 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "author" msgstr "作者" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1580 builtin/gc.c:275 +#: builtin/commit.c:1579 builtin/gc.c:280 msgid "date" msgstr "日期" -#: builtin/commit.c:1580 +#: builtin/commit.c:1579 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "说明" -#: builtin/commit.c:1581 +#: builtin/commit.c:1580 msgid "commit message" msgstr "提交说明" -#: builtin/commit.c:1582 +#: builtin/commit.c:1581 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1583 +#: builtin/commit.c:1582 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" -#: builtin/commit.c:1584 +#: builtin/commit.c:1583 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1585 +#: builtin/commit.c:1584 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1586 +#: builtin/commit.c:1585 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "添加 Signed-off-by: 签名" -#: builtin/commit.c:1588 +#: builtin/commit.c:1587 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1589 +#: builtin/commit.c:1588 msgid "force edit of commit" msgstr "强制编辑提交" # 译者：可选值，不能翻译（或是原文中笔误，应为 mode） -#: builtin/commit.c:1590 +#: builtin/commit.c:1589 msgid "default" msgstr "default" -#: builtin/commit.c:1590 builtin/tag.c:604 +#: builtin/commit.c:1589 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "设置如何删除提交说明里的空格和#注释" -#: builtin/commit.c:1591 +#: builtin/commit.c:1590 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "key-id" -#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG 提交签名" -#: builtin/commit.c:1596 +#: builtin/commit.c:1595 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1597 +#: builtin/commit.c:1596 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1598 +#: builtin/commit.c:1597 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1599 +#: builtin/commit.c:1598 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1600 +#: builtin/commit.c:1599 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1601 +#: builtin/commit.c:1600 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1602 +#: builtin/commit.c:1601 msgid "bypass pre-commit hook" msgstr "绕过 pre-commit 钩子" -#: builtin/commit.c:1603 +#: builtin/commit.c:1602 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1614 +#: builtin/commit.c:1613 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1615 +#: builtin/commit.c:1614 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1620 +#: builtin/commit.c:1619 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1622 +#: builtin/commit.c:1621 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1651 +#: builtin/commit.c:1650 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1690 builtin/merge.c:519 +#: builtin/commit.c:1689 builtin/merge.c:1076 #, c-format msgid "could not open '%s' for reading" msgstr "不能为读入打开 '%s'" -#: builtin/commit.c:1697 +#: builtin/commit.c:1696 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1704 +#: builtin/commit.c:1703 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1723 +#: builtin/commit.c:1722 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1734 +#: builtin/commit.c:1733 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1739 +#: builtin/commit.c:1738 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/commit.c:1787 +#: builtin/commit.c:1786 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4888,18 +4998,18 @@ msgstr "不能解析缺省的颜色值" #, c-format msgid "" "# This is Git's per-user configuration file.\n" -"[core]\n" +"[user]\n" "# Please adapt and uncomment the following lines:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" msgstr "" "# This is Git's per-user configuration file.\n" -"[core]\n" +"[user]\n" "# Please adapt and uncomment the following lines:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:589 +#: builtin/config.c:587 #, c-format msgid "cannot create configuration file %s" msgstr "不能创建配置文件 %s" @@ -5230,82 +5340,82 @@ msgstr "引用映射" msgid "specify fetch refmap" msgstr "指定获取操作的引用映射" -#: builtin/fetch.c:375 +#: builtin/fetch.c:377 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:455 +#: builtin/fetch.c:457 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:460 +#: builtin/fetch.c:462 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:474 +#: builtin/fetch.c:476 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）" -#: builtin/fetch.c:475 builtin/fetch.c:561 +#: builtin/fetch.c:477 builtin/fetch.c:563 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:486 +#: builtin/fetch.c:488 msgid "[tag update]" msgstr "[tag更新]" # 译者：注意保持前导空格 -#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 +#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543 msgid " (unable to update local ref)" msgstr " （不能更新本地引用）" -#: builtin/fetch.c:506 +#: builtin/fetch.c:508 msgid "[new tag]" msgstr "[新tag]" -#: builtin/fetch.c:509 +#: builtin/fetch.c:511 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:512 +#: builtin/fetch.c:514 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:557 +#: builtin/fetch.c:559 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:563 +#: builtin/fetch.c:565 msgid "(non-fast-forward)" msgstr "（非快进式）" -#: builtin/fetch.c:596 builtin/fetch.c:829 +#: builtin/fetch.c:599 builtin/fetch.c:832 #, c-format msgid "cannot open %s: %s\n" msgstr "无法打开 %s：%s\n" -#: builtin/fetch.c:605 +#: builtin/fetch.c:608 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必须的对象\n" -#: builtin/fetch.c:623 +#: builtin/fetch.c:626 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "拒绝 %s 因为浅克隆不允许被更新" -#: builtin/fetch.c:711 builtin/fetch.c:794 +#: builtin/fetch.c:714 builtin/fetch.c:797 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:722 +#: builtin/fetch.c:725 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5315,87 +5425,87 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:774 +#: builtin/fetch.c:777 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为摇摆状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:775 +#: builtin/fetch.c:778 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为摇摆状态）" -#: builtin/fetch.c:799 +#: builtin/fetch.c:802 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:800 builtin/remote.c:1060 +#: builtin/fetch.c:803 builtin/remote.c:1057 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:819 +#: builtin/fetch.c:822 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非纯版本库的当前分支 %s" -#: builtin/fetch.c:838 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:841 +#: builtin/fetch.c:844 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:897 +#: builtin/fetch.c:900 #, c-format msgid "Don't know how to fetch from %s" msgstr "不知道如何从 %s 获取" -#: builtin/fetch.c:1059 +#: builtin/fetch.c:1063 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:1061 builtin/remote.c:90 +#: builtin/fetch.c:1065 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:1079 +#: builtin/fetch.c:1083 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1106 msgid "You need to specify a tag name." msgstr "您需要指定一个 tag 名称。" -#: builtin/fetch.c:1144 +#: builtin/fetch.c:1148 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:1146 +#: builtin/fetch.c:1150 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的版本库，参数 --unshallow 没有意义" -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1173 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个版本库参数" -#: builtin/fetch.c:1171 +#: builtin/fetch.c:1175 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规则没有任何意义" -#: builtin/fetch.c:1182 +#: builtin/fetch.c:1186 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1190 +#: builtin/fetch.c:1194 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规则没有意义" @@ -5404,130 +5514,130 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" -#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 +#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590 -#: parse-options.h:132 parse-options.h:239 +#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590 +#: parse-options.h:131 parse-options.h:238 msgid "n" msgstr "n" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:669 msgid "populate log with at most <n> entries from shortlog" msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:672 msgid "alias for --log (deprecated)" msgstr "参数 --log 的别名（已弃用）" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:675 msgid "text" msgstr "文本" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:676 msgid "use <text> as start of message" msgstr "使用 <文本> 作为提交说明的开始" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:677 msgid "file to read from" msgstr "从文件中读取" -#: builtin/for-each-ref.c:675 +#: builtin/for-each-ref.c:687 msgid "unable to parse format" msgstr "不能解析格式" -#: builtin/for-each-ref.c:1063 +#: builtin/for-each-ref.c:1083 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<选项>] [<模式>]" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1098 msgid "quote placeholders suitably for shells" msgstr "引用占位符适用于 shells" -#: builtin/for-each-ref.c:1080 +#: builtin/for-each-ref.c:1100 msgid "quote placeholders suitably for perl" msgstr "引用占位符适用于 perl" -#: builtin/for-each-ref.c:1082 +#: builtin/for-each-ref.c:1102 msgid "quote placeholders suitably for python" msgstr "引用占位符适用于 python" -#: builtin/for-each-ref.c:1084 +#: builtin/for-each-ref.c:1104 msgid "quote placeholders suitably for Tcl" msgstr "引用占位符适用于 Tcl" -#: builtin/for-each-ref.c:1087 +#: builtin/for-each-ref.c:1107 msgid "show only <n> matched refs" msgstr "只显示 <n> 个匹配的引用" -#: builtin/for-each-ref.c:1088 builtin/replace.c:438 +#: builtin/for-each-ref.c:1108 builtin/replace.c:438 msgid "format" msgstr "格式" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1108 msgid "format to use for the output" msgstr "输出格式" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1109 msgid "key" msgstr "key" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1110 msgid "field name to sort on" msgstr "排序的字段名" -#: builtin/fsck.c:147 builtin/prune.c:137 +#: builtin/fsck.c:147 builtin/prune.c:236 msgid "Checking connectivity" msgstr "检查连接中" -#: builtin/fsck.c:540 +#: builtin/fsck.c:548 msgid "Checking object directories" msgstr "检查对象目录中" -#: builtin/fsck.c:603 +#: builtin/fsck.c:611 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<选项>] [<对象>...]" -#: builtin/fsck.c:609 +#: builtin/fsck.c:617 msgid "show unreachable objects" msgstr "显示不可达的对象" -#: builtin/fsck.c:610 +#: builtin/fsck.c:618 msgid "show dangling objects" msgstr "显示摇摆的对象" -#: builtin/fsck.c:611 +#: builtin/fsck.c:619 msgid "report tags" msgstr "报告 tags" -#: builtin/fsck.c:612 +#: builtin/fsck.c:620 msgid "report root nodes" msgstr "报告根节点" -#: builtin/fsck.c:613 +#: builtin/fsck.c:621 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" -#: builtin/fsck.c:614 +#: builtin/fsck.c:622 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点（默认）" -#: builtin/fsck.c:615 +#: builtin/fsck.c:623 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" -#: builtin/fsck.c:616 +#: builtin/fsck.c:624 msgid "enable more strict checking" msgstr "启用更严格的检查" -#: builtin/fsck.c:618 +#: builtin/fsck.c:626 msgid "write dangling objects in .git/lost-found" msgstr "将摇摆对象写入 .git/lost-found 中" -#: builtin/fsck.c:619 builtin/prune.c:108 +#: builtin/fsck.c:627 builtin/prune.c:198 msgid "show progress" msgstr "显示进度" -#: builtin/fsck.c:669 +#: builtin/fsck.c:677 msgid "Checking objects" msgstr "检查对象中" @@ -5535,55 +5645,55 @@ msgstr "检查对象中" msgid "git gc [<options>]" msgstr "git gc [<选项>]" -#: builtin/gc.c:79 +#: builtin/gc.c:67 #, c-format -msgid "Invalid gc.pruneexpire: '%s'" -msgstr "无效的 gc.pruneexpire：'%s'" +msgid "Invalid %s: '%s'" +msgstr "无效 %s：'%s'" -#: builtin/gc.c:107 +#: builtin/gc.c:112 #, c-format msgid "insanely long object directory %.*s" msgstr "不正常的长对象目录 %.*s" -#: builtin/gc.c:276 +#: builtin/gc.c:281 msgid "prune unreferenced objects" msgstr "清除未引用的对象" -#: builtin/gc.c:278 +#: builtin/gc.c:283 msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" -#: builtin/gc.c:279 +#: builtin/gc.c:284 msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" -#: builtin/gc.c:280 +#: builtin/gc.c:285 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" -#: builtin/gc.c:321 +#: builtin/gc.c:327 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在后台执行版本库打包以求最佳性能。\n" -#: builtin/gc.c:323 +#: builtin/gc.c:329 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包版本库以求最佳性能。\n" -#: builtin/gc.c:324 +#: builtin/gc.c:330 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护参见 \"git help gc\"。\n" -#: builtin/gc.c:342 +#: builtin/gc.c:348 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）" -#: builtin/gc.c:364 +#: builtin/gc.c:376 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" @@ -5786,7 +5896,7 @@ msgstr "分页显示匹配的文件" msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:741 builtin/show-ref.c:187 +#: builtin/grep.c:741 builtin/show-ref.c:189 msgid "show usage" msgstr "显示用法" @@ -5814,7 +5924,7 @@ msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:80 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -5822,36 +5932,36 @@ msgstr "" "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " "[--] <文件>..." -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:81 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <路径列表>" -#: builtin/hash-object.c:94 builtin/tag.c:612 +#: builtin/hash-object.c:92 builtin/tag.c:612 msgid "type" msgstr "类型" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:92 msgid "object type" msgstr "对象类型" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:93 msgid "write the object into the object database" msgstr "将对象写入对象数据库" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:95 msgid "read the object from stdin" msgstr "从标准输入读取对象" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:97 msgid "store file as is without filters" msgstr "原样存储文件不使用过滤器" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:98 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:99 msgid "process file as it were from this path" msgstr "处理文件并假设其来自于此路径" @@ -5979,291 +6089,291 @@ msgstr "用法：%s%s" msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别名" -#: builtin/index-pack.c:150 +#: builtin/index-pack.c:151 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" -#: builtin/index-pack.c:200 +#: builtin/index-pack.c:201 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型不匹配" -#: builtin/index-pack.c:220 +#: builtin/index-pack.c:221 #, c-format msgid "did not receive expected object %s" msgstr "未能获取期望的对象 %s" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "object %s: expected type %s, found %s" msgstr "对象 %s：期待类型 %s，却是 %s" -#: builtin/index-pack.c:265 +#: builtin/index-pack.c:266 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "无法填充 %d 字节" msgstr[1] "无法填充 %d 字节" -#: builtin/index-pack.c:275 +#: builtin/index-pack.c:276 msgid "early EOF" msgstr "过早的文件结束符（EOF）" -#: builtin/index-pack.c:276 +#: builtin/index-pack.c:277 msgid "read error on input" msgstr "输入上的读错误" -#: builtin/index-pack.c:288 +#: builtin/index-pack.c:289 msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:296 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:312 #, c-format msgid "unable to create '%s'" msgstr "不能创建 '%s'" -#: builtin/index-pack.c:316 +#: builtin/index-pack.c:317 #, c-format msgid "cannot open packfile '%s'" msgstr "无法打开包文件 '%s'" -#: builtin/index-pack.c:330 +#: builtin/index-pack.c:331 msgid "pack signature mismatch" msgstr "包签名不匹配" -#: builtin/index-pack.c:332 +#: builtin/index-pack.c:333 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "不支持包版本 %<PRIu32>" -#: builtin/index-pack.c:350 +#: builtin/index-pack.c:351 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "包中有错误的对象位于 %lu：%s" -#: builtin/index-pack.c:471 +#: builtin/index-pack.c:472 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" -#: builtin/index-pack.c:520 +#: builtin/index-pack.c:521 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" -#: builtin/index-pack.c:567 +#: builtin/index-pack.c:568 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: builtin/index-pack.c:569 +#: builtin/index-pack.c:570 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "包文件过早结束，缺少 %lu 字节" msgstr[1] "包文件过早结束，缺少 %lu 字节" -#: builtin/index-pack.c:595 +#: builtin/index-pack.c:596 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" -#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715 -#: builtin/index-pack.c:749 builtin/index-pack.c:758 +#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771 +#: builtin/index-pack.c:805 builtin/index-pack.c:814 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/index-pack.c:745 builtin/pack-objects.c:162 #: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "不能读 %s" -#: builtin/index-pack.c:755 +#: builtin/index-pack.c:811 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" -#: builtin/index-pack.c:769 +#: builtin/index-pack.c:825 #, c-format msgid "invalid blob object %s" msgstr "无效的数据（blob）对象 %s" -#: builtin/index-pack.c:783 +#: builtin/index-pack.c:839 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/index-pack.c:787 +#: builtin/index-pack.c:843 msgid "Error in object" msgstr "对象中出错" -#: builtin/index-pack.c:789 +#: builtin/index-pack.c:845 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c:861 builtin/index-pack.c:890 +#: builtin/index-pack.c:917 builtin/index-pack.c:948 msgid "failed to apply delta" msgstr "无法应用 delta" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:1081 +#: builtin/index-pack.c:1150 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c:1086 +#: builtin/index-pack.c:1155 msgid "cannot fstat packfile" msgstr "不能枚举包文件状态" -#: builtin/index-pack.c:1089 +#: builtin/index-pack.c:1158 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1169 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1194 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1133 +#: builtin/index-pack.c:1205 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1247 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1181 +#: builtin/index-pack.c:1253 #, c-format msgid "completed with %d local objects" msgstr "完成 %d 个本地对象" -#: builtin/index-pack.c:1191 +#: builtin/index-pack.c:1263 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1267 #, 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:1219 +#: builtin/index-pack.c:1291 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1367 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1322 +#: builtin/index-pack.c:1391 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1335 +#: builtin/index-pack.c:1404 #, c-format msgid "cannot write keep file '%s'" msgstr "无法写保留文件 '%s'" -#: builtin/index-pack.c:1343 +#: builtin/index-pack.c:1412 #, c-format msgid "cannot close written keep file '%s'" msgstr "无法关闭保留文件 '%s'" -#: builtin/index-pack.c:1356 +#: builtin/index-pack.c:1425 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1436 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1469 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1475 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" -#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1658 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1537 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1539 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1517 +#: builtin/index-pack.c:1586 #, 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:1524 +#: builtin/index-pack.c:1593 #, 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:1553 +#: builtin/index-pack.c:1622 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 -#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 +#: builtin/index-pack.c:1670 builtin/index-pack.c:1673 +#: builtin/index-pack.c:1685 builtin/index-pack.c:1689 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1634 +#: builtin/index-pack.c:1703 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 +#: builtin/index-pack.c:1707 builtin/index-pack.c:1716 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1655 +#: builtin/index-pack.c:1724 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包名参数" @@ -6332,22 +6442,22 @@ msgstr "模版未找到 %s" msgid "not copying templates of a wrong format version %d from '%s'" msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" -#: builtin/init-db.c:197 +#: builtin/init-db.c:211 #, c-format msgid "insane git directory %s" msgstr "不正常的 git 目录 %s" -#: builtin/init-db.c:331 builtin/init-db.c:334 +#: builtin/init-db.c:343 builtin/init-db.c:346 #, c-format msgid "%s already exists" msgstr "%s 已经存在" -#: builtin/init-db.c:363 +#: builtin/init-db.c:374 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" -#: builtin/init-db.c:366 +#: builtin/init-db.c:377 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" @@ -6355,25 +6465,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:426 +#: builtin/init-db.c:433 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git 版本库于 %s%s\n" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Reinitialized existing" msgstr "重新初始化现存的" -#: builtin/init-db.c:427 +#: builtin/init-db.c:434 msgid "Initialized empty" msgstr "初始化空的" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/init-db.c:428 +#: builtin/init-db.c:435 msgid " shared" msgstr "共享" -#: builtin/init-db.c:475 +#: builtin/init-db.c:482 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -6381,36 +6491,36 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " "[<目录>]" -#: builtin/init-db.c:498 +#: builtin/init-db.c:505 msgid "permissions" msgstr "权限" -#: builtin/init-db.c:499 +#: builtin/init-db.c:506 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 版本库是多个用户之间共享的" -#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171 +#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171 msgid "be quiet" msgstr "保持安静" -#: builtin/init-db.c:533 builtin/init-db.c:538 +#: builtin/init-db.c:540 builtin/init-db.c:545 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:542 +#: builtin/init-db.c:549 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:563 +#: builtin/init-db.c:570 #, 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:591 +#: builtin/init-db.c:598 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" @@ -6436,7 +6546,7 @@ msgid "trailer(s) to add" msgstr "要添加的签名" #: builtin/log.c:41 -msgid "git log [<options>] [<revision range>] [[--] <path>...]" +msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" #: builtin/log.c:42 @@ -6505,7 +6615,7 @@ msgstr "无法打开补丁文件 %s" msgid "Need exactly one range." msgstr "只需要一个范围。" -#: builtin/log.c:811 +#: builtin/log.c:813 msgid "Not a range." msgstr "不是一个范围。" @@ -6705,13 +6815,13 @@ msgstr "无法创建输出文件" msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:1638 +#: builtin/log.c:1637 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" -#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 +#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662 #, c-format msgid "Unknown commit %s" msgstr "未知提交 %s" @@ -6984,40 +7094,40 @@ msgstr "无合并信息 -- 未更新 HEAD\n" msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:559 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c:654 +#: builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入一树对象" -#: builtin/merge.c:678 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" -#: builtin/merge.c:692 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:705 +#: builtin/merge.c:683 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:794 +#: builtin/merge.c:772 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:803 +#: builtin/merge.c:781 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:809 +#: builtin/merge.c:787 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7031,47 +7141,52 @@ msgstr "" "\n" "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n" -#: builtin/merge.c:833 +#: builtin/merge.c:811 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:845 +#: builtin/merge.c:823 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:900 +#: builtin/merge.c:878 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:916 +#: builtin/merge.c:894 #, c-format msgid "'%s' is not a commit" msgstr "'%s' 不是一个提交" -#: builtin/merge.c:957 +#: builtin/merge.c:935 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:959 +#: builtin/merge.c:937 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程版本库。" -#: builtin/merge.c:961 +#: builtin/merge.c:939 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:966 +#: builtin/merge.c:944 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1122 +#: builtin/merge.c:1081 +#, c-format +msgid "could not close '%s'" +msgstr "不能关闭 '%s'" + +#: builtin/merge.c:1208 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1138 +#: builtin/merge.c:1224 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7079,11 +7194,11 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1141 git-pull.sh:34 +#: builtin/merge.c:1227 git-pull.sh:74 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: builtin/merge.c:1145 +#: builtin/merge.c:1231 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7091,100 +7206,100 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1148 +#: builtin/merge.c:1234 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1157 +#: builtin/merge.c:1243 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 与 --no-ff 同时使用。" -#: builtin/merge.c:1166 +#: builtin/merge.c:1251 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1198 -msgid "Can merge only exactly one commit into empty head" -msgstr "只能将一个提交合并到空分支上" - -#: builtin/merge.c:1201 +#: builtin/merge.c:1268 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1203 +#: builtin/merge.c:1270 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1208 +#: builtin/merge.c:1276 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1259 +#: builtin/merge.c:1278 +msgid "Can merge only exactly one commit into empty head" +msgstr "只能将一个提交合并到空分支上" + +#: builtin/merge.c:1333 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: builtin/merge.c:1262 +#: builtin/merge.c:1336 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" -#: builtin/merge.c:1265 +#: builtin/merge.c:1339 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有一个 GPG 签名。" -#: builtin/merge.c:1268 +#: builtin/merge.c:1342 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: builtin/merge.c:1349 +#: builtin/merge.c:1423 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1388 +#: builtin/merge.c:1462 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1395 +#: builtin/merge.c:1469 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1427 +#: builtin/merge.c:1501 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1450 builtin/merge.c:1529 +#: builtin/merge.c:1524 builtin/merge.c:1603 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1454 +#: builtin/merge.c:1528 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1520 +#: builtin/merge.c:1594 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1522 +#: builtin/merge.c:1596 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1605 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1543 +#: builtin/merge.c:1617 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" @@ -7372,7 +7487,7 @@ msgstr "%s，源=%s，目标=%s" msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 +#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" @@ -7737,7 +7852,7 @@ msgstr "注解引用" msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:989 builtin/remote.c:1621 +#: builtin/notes.c:989 builtin/remote.c:1618 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" @@ -7759,171 +7874,171 @@ msgstr "压缩错误 (%d)" msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c:1013 +#: builtin/pack-objects.c:1011 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" -#: builtin/pack-objects.c:2173 +#: builtin/pack-objects.c:2171 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c:2570 +#: builtin/pack-objects.c:2568 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2572 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:2597 +#: builtin/pack-objects.c:2595 #, c-format msgid "option %s does not accept negative form" msgstr "选项 %s 不接受否定格式" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2599 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "不能解析选项 %1$s 的值 '%2$s'" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2619 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "show progress meter" msgstr "显示进度表" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2626 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:2627 msgid "version[,offset]" msgstr "版本[,偏移]" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:2633 +#: builtin/pack-objects.c:2631 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从替代对象存储里借用对象" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:2660 +#: builtin/pack-objects.c:2658 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2661 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2664 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2667 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "include tag objects that refer to objects to be packed" msgstr "包括引用了打包对象的 tag" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:2674 parse-options.h:140 +#: builtin/pack-objects.c:2672 parse-options.h:139 msgid "time" msgstr "时间" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:2678 +#: builtin/pack-objects.c:2676 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2678 msgid "create packs suitable for shallow fetches" msgstr "创建适合浅克隆版本库获取的包" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2680 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2682 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2684 msgid "do not hide commits by grafts" msgstr "显示被嫁接隐藏的提交" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2686 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2688 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同时创建 bitmap 索引" -#: builtin/pack-objects.c:2781 +#: builtin/pack-objects.c:2779 msgid "Counting objects" msgstr "对象计数中" @@ -7951,18 +8066,56 @@ msgstr "正在删除重复对象" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" -#: builtin/prune.c:106 +#: builtin/prune.c:86 +#, c-format +msgid "Removing worktrees/%s: not a valid directory" +msgstr "删除工作区/%s：不是一个有效的目录" + +#: builtin/prune.c:92 +#, c-format +msgid "Removing worktrees/%s: gitdir file does not exist" +msgstr "删除 worktrees/%s：gitdir 文件不存在" + +#: builtin/prune.c:97 +#, c-format +msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)" + +#: builtin/prune.c:108 +#, c-format +msgid "Removing worktrees/%s: invalid gitdir file" +msgstr "删除 worktrees/%s：无效的 gitdir 文件" + +#: builtin/prune.c:124 +#, c-format +msgid "Removing worktrees/%s: gitdir file points to non-existent location" +msgstr "删除 worktrees/%s：gitdir 文件的指向不存在" + +#: builtin/prune.c:159 +#, c-format +msgid "failed to remove: %s" +msgstr "无法删除：%s" + +#: builtin/prune.c:196 msgid "do not remove, show only" msgstr "不删除，只显示" -#: builtin/prune.c:107 +#: builtin/prune.c:197 msgid "report pruned objects" msgstr "报告清除的对象" -#: builtin/prune.c:110 +#: builtin/prune.c:199 +msgid "prune .git/worktrees" +msgstr "清理 .git/worktrees" + +#: builtin/prune.c:201 msgid "expire objects older than <time>" msgstr "使早于给定时间的对象过期" +#: builtin/prune.c:216 +msgid "--worktrees does not take extra arguments" +msgstr "--worktrees 没有附加参数" + #: builtin/push.c:14 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<选项>] [<版本库> [<引用规则>...]]" @@ -8352,12 +8505,12 @@ msgstr "跳过应用稀疏检出过滤器" msgid "debug unpack-trees" msgstr "调试 unpack-trees" -#: builtin/reflog.c:429 +#: builtin/reflog.c:430 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" -#: builtin/reflog.c:546 builtin/reflog.c:551 +#: builtin/reflog.c:547 builtin/reflog.c:552 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' 不是一个有效的时间戳" @@ -8493,12 +8646,12 @@ msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" -#: builtin/remote.c:187 builtin/remote.c:643 +#: builtin/remote.c:187 builtin/remote.c:640 #, c-format msgid "remote %s already exists." msgstr "远程 %s 已经存在。" -#: builtin/remote.c:191 builtin/remote.c:647 +#: builtin/remote.c:191 builtin/remote.c:644 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一个有效的远程名称" @@ -8521,27 +8674,27 @@ msgstr "（匹配）" msgid "(delete)" msgstr "（删除）" -#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604 +#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 #, c-format msgid "Could not append '%s' to '%s'" msgstr "不能添加 '%s' 至 '%s'" -#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895 +#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892 #, c-format msgid "No such remote: %s" msgstr "没有这样的远程：%s" -#: builtin/remote.c:653 +#: builtin/remote.c:650 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "不能重命名配置小节 '%s' 到 '%s'" -#: builtin/remote.c:659 builtin/remote.c:847 +#: builtin/remote.c:656 builtin/remote.c:844 #, c-format msgid "Could not remove config section '%s'" msgstr "不能移除配置小节 '%s'" -#: builtin/remote.c:674 +#: builtin/remote.c:671 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8552,32 +8705,32 @@ msgstr "" "\t%s\n" "\t如果必要请手动更新配置。" -#: builtin/remote.c:680 +#: builtin/remote.c:677 #, c-format msgid "Could not append '%s'" msgstr "不能追加 '%s'" -#: builtin/remote.c:691 +#: builtin/remote.c:688 #, c-format msgid "Could not set '%s'" msgstr "不能设置 '%s'" -#: builtin/remote.c:713 +#: builtin/remote.c:710 #, c-format msgid "deleting '%s' failed" msgstr "删除 '%s' 失败" -#: builtin/remote.c:747 +#: builtin/remote.c:744 #, c-format msgid "creating '%s' failed" msgstr "创建 '%s' 失败" -#: builtin/remote.c:766 +#: builtin/remote.c:763 #, c-format msgid "Could not remove branch %s" msgstr "无法移除分支 %s" -#: builtin/remote.c:833 +#: builtin/remote.c:830 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8587,126 +8740,126 @@ msgid_plural "" msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用：" msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用：" -#: builtin/remote.c:948 +#: builtin/remote.c:945 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的（下一次获取将存储于 remotes/%s）" -#: builtin/remote.c:951 +#: builtin/remote.c:948 msgid " tracked" msgstr " 已跟踪" -#: builtin/remote.c:953 +#: builtin/remote.c:950 msgid " stale (use 'git remote prune' to remove)" msgstr " 过时（使用 'git remote prune' 来移除）" -#: builtin/remote.c:955 +#: builtin/remote.c:952 msgid " ???" msgstr " ???" -#: builtin/remote.c:996 +#: builtin/remote.c:993 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支" -#: builtin/remote.c:1003 +#: builtin/remote.c:1000 #, c-format msgid "rebases onto remote %s" msgstr "变基到远程 %s" -#: builtin/remote.c:1006 +#: builtin/remote.c:1003 #, c-format msgid " merges with remote %s" msgstr " 与远程 %s 合并" -#: builtin/remote.c:1007 +#: builtin/remote.c:1004 msgid " and with remote" msgstr " 且有远程" -#: builtin/remote.c:1009 +#: builtin/remote.c:1006 #, c-format msgid "merges with remote %s" msgstr "与远程 %s 合并" -#: builtin/remote.c:1010 +#: builtin/remote.c:1007 msgid " and with remote" msgstr " 且有远程" -#: builtin/remote.c:1056 +#: builtin/remote.c:1053 msgid "create" msgstr "创建" -#: builtin/remote.c:1059 +#: builtin/remote.c:1056 msgid "delete" msgstr "删除" -#: builtin/remote.c:1063 +#: builtin/remote.c:1060 msgid "up to date" msgstr "最新" -#: builtin/remote.c:1066 +#: builtin/remote.c:1063 msgid "fast-forwardable" msgstr "可快进" -#: builtin/remote.c:1069 +#: builtin/remote.c:1066 msgid "local out of date" msgstr "本地已过时" -#: builtin/remote.c:1076 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 强制推送至 %-*s (%s)" -#: builtin/remote.c:1079 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推送至 %-*s (%s)" -#: builtin/remote.c:1083 +#: builtin/remote.c:1080 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 强制推送至 %s" -#: builtin/remote.c:1086 +#: builtin/remote.c:1083 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" -#: builtin/remote.c:1154 +#: builtin/remote.c:1151 msgid "do not query remotes" msgstr "不查询远程" -#: builtin/remote.c:1181 +#: builtin/remote.c:1178 #, c-format msgid "* remote %s" msgstr "* 远程 %s" -#: builtin/remote.c:1182 +#: builtin/remote.c:1179 #, c-format msgid " Fetch URL: %s" msgstr " 获取地址：%s" -#: builtin/remote.c:1183 builtin/remote.c:1334 +#: builtin/remote.c:1180 builtin/remote.c:1331 msgid "(no URL)" msgstr "(无 URL)" -#: builtin/remote.c:1192 builtin/remote.c:1194 +#: builtin/remote.c:1189 builtin/remote.c:1191 #, c-format msgid " Push URL: %s" msgstr " 推送地址：%s" -#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200 +#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " HEAD branch: %s" msgstr " HEAD分支：%s" -#: builtin/remote.c:1202 +#: builtin/remote.c:1199 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n" -#: builtin/remote.c:1214 +#: builtin/remote.c:1211 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -8714,138 +8867,138 @@ msgstr[0] " 远程分支：%s" msgstr[1] " 远程分支：%s" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/remote.c:1217 builtin/remote.c:1244 +#: builtin/remote.c:1214 builtin/remote.c:1241 msgid " (status not queried)" msgstr "（状态未查询）" -#: builtin/remote.c:1226 +#: builtin/remote.c:1223 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:1234 +#: builtin/remote.c:1231 msgid " Local refs will be mirrored by 'git push'" msgstr " 本地引用将在 'git push' 时被镜像" -#: builtin/remote.c:1241 +#: builtin/remote.c:1238 #, 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:1262 +#: builtin/remote.c:1259 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "根据远程设置 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1264 +#: builtin/remote.c:1261 msgid "delete refs/remotes/<name>/HEAD" msgstr "删除 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1279 +#: builtin/remote.c:1276 msgid "Cannot determine remote HEAD" msgstr "无法确定远程 HEAD" -#: builtin/remote.c:1281 +#: builtin/remote.c:1278 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多个远程 HEAD 分支。请明确地选择一个用命令：" -#: builtin/remote.c:1291 +#: builtin/remote.c:1288 #, c-format msgid "Could not delete %s" msgstr "无法删除 %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1296 #, c-format msgid "Not a valid ref: %s" msgstr "不是一个有效引用：%s" -#: builtin/remote.c:1301 +#: builtin/remote.c:1298 #, c-format msgid "Could not setup %s" msgstr "不能设置 %s" # 译者：注意保持前导空格 -#: builtin/remote.c:1319 +#: builtin/remote.c:1316 #, c-format msgid " %s will become dangling!" msgstr " %s 将成为摇摆状态！" # 译者：注意保持前导空格 -#: builtin/remote.c:1320 +#: builtin/remote.c:1317 #, c-format msgid " %s has become dangling!" msgstr " %s 已成为摇摆状态！" -#: builtin/remote.c:1330 +#: builtin/remote.c:1327 #, c-format msgid "Pruning %s" msgstr "修剪 %s" -#: builtin/remote.c:1331 +#: builtin/remote.c:1328 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: builtin/remote.c:1354 +#: builtin/remote.c:1351 #, c-format msgid " * [would prune] %s" msgstr " * [将删除] %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1354 #, c-format msgid " * [pruned] %s" msgstr " * [已删除] %s" -#: builtin/remote.c:1402 +#: builtin/remote.c:1399 msgid "prune remotes after fetching" msgstr "抓取后清除远程" -#: builtin/remote.c:1468 builtin/remote.c:1542 +#: builtin/remote.c:1465 builtin/remote.c:1539 #, c-format msgid "No such remote '%s'" msgstr "没有此远程 '%s'" -#: builtin/remote.c:1488 +#: builtin/remote.c:1485 msgid "add branch" msgstr "添加分支" -#: builtin/remote.c:1495 +#: builtin/remote.c:1492 msgid "no remote specified" msgstr "未指定远程" -#: builtin/remote.c:1517 +#: builtin/remote.c:1514 msgid "manipulate push URLs" msgstr "操作推送 URLS" -#: builtin/remote.c:1519 +#: builtin/remote.c:1516 msgid "add URL" msgstr "添加 URL" -#: builtin/remote.c:1521 +#: builtin/remote.c:1518 msgid "delete URLs" msgstr "删除 URLS" -#: builtin/remote.c:1528 +#: builtin/remote.c:1525 msgid "--add --delete doesn't make sense" msgstr "--add --delete 无意义" -#: builtin/remote.c:1568 +#: builtin/remote.c:1565 #, c-format msgid "Invalid old URL pattern: %s" msgstr "无效的旧URL匹配模版：%s" -#: builtin/remote.c:1576 +#: builtin/remote.c:1573 #, c-format msgid "No such URL found: %s" msgstr "未找到此URL：%s" -#: builtin/remote.c:1578 +#: builtin/remote.c:1575 msgid "Will not delete all non-push URLs" msgstr "将不会删除所有非推送URL地址" -#: builtin/remote.c:1592 +#: builtin/remote.c:1589 msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于子命令之前" @@ -8917,7 +9070,7 @@ msgstr "每个包的最大尺寸" msgid "repack objects in packs marked with .keep" msgstr "对标记为 .keep 的包中的对象重新打包" -#: builtin/repack.c:375 +#: builtin/repack.c:377 #, c-format msgid "removing '%s' failed" msgstr "删除 '%s' 失败" @@ -9288,7 +9441,7 @@ msgstr "" "\n" "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" -#: builtin/rm.c:231 +#: builtin/rm.c:230 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -9298,7 +9451,7 @@ msgid_plural "" msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样：" msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样：" -#: builtin/rm.c:236 +#: builtin/rm.c:235 msgid "" "\n" "(use -f to force removal)" @@ -9306,13 +9459,13 @@ msgstr "" "\n" "（使用 -f 强制删除）" -#: builtin/rm.c:240 +#: builtin/rm.c:239 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "如下文件相对索引区的内容有修改" msgstr[1] "如下文件相对索引区的内容有修改" -#: builtin/rm.c:244 builtin/rm.c:255 +#: builtin/rm.c:243 builtin/rm.c:254 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -9320,42 +9473,42 @@ msgstr "" "\n" "（使用 --cached 保留本地文件，或用 -f 强制删除）" -#: builtin/rm.c:252 +#: builtin/rm.c:251 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "如下文件有本地修改：" msgstr[1] "如下文件有本地修改：" -#: builtin/rm.c:270 +#: builtin/rm.c:269 msgid "do not list removed files" msgstr "不列出删除的文件" -#: builtin/rm.c:271 +#: builtin/rm.c:270 msgid "only remove from the index" msgstr "只从索引区删除" -#: builtin/rm.c:272 +#: builtin/rm.c:271 msgid "override the up-to-date check" msgstr "忽略文件更新状态检查" -#: builtin/rm.c:273 +#: builtin/rm.c:272 msgid "allow recursive removal" msgstr "允许递归删除" -#: builtin/rm.c:275 +#: builtin/rm.c:274 msgid "exit with a zero status even if nothing matched" msgstr "即使没有匹配，也以零状态退出" -#: builtin/rm.c:318 +#: builtin/rm.c:317 msgid "Please, stage your changes to .gitmodules or stash them to proceed" msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" -#: builtin/rm.c:336 +#: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" msgstr "未提供 -r 选项不会递归删除 '%s'" -#: builtin/rm.c:375 +#: builtin/rm.c:374 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm：不能删除 %s" @@ -9405,67 +9558,67 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:659 msgid "show remote-tracking and local branches" msgstr "显示远程跟踪的和本地的分支" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:661 msgid "show remote-tracking branches" msgstr "显示远程跟踪的分支" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:663 msgid "color '*!+-' corresponding to the branch" msgstr "着色 '*!+-' 到相应的分支" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:665 msgid "show <n> more commits after the common ancestor" msgstr "显示共同祖先后的 <n> 个提交" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:667 msgid "synonym to more=-1" msgstr "和 more=-1 同义" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:668 msgid "suppress naming strings" msgstr "不显示字符串命名" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:670 msgid "include the current branch" msgstr "包括当前分支" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:672 msgid "name commits with their object names" msgstr "以对象名字命名提交" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:674 msgid "show possible merge bases" msgstr "显示可能合并的基线" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:676 msgid "show refs unreachable from any other ref" msgstr "显示没有任何引用的的引用" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:678 msgid "show commits in topological order" msgstr "以拓扑顺序显示提交" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:681 msgid "show only commits not on the first branch" msgstr "只显示不在第一个分支上的提交" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:683 msgid "show merges reachable from only one tip" msgstr "显示仅一个分支可访问的合并提交" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:685 msgid "topologically sort, maintaining date order where possible" msgstr "拓扑方式排序，并尽可能地保持日期顺序" -#: builtin/show-branch.c:681 +#: builtin/show-branch.c:688 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:682 +#: builtin/show-branch.c:689 msgid "show <n> most recent ref-log entries starting at base" msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" @@ -9481,35 +9634,35 @@ msgstr "" msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "git show-ref --exclude-existing[=模式] < 引用列表" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:170 msgid "only show tags (can be combined with heads)" msgstr "只显示 tags（可以和头共用）" -#: builtin/show-ref.c:169 +#: builtin/show-ref.c:171 msgid "only show heads (can be combined with tags)" msgstr "只显示头（可以和 tags 共用）" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:172 msgid "stricter reference checking, requires exact ref path" msgstr "更严格的引用检测，需要精确的引用路径" -#: builtin/show-ref.c:173 builtin/show-ref.c:175 +#: builtin/show-ref.c:175 builtin/show-ref.c:177 msgid "show the HEAD reference, even if it would be filtered out" msgstr "显示 HEAD 引用，即使被过滤掉" -#: builtin/show-ref.c:177 +#: builtin/show-ref.c:179 msgid "dereference tags into object IDs" msgstr "转换 tags 到对象ID" -#: builtin/show-ref.c:179 +#: builtin/show-ref.c:181 msgid "only show SHA1 hash using <n> digits" msgstr "只显示使用 <n> 个数字的 SHA1 哈希" -#: builtin/show-ref.c:183 +#: builtin/show-ref.c:185 msgid "do not print results to stdout (useful with --verify)" msgstr "不打印结果到标准输出（例如与 --verify 参数共用）" -#: builtin/show-ref.c:185 +#: builtin/show-ref.c:187 msgid "show refs from stdin that aren't in local repository" msgstr "显示从标准输入中读入的不在本地版本库中的引用" @@ -9766,122 +9919,188 @@ msgstr "已更新tag '%s'（曾为 %s）\n" msgid "Unpacking objects" msgstr "展开对象中" -#: builtin/update-index.c:403 +#: builtin/update-index.c:70 +#, c-format +msgid "failed to create directory %s" +msgstr "无法创建目录 %s" + +#: builtin/update-index.c:76 +#, c-format +msgid "failed to stat %s" +msgstr "无法枚举 %s 状态" + +#: builtin/update-index.c:86 +#, c-format +msgid "failed to create file %s" +msgstr "无法创建文件 %s" + +#: builtin/update-index.c:94 +#, c-format +msgid "failed to delete file %s" +msgstr "无法删除文件 %s" + +#: builtin/update-index.c:101 builtin/update-index.c:203 +#, c-format +msgid "failed to delete directory %s" +msgstr "无法删除目录 %s" + +#: builtin/update-index.c:124 +#, c-format +msgid "Testing " +msgstr "正在测试 " + +#: builtin/update-index.c:136 +msgid "directory stat info does not change after adding a new file" +msgstr "添加一个新文件后，目录的状态信息未改变" + +#: builtin/update-index.c:149 +msgid "directory stat info does not change after adding a new directory" +msgstr "添加一个新目录后，目录的状态信息未改变" + +#: builtin/update-index.c:162 +msgid "directory stat info changes after updating a file" +msgstr "更新一个文件后，目录的状态信息被修改" + +#: builtin/update-index.c:173 +msgid "directory stat info changes after adding a file inside subdirectory" +msgstr "在子目录中添加文件后，目录的状态信息被修改" + +#: builtin/update-index.c:184 +msgid "directory stat info does not change after deleting a file" +msgstr "删除一个文件后，目录的状态信息未改变" + +#: builtin/update-index.c:197 +msgid "directory stat info does not change after deleting a directory" +msgstr "删除一个目录后，目录的状态信息未改变" + +#: builtin/update-index.c:204 +msgid " OK" +msgstr " OK" + +#: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<选项>] [--] [<文件>...]" -#: builtin/update-index.c:757 +#: builtin/update-index.c:918 msgid "continue refresh even when index needs update" msgstr "当索引需要更新时继续刷新" -#: builtin/update-index.c:760 +#: builtin/update-index.c:921 msgid "refresh: ignore submodules" msgstr "刷新：忽略子模组" -#: builtin/update-index.c:763 +#: builtin/update-index.c:924 msgid "do not ignore new files" msgstr "不忽略新的文件" -#: builtin/update-index.c:765 +#: builtin/update-index.c:926 msgid "let files replace directories and vice-versa" msgstr "让文件替换目录（反之亦然）" -#: builtin/update-index.c:767 +#: builtin/update-index.c:928 msgid "notice files missing from worktree" msgstr "通知文件从工作区丢失" -#: builtin/update-index.c:769 +#: builtin/update-index.c:930 msgid "refresh even if index contains unmerged entries" msgstr "即使索引区包含未合并的条目也执行刷新" -#: builtin/update-index.c:772 +#: builtin/update-index.c:933 msgid "refresh stat information" msgstr "刷新统计信息" -#: builtin/update-index.c:776 +#: builtin/update-index.c:937 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置" -#: builtin/update-index.c:780 +#: builtin/update-index.c:941 msgid "<mode>,<object>,<path>" msgstr "<存取模式>,<对象>,<路径>" -#: builtin/update-index.c:781 +#: builtin/update-index.c:942 msgid "add the specified entry to the index" msgstr "添加指定的条目到索引区" -#: builtin/update-index.c:785 +#: builtin/update-index.c:946 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:786 +#: builtin/update-index.c:947 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的可执行位" -#: builtin/update-index.c:790 +#: builtin/update-index.c:951 msgid "mark files as \"not changing\"" msgstr "把文件标记为 \"没有变更\"" -#: builtin/update-index.c:793 +#: builtin/update-index.c:954 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged 位" -#: builtin/update-index.c:796 +#: builtin/update-index.c:957 msgid "mark files as \"index-only\"" msgstr "把文件标记为 \"仅索引\"" -#: builtin/update-index.c:799 +#: builtin/update-index.c:960 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree 位" -#: builtin/update-index.c:802 +#: builtin/update-index.c:963 msgid "add to index only; do not add content to object database" msgstr "只添加到索引区；不添加对象到对象库" -#: builtin/update-index.c:804 +#: builtin/update-index.c:965 msgid "remove named paths even if present in worktree" msgstr "即使存在工作区里，也删除路径" -#: builtin/update-index.c:806 +#: builtin/update-index.c:967 msgid "with --stdin: input lines are terminated by null bytes" msgstr "携带 --stdin：输入的行以 null 字符终止" -#: builtin/update-index.c:808 +#: builtin/update-index.c:969 msgid "read list of paths to be updated from standard input" msgstr "从标准输入中读取需要更新的路径列表" -#: builtin/update-index.c:812 +#: builtin/update-index.c:973 msgid "add entries from standard input to the index" msgstr "从标准输入添加条目到索引区" -#: builtin/update-index.c:816 +#: builtin/update-index.c:977 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "为指定文件重新生成第2和第3暂存区" -#: builtin/update-index.c:820 +#: builtin/update-index.c:981 msgid "only update entries that differ from HEAD" msgstr "只更新与 HEAD 不同的条目" -#: builtin/update-index.c:824 +#: builtin/update-index.c:985 msgid "ignore files missing from worktree" msgstr "忽略工作区丢失的文件" -#: builtin/update-index.c:827 +#: builtin/update-index.c:988 msgid "report actions to standard output" msgstr "在标准输出显示操作" -#: builtin/update-index.c:829 +#: builtin/update-index.c:990 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘记保存的未解决的冲突" -#: builtin/update-index.c:833 +#: builtin/update-index.c:994 msgid "write index in this format" msgstr "以这种格式写入索引区" -#: builtin/update-index.c:835 +#: builtin/update-index.c:996 msgid "enable or disable split index" msgstr "启用或禁用索引拆分" +#: builtin/update-index.c:998 +msgid "enable/disable untracked cache" +msgstr "启用/禁用对未跟踪文件的缓存" + +#: builtin/update-index.c:1000 +msgid "enable untracked cache without testing the filesystem" +msgstr "无需检测文件系统，启用对未跟踪文件的缓存" + #: builtin/update-ref.c:9 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" @@ -9976,107 +10195,127 @@ msgstr "" "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" "帮助。" -#: common-cmds.h:8 +#: common-cmds.h:10 +msgid "start a working area (see also: git help tutorial)" +msgstr "开始一个工作区（参见：git help tutorial）" + +#: common-cmds.h:11 +msgid "work on the current change (see also: git help everyday)" +msgstr "在当前变更上工作（参见：git help everyday）" + +#: common-cmds.h:12 +msgid "examine the history and state (see also: git help revisions)" +msgstr "检查历史和状态（参见：git help revisions）" + +#: common-cmds.h:13 +msgid "grow, mark and tweak your common history" +msgstr "扩展、标记和调校您的历史记录" + +#: common-cmds.h:14 +msgid "collaborate (see also: git help workflows)" +msgstr "协同（参见：git help workflows）" + +#: common-cmds.h:18 msgid "Add file contents to the index" msgstr "添加文件内容至索引" -#: common-cmds.h:9 +#: common-cmds.h:19 msgid "Find by binary search the change that introduced a bug" msgstr "通过二分查找定位引入 bug 的变更" -#: common-cmds.h:10 +#: common-cmds.h:20 msgid "List, create, or delete branches" msgstr "列出、创建或删除分支" -#: common-cmds.h:11 +#: common-cmds.h:21 msgid "Checkout a branch or paths to the working tree" msgstr "检出一个分支或路径到工作区" -#: common-cmds.h:12 +#: common-cmds.h:22 msgid "Clone a repository into a new directory" msgstr "克隆一个版本库到一个新目录" -#: common-cmds.h:13 +#: common-cmds.h:23 msgid "Record changes to the repository" msgstr "记录变更到版本库" -#: common-cmds.h:14 +#: common-cmds.h:24 msgid "Show changes between commits, commit and working tree, etc" msgstr "显示提交之间、提交和工作区之间等的差异" -#: common-cmds.h:15 +#: common-cmds.h:25 msgid "Download objects and refs from another repository" msgstr "从另外一个版本库下载对象和引用" -#: common-cmds.h:16 +#: common-cmds.h:26 msgid "Print lines matching a pattern" msgstr "输出和模式匹配的行" -#: common-cmds.h:17 +#: common-cmds.h:27 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库" -#: common-cmds.h:18 +#: common-cmds.h:28 msgid "Show commit logs" msgstr "显示提交日志" -#: common-cmds.h:19 +#: common-cmds.h:29 msgid "Join two or more development histories together" msgstr "合并两个或更多开发历史" -#: common-cmds.h:20 +#: common-cmds.h:30 msgid "Move or rename a file, a directory, or a symlink" msgstr "移动或重命名一个文件、目录或符号链接" -#: common-cmds.h:21 +#: common-cmds.h:31 msgid "Fetch from and integrate with another repository or a local branch" msgstr "获取并整合另外的版本库或一个本地分支" -#: common-cmds.h:22 +#: common-cmds.h:32 msgid "Update remote refs along with associated objects" msgstr "更新远程引用和相关的对象" -#: common-cmds.h:23 +#: common-cmds.h:33 msgid "Forward-port local commits to the updated upstream head" msgstr "本地提交转移至更新后的上游分支中" -#: common-cmds.h:24 +#: common-cmds.h:34 msgid "Reset current HEAD to the specified state" msgstr "重置当前HEAD到指定状态" -#: common-cmds.h:25 +#: common-cmds.h:35 msgid "Remove files from the working tree and from the index" msgstr "从工作区和索引中删除文件" -#: common-cmds.h:26 +#: common-cmds.h:36 msgid "Show various types of objects" msgstr "显示各种类型的对象" -#: common-cmds.h:27 +#: common-cmds.h:37 msgid "Show the working tree status" msgstr "显示工作区状态" -#: common-cmds.h:28 +#: common-cmds.h:38 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象" -#: parse-options.h:143 +#: parse-options.h:142 msgid "expiry-date" msgstr "到期时间" -#: parse-options.h:158 +#: parse-options.h:157 msgid "no-op (backward compatibility)" msgstr "空操作（向后兼容）" -#: parse-options.h:232 +#: parse-options.h:231 msgid "be more verbose" msgstr "更加详细" -#: parse-options.h:234 +#: parse-options.h:233 msgid "be more quiet" msgstr "更加安静" -#: parse-options.h:240 +#: parse-options.h:239 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> 位数字显示 SHA-1 哈希值" @@ -10088,13 +10327,13 @@ msgstr "如果可能，重用冲突解决更新索引" msgid "You need to set your committer info first" msgstr "您需要先设置你的提交者信息" -#: git-am.sh:98 +#: git-am.sh:100 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" -#: git-am.sh:108 +#: git-am.sh:110 #, sh-format msgid "" "When you have resolved this problem, run \"$cmdline --continue\".\n" @@ -10105,19 +10344,19 @@ msgstr "" "如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n" "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" -#: git-am.sh:124 +#: git-am.sh:126 msgid "Cannot fall back to three-way merge." msgstr "无法求助于三路合并。" -#: git-am.sh:140 +#: git-am.sh:142 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "版本库缺乏必要的数据（blob）对象以进行三路合并。" -#: git-am.sh:142 +#: git-am.sh:144 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三路合并的）基础目录树..." -#: git-am.sh:157 +#: git-am.sh:159 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10125,28 +10364,28 @@ msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据（blob）对象上。" -#: git-am.sh:166 +#: git-am.sh:168 msgid "Falling back to patching base and 3-way merge..." msgstr "转而在基础版本上打补丁及进行三路合并..." -#: git-am.sh:182 +#: git-am.sh:185 msgid "Failed to merge in the changes." msgstr "无法合并变更。" -#: git-am.sh:277 +#: git-am.sh:280 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: git-am.sh:364 +#: git-am.sh:367 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "不支持 $patch_format 补丁格式。" -#: git-am.sh:366 +#: git-am.sh:369 msgid "Patch format detection failed." msgstr "补丁格式检测失败。" -#: git-am.sh:398 +#: git-am.sh:407 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." @@ -10154,16 +10393,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被删除。\n" "请不要再使用它了。" -#: git-am.sh:496 +#: git-am.sh:507 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "之前的变基目录 $dotest 仍然存在，但却提供了 mbox。" -#: git-am.sh:501 +#: git-am.sh:512 msgid "Please make up your mind. --skip or --abort?" msgstr "请下决心。--skip 或是 --abort ？" -#: git-am.sh:537 +#: git-am.sh:560 #, sh-format msgid "" "Stray $dotest directory found.\n" @@ -10172,16 +10411,16 @@ msgstr "" "发现了错误的 $dotest 目录。\n" "使用 \"git am --abort\" 删除它。" -#: git-am.sh:545 +#: git-am.sh:568 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" -#: git-am.sh:612 +#: git-am.sh:635 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "脏的索引：不能应用补丁（脏文件：$files）" -#: git-am.sh:722 +#: git-am.sh:747 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -10192,15 +10431,15 @@ msgstr "" "如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n" "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" -#: git-am.sh:749 +#: git-am.sh:774 msgid "Patch does not have a valid e-mail address." msgstr "补丁中没有一个有效的邮件地址。" -#: git-am.sh:796 +#: git-am.sh:821 msgid "cannot be interactive without stdin connected to a terminal." msgstr "标准输入没有和终端关联，不能进行交互式操作。" -#: git-am.sh:800 +#: git-am.sh:825 msgid "Commit Body is:" msgstr "提交内容为：" @@ -10208,16 +10447,16 @@ 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. -#: git-am.sh:807 +#: git-am.sh:832 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -#: git-am.sh:843 +#: git-am.sh:868 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "正应用：$FIRSTLINE" -#: git-am.sh:864 +#: git-am.sh:889 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10227,22 +10466,22 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: git-am.sh:872 +#: git-am.sh:897 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？" -#: git-am.sh:888 +#: git-am.sh:913 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: git-am.sh:898 +#: git-am.sh:923 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "补丁失败于 $msgnum $FIRSTLINE" -#: git-am.sh:901 +#: git-am.sh:926 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" @@ -10251,7 +10490,7 @@ msgstr "" "失败的补丁文件副本位于：\n" " $dotest/patch" -#: git-am.sh:919 +#: git-am.sh:945 msgid "applying to an empty history" msgstr "正应用到一个空历史上" @@ -10410,7 +10649,7 @@ msgstr "" msgid "bisect run success" msgstr "二分查找运行成功" -#: git-pull.sh:21 +#: git-pull.sh:61 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" @@ -10419,11 +10658,11 @@ msgstr "" "Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件，\n" "然后酌情使用 'git add/rm <文件>' 标记解决方案，再做提交。" -#: git-pull.sh:25 +#: git-pull.sh:65 msgid "Pull is not possible because you have unmerged files." msgstr "Pull 不可用，因为您尚有未合并的文件。" -#: git-pull.sh:31 +#: git-pull.sh:71 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -10431,11 +10670,11 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: git-pull.sh:245 +#: git-pull.sh:285 msgid "updating an unborn branch with changes added to the index" msgstr "更新尚未诞生的分支，变更添加至索引" -#: git-pull.sh:269 +#: git-pull.sh:311 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -10445,11 +10684,11 @@ msgstr "" "警告：fetch 更新了当前的分支。您的工作区\n" "警告：从原提交 $orig_head 快进。" -#: git-pull.sh:294 +#: git-pull.sh:336 msgid "Cannot merge multiple branches into empty head" msgstr "无法将多个分支合并到空分支" -#: git-pull.sh:298 +#: git-pull.sh:340 msgid "Cannot rebase onto multiple branches" msgstr "无法变基到多个分支" @@ -10644,7 +10883,7 @@ msgstr "无法用 $w_commit 更新 $ref_stash" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:238 +#: git-stash.sh:241 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -10653,85 +10892,90 @@ msgstr "" "错误：'stash save' 的未知选项：$option\n" " 要提供一个描述信息，使用 git stash save -- '$option'" -#: git-stash.sh:259 +#: git-stash.sh:262 msgid "No local changes to save" msgstr "没有要保存的本地修改" -#: git-stash.sh:263 +#: git-stash.sh:266 msgid "Cannot initialize stash" msgstr "无法初始化 stash" -#: git-stash.sh:267 +#: git-stash.sh:270 msgid "Cannot save the current status" msgstr "无法保存当前状态" -#: git-stash.sh:285 +#: git-stash.sh:288 msgid "Cannot remove worktree changes" msgstr "无法删除工作区变更" -#: git-stash.sh:384 +#: git-stash.sh:389 +#, sh-format +msgid "unknown option: $opt" +msgstr "未知选项: $opt" + +#: git-stash.sh:399 msgid "No stash found." msgstr "未发现 stash。" -#: git-stash.sh:391 +#: git-stash.sh:406 #, sh-format msgid "Too many revisions specified: $REV" msgstr "指定了太多的版本：$REV" -#: git-stash.sh:397 +#: git-stash.sh:412 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference 不是一个有效的引用" -#: git-stash.sh:425 +#: git-stash.sh:440 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' 不是 stash 样提交" -#: git-stash.sh:436 +#: git-stash.sh:451 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' 不是一个 stash 引用" -#: git-stash.sh:444 +#: git-stash.sh:459 msgid "unable to refresh index" msgstr "无法刷新索引" -#: git-stash.sh:448 +#: git-stash.sh:463 msgid "Cannot apply a stash in the middle of a merge" msgstr "无法在合并过程中恢复进度" -#: git-stash.sh:456 +#: git-stash.sh:471 msgid "Conflicts in index. Try without --index." msgstr "索引中有冲突。尝试不使用 --index。" -#: git-stash.sh:458 +#: git-stash.sh:473 msgid "Could not save index tree" msgstr "不能保存索引树" -#: git-stash.sh:492 +#: git-stash.sh:507 msgid "Cannot unstage modified files" msgstr "无法还原修改的文件" -#: git-stash.sh:507 +#: git-stash.sh:522 msgid "Index was not unstashed." msgstr "索引的进度没有被恢复。" -#: git-stash.sh:530 +#: git-stash.sh:545 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" -#: git-stash.sh:531 +#: git-stash.sh:546 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}：不能丢弃进度条目" -#: git-stash.sh:539 +#: git-stash.sh:554 msgid "No branch name specified" msgstr "未指定分支名" -#: git-stash.sh:611 +#: git-stash.sh:626 msgid "(To restore them type \"git stash apply\")" msgstr "（为恢复数据输入 \"git stash apply\"）" @@ -11017,3 +11261,18 @@ msgstr "无法递归进子模组路径 '$sm_path'" #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "为 '$displaypath' 同步子模组 url" + +#~ msgid "Cannot apply stash: Your index contains uncommitted changes." +#~ msgstr "无法应用 stash：您的索引中包含未提交的变更。" + +#~ msgid "The most commonly used git commands are:" +#~ msgstr "最常用的 git 命令有：" + +#~ msgid "No such branch: '%s'" +#~ msgstr "没有此分支：'%s'" + +#~ msgid "Could not create git link %s" +#~ msgstr "不能创建 git link %s" + +#~ msgid "Invalid gc.pruneexpire: '%s'" +#~ msgstr "无效的 gc.pruneexpire：'%s'" |