diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/bg.po | 3269 | ||||
| -rw-r--r-- | po/ca.po | 4577 | ||||
| -rw-r--r-- | po/de.po | 4396 | ||||
| -rw-r--r-- | po/fr.po | 3235 | ||||
| -rw-r--r-- | po/git.pot | 3125 | ||||
| -rw-r--r-- | po/sv.po | 3225 | ||||
| -rw-r--r-- | po/vi.po | 3326 | ||||
| -rw-r--r-- | po/zh_CN.po | 3219 |
8 files changed, 15151 insertions, 13221 deletions
@@ -54,7 +54,8 @@ # porcelain команди от потребителско ниво # pack [noun] пакетен файл - fixme in glossary # mainline базово подаване - при cherry-pick на merge - към коя версия да се изчислява разликата -# +# token лексема +# trailer епилог/завършек на съобщение # ---- # FAILED to parse неуспешен анализ на... -> неразпозната стойност на # blob обект BLOB @@ -129,8 +130,8 @@ msgid "" msgstr "" "Project-Id-Version: git master\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2014-08-04 14:48+0800\n" -"PO-Revision-Date: 2014-08-03 13:01+0300\n" +"POT-Creation-Date: 2014-11-20 09:42+0800\n" +"PO-Revision-Date: 2014-11-20 16:09+0800\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -148,106 +149,104 @@ msgstr "Подсказка: %.*s\n" #: advice.c:88 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, or use\n" -"'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" "Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“\n" -"за да отбележите коригирането им и ги подадете или просто ползвайте:\n" -"„git commit -a“" +"за да отбележите коригирането им. След това извършете подаването." -#: archive.c:10 +#: archive.c:11 msgid "git archive [options] <tree-ish> [<path>...]" msgstr "git archive [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО [ПЪТ…]" -#: archive.c:11 +#: archive.c:12 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:12 +#: archive.c:13 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" msgstr "" "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО " "[ПЪТ…]" -#: archive.c:13 +#: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list" -#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "пътят „%s“ не съвпада с никой файл" -#: archive.c:328 +#: archive.c:419 msgid "fmt" msgstr "ФОРМАТ" -#: archive.c:328 +#: archive.c:419 msgid "archive format" msgstr "ФОРМАТ на архива" -#: archive.c:329 builtin/log.c:1201 +#: archive.c:420 builtin/log.c:1204 msgid "prefix" msgstr "префикс" -#: archive.c:330 +#: archive.c:421 msgid "prepend prefix to each pathname in the archive" msgstr "добавяне на този префикс към всеки път в архива" -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709 -#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412 -#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151 +#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411 +#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "файл" -#: archive.c:332 builtin/archive.c:89 +#: archive.c:423 builtin/archive.c:89 msgid "write the archive to this file" msgstr "запазване на архива в този файл" -#: archive.c:334 +#: archive.c:425 msgid "read .gitattributes in working directory" msgstr "изчитане на „.gitattributes“ в работната директория" -#: archive.c:335 +#: archive.c:426 msgid "report archived files on stderr" msgstr "извеждане на архивираните файлове на стандартната грешка" -#: archive.c:336 +#: archive.c:427 msgid "store only" msgstr "само съхранение без компресиране" -#: archive.c:337 +#: archive.c:428 msgid "compress faster" msgstr "бързо компресиране" -#: archive.c:345 +#: archive.c:436 msgid "compress better" msgstr "добро компресиране" -#: archive.c:348 +#: archive.c:439 msgid "list supported archive formats" msgstr "извеждане на списъка с поддържаните формати" -#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 +#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85 msgid "repo" msgstr "хранилище" -#: archive.c:351 builtin/archive.c:91 +#: archive.c:442 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "изтегляне на архива от отдалеченото ХРАНИЛИЩЕ" -#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 +#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490 msgid "command" msgstr "команда" -#: archive.c:353 builtin/archive.c:93 +#: archive.c:444 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "път към отдалечената команда „git-upload-archive“" -#: attr.c:259 +#: attr.c:258 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -309,31 +308,31 @@ msgstr "Клонът „%s“ ще следи локалния указател msgid "Not tracking: ambiguous information for ref %s" msgstr "Няма следене: двусмислена информация за указателя „%s“" -#: branch.c:178 +#: branch.c:162 #, c-format msgid "'%s' is not a valid branch name." msgstr "„%s“ не е позволено име за клон." -#: branch.c:183 +#: branch.c:167 #, c-format msgid "A branch named '%s' already exists." msgstr "Вече съществува клон с име „%s“." -#: branch.c:191 +#: branch.c:175 msgid "Cannot force update the current branch." msgstr "Текущият клон не може да бъде принудително обновен." -#: branch.c:211 +#: branch.c:195 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "Зададените настройки за следенето са грешни — началото „%s“ не е клон." -#: branch.c:213 +#: branch.c:197 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "заявеният отдалечен клон „%s“ не съществува" -#: branch.c:215 +#: branch.c:199 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -352,111 +351,109 @@ msgstr "" "може да използвате „git push -u“, за да настроите към кой клон да се " "изтласква." -#: branch.c:260 +#: branch.c:243 #, c-format msgid "Not a valid object name: '%s'." msgstr "Неправилно име на обект: „%s“" -#: branch.c:280 +#: branch.c:263 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Двусмислено име на обект: „%s“" -#: branch.c:285 +#: branch.c:268 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Неправилно място за начало на клон: „%s“" -#: branch.c:291 -msgid "Failed to lock ref for update" -msgstr "Указателят не може да бъде заключен, за да бъде обновен" - -#: branch.c:309 -msgid "Failed to write ref" -msgstr "Указателят не може да бъде записан" - -#: bundle.c:33 +#: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "Файлът „%s“ не изглежда да е пратка на git версия 2" -#: bundle.c:60 +#: bundle.c:61 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "непозната заглавна част: %s%s (%d)" -#: bundle.c:86 builtin/commit.c:755 +#: bundle.c:87 builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "„%s“ не може да се отвори" -#: bundle.c:138 +#: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "В хранилището липсват следните необходими подавания:" -#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330 -#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357 +#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706 +#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "неуспешно настройване на обхождането на версиите" -#: bundle.c:184 +#: bundle.c:185 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Пратката съдържа следния указател:" msgstr[1] "Пратката съдържа следните %d указатели:" -#: bundle.c:191 +#: bundle.c:192 msgid "The bundle records a complete history." msgstr "Пратката съдържа пълна история." -#: bundle.c:193 +#: bundle.c:194 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Пратката изисква следния указател:" msgstr[1] "Пратката изисква следните %d указатели:" +#: bundle.c:251 +msgid "Could not spawn pack-objects" +msgstr "Командата „git pack-objects“ не може да бъде стартирана" + +# FIXME better message +#: bundle.c:269 +msgid "pack-objects died" +msgstr "Командата „git pack-objects“ не завърши успешно" + # FIXME better message -#: bundle.c:289 +#: bundle.c:309 msgid "rev-list died" msgstr "Командата „git rev-list“ не завърши успешно" -#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261 -#, c-format -msgid "unrecognized argument: %s" -msgstr "непознат аргумент: %s" - -#: bundle.c:330 +#: bundle.c:358 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" "указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“" -#: bundle.c:375 +#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#, c-format +msgid "unrecognized argument: %s" +msgstr "непознат аргумент: %s" + +#: bundle.c:444 msgid "Refusing to create empty bundle." msgstr "Създаването на празна пратка е невъзможно." -#: bundle.c:390 -msgid "Could not spawn pack-objects" -msgstr "Командата „git pack-objects“ не може да бъде стартирана" - -# FIXME better message -#: bundle.c:408 -msgid "pack-objects died" -msgstr "Командата „git pack-objects“ не завърши успешно" - -#: bundle.c:411 +#: bundle.c:454 #, c-format msgid "cannot create '%s'" msgstr "Файлът „%s“ не може да бъде създаден" # FIXME better message -#: bundle.c:433 +#: bundle.c:475 msgid "index-pack died" msgstr "Командата „git index-pack“ не завърши успешно" +#: color.c:157 +#, c-format +msgid "invalid color value: %.*s" +msgstr "неправилна стойност за цвят: %.*s" + #: commit.c:40 #, c-format msgid "could not parse %s" @@ -471,16 +468,70 @@ msgstr "%s %s не е подаване!" msgid "memory exhausted" msgstr "паметта свърши" -#: connected.c:70 +#: config.c:469 config.c:471 +#, c-format +msgid "bad config file line %d in %s" +msgstr "неправилен ред %d в „%s“" + +#: config.c:587 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "" +"неправилна числова стойност „%s“ за настройката „%s“ в раздела „%s“: %s" + +#: config.c:589 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "неправилна числова стойност „%s“ за настройката „%s“: %s" + +#: config.c:674 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "домашната папка на потребителя не може да бъде открита: „%s“" + +#: config.c:752 config.c:763 +#, c-format +msgid "bad zlib compression level %d" +msgstr "неправилно ниво на компресиране: %d" + +#: config.c:885 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "неправилен режим за създаването на обекти: %s" + +#: config.c:1201 +msgid "unable to parse command-line config" +msgstr "неправилни настройки от командния ред" + +#: config.c:1262 +msgid "unknown error occured while reading the configuration files" +msgstr "неочаквана грешка при изчитането на конфигурационните файлове" + +#: config.c:1586 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "неразпозната стойност „%s“ от командния ред" + +#: config.c:1588 +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d" + +#: config.c:1647 +#, c-format +msgid "%s has multiple values" +msgstr "зададени са няколко стойности за „%s“" + +#: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Командата „git rev-list“ не може да бъде изпълнена." -#: connected.c:90 +#: connected.c:89 #, c-format msgid "failed write to rev-list: %s" msgstr "неуспешен запис на списъка с версиите: %s" -#: connected.c:98 +#: connected.c:97 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "стандартният вход на списъка с версиите не може да бъде затворен: %s" @@ -558,7 +609,7 @@ msgstr[1] "преди %lu години" msgid "failed to read orderfile '%s'" msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен" -#: diffcore-rename.c:514 +#: diffcore-rename.c:516 msgid "Performing inexact rename detection" msgstr "Търсене на преименувания на обекти съчетани с промени" @@ -579,7 +630,7 @@ msgstr " Непознат параметър „%s“ за статистика msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Непозната стойност „%s“ за настройката „diff.submodule“" -#: diff.c:267 +#: diff.c:266 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -588,17 +639,17 @@ msgstr "" "Грешки в настройката „diff.dirstat“:\n" "%s" -#: diff.c:2934 +#: diff.c:2957 #, c-format msgid "external diff died, stopping at %s" msgstr "" "външната програма за разлики завърши неуспешно. Спиране на работата при „%s“" -#: diff.c:3329 +#: diff.c:3352 msgid "--follow requires exactly one pathspec" msgstr "Опцията „--follow“ изисква точно един път" -#: diff.c:3492 +#: diff.c:3515 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -607,44 +658,44 @@ msgstr "" "Неразпознат параметър към опцията „--dirstat/-X“:\n" "%s" -#: diff.c:3506 +#: diff.c:3529 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Неразпознат параметър към опцията „--submodule“: „%s“" -#: gpg-interface.c:73 gpg-interface.c:145 +#: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "Програмата „gpg“ не може да бъде стартирана." -#: gpg-interface.c:85 +#: gpg-interface.c:141 msgid "gpg did not accept the data" msgstr "Програмата „gpg“ не прие подадените данни." -#: gpg-interface.c:96 +#: gpg-interface.c:152 msgid "gpg failed to sign the data" msgstr "Програмата „gpg“ не подписа данните." -#: gpg-interface.c:129 +#: gpg-interface.c:185 #, c-format msgid "could not create temporary file '%s': %s" msgstr "Програмата „gpg“ не успя да създаде временния файл „%s“: %s" -#: gpg-interface.c:132 +#: gpg-interface.c:188 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "Програмата „gpg“ не успя да запише самостоятелния подпис към „%s“: %s" -#: grep.c:1703 +#: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен" -#: grep.c:1720 +#: grep.c:1735 #, c-format msgid "'%s': %s" msgstr "„%s“: „%s“" -#: grep.c:1731 +#: grep.c:1746 #, c-format msgid "'%s': short read %s" msgstr "„%s“: изчитането на „%s“ върна по-малко байтове от заявените" @@ -716,90 +767,98 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s — %s" -#: merge.c:40 +#: lockfile.c:275 +msgid "BUG: reopen a lockfile that is still open" +msgstr "ГРЕШКА В GIT: преотваряне на файл-ключалка" + +#: lockfile.c:277 +msgid "BUG: reopen a lockfile that has been committed" +msgstr "ГРЕШКА В GIT: преотваряне на файл-ключалка, който е подаден" + +#: merge.c:41 msgid "failed to read the cache" msgstr "кешът не може да бъде прочетен" -#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556 -#: builtin/clone.c:661 +#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562 +#: builtin/clone.c:659 msgid "unable to write new index file" msgstr "неуспешно записване на новия индекс" -#: merge-recursive.c:190 +#: merge-recursive.c:189 #, c-format msgid "(bad commit)\n" msgstr "(лошо подаване)\n" -#: merge-recursive.c:210 +#: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "неуспешно изпълнение на „addinfo_cache“ за пътя „%s“" -#: merge-recursive.c:271 +#: merge-recursive.c:270 msgid "error building trees" msgstr "грешка при изграждане на дърветата" -#: merge-recursive.c:692 +#: merge-recursive.c:691 #, c-format msgid "failed to create path '%s'%s" msgstr "грешка при създаването на пътя „%s“%s" -#: merge-recursive.c:703 +#: merge-recursive.c:702 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n" # FIXME better message -#: merge-recursive.c:717 merge-recursive.c:738 +#: merge-recursive.c:716 merge-recursive.c:737 msgid ": perhaps a D/F conflict?" msgstr ": възможно е да има конфликт директория/файл." -#: merge-recursive.c:728 +#: merge-recursive.c:727 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" "преустановяване на действието, за да не се изтрие неследеният файл „%s“" -#: merge-recursive.c:768 +#: merge-recursive.c:767 #, c-format msgid "cannot read object %s '%s'" msgstr "обектът „%s“ (%s) не може да бъде прочетен" -#: merge-recursive.c:770 +#: merge-recursive.c:769 #, c-format msgid "blob expected for %s '%s'" msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е" -#: merge-recursive.c:793 builtin/clone.c:317 +#: merge-recursive.c:792 builtin/clone.c:318 #, c-format msgid "failed to open '%s'" msgstr "директорията „%s“ не може да бъде отворена" -#: merge-recursive.c:801 +#: merge-recursive.c:800 #, c-format msgid "failed to symlink '%s'" msgstr "неуспешно създаване на символната връзка „%s“" -#: merge-recursive.c:804 +#: merge-recursive.c:803 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" "не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“" -#: merge-recursive.c:942 +#: merge-recursive.c:941 msgid "Failed to execute internal merge" msgstr "Неуспешно вътрешно сливане" -#: merge-recursive.c:946 +#: merge-recursive.c:945 #, c-format msgid "Unable to add %s to database" msgstr "„%s“ не може да се добави в базата с данни" -#: merge-recursive.c:962 +#: merge-recursive.c:961 msgid "unsupported object type in the tree" msgstr "в дървото има неподдържан вид обект" -#: merge-recursive.c:1037 merge-recursive.c:1051 +#: merge-recursive.c:1036 merge-recursive.c:1050 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -808,7 +867,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото." -#: merge-recursive.c:1043 merge-recursive.c:1056 +#: merge-recursive.c:1042 merge-recursive.c:1055 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -817,20 +876,20 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото: %s." -#: merge-recursive.c:1097 +#: merge-recursive.c:1096 msgid "rename" msgstr "преименуване" -#: merge-recursive.c:1097 +#: merge-recursive.c:1096 msgid "renamed" msgstr "преименуван" -#: merge-recursive.c:1153 +#: merge-recursive.c:1152 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“" -#: merge-recursive.c:1175 +#: merge-recursive.c:1174 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -839,149 +898,151 @@ msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s." -#: merge-recursive.c:1180 +#: merge-recursive.c:1179 msgid " (left unresolved)" msgstr " (некоригиран конфликт)" -#: merge-recursive.c:1234 +#: merge-recursive.c:1233 #, 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:1264 +#: merge-recursive.c:1263 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“" -#: merge-recursive.c:1463 +#: merge-recursive.c:1462 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а " "„%s“ е добавен в „%s“" -#: merge-recursive.c:1473 +#: merge-recursive.c:1472 #, c-format msgid "Adding merged %s" msgstr "Добавяне на слетия „%s“" -#: merge-recursive.c:1478 merge-recursive.c:1676 +#: merge-recursive.c:1477 merge-recursive.c:1675 #, c-format msgid "Adding as %s instead" msgstr "Добавяне като „%s“" -#: merge-recursive.c:1529 +#: merge-recursive.c:1528 #, c-format msgid "cannot read object %s" msgstr "обектът „%s“ не може да се прочете" -#: merge-recursive.c:1532 +#: merge-recursive.c:1531 #, c-format msgid "object %s is not a blob" msgstr "обектът „%s“ не е BLOB" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modify" msgstr "промяна" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modified" msgstr "променен" -#: merge-recursive.c:1590 +#: merge-recursive.c:1589 msgid "content" msgstr "съдържание" -#: merge-recursive.c:1597 +#: merge-recursive.c:1596 msgid "add/add" msgstr "добавяне/добавяне" -#: merge-recursive.c:1631 +#: merge-recursive.c:1630 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)" -#: merge-recursive.c:1645 +#: merge-recursive.c:1644 #, c-format msgid "Auto-merging %s" msgstr "Автоматично сливане на „%s“" -#: merge-recursive.c:1649 git-submodule.sh:1150 +#: merge-recursive.c:1648 git-submodule.sh:1150 msgid "submodule" msgstr "ПОДМОДУЛ" -#: merge-recursive.c:1650 +#: merge-recursive.c:1649 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“" -#: merge-recursive.c:1740 +#: merge-recursive.c:1735 #, c-format msgid "Removing %s" msgstr "Изтриване на „%s“" -#: merge-recursive.c:1765 +#: merge-recursive.c:1760 msgid "file/directory" msgstr "файл/директория" -#: merge-recursive.c:1771 +#: merge-recursive.c:1766 msgid "directory/file" msgstr "директория/файл" -#: merge-recursive.c:1776 +#: merge-recursive.c:1771 #, 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:1786 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Добавяне на „%s“" -#: merge-recursive.c:1803 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Фатална грешка при сливане, а такава не трябва да възниква!" -#: merge-recursive.c:1822 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Вече е обновено!" -#: merge-recursive.c:1831 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "неуспешно сливане на дърветата „%s“ и „%s“" # FIXME message -#: merge-recursive.c:1861 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" -msgstr "Пътят „%s“ не е обработен, това е грешка в Git." +msgstr "" +"Пътят „%s“ не е обработен, това е грешка в Git, докладвайте я на " +"разработчиците, като пратите е-писмо на адрес: „git@vger.kernel.org“." -#: merge-recursive.c:1906 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "Сливане:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "открит е %u общ предшественик:" msgstr[1] "открити са %u общи предшественици:" -#: merge-recursive.c:1956 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "сливането не върна подаване" -#: merge-recursive.c:2013 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "Неуспешен анализ на обекта „%s“" -#: merge-recursive.c:2024 builtin/merge.c:666 +#: merge-recursive.c:2019 builtin/merge.c:666 msgid "Unable to write index." msgstr "Индексът не може да бъде прочетен" @@ -1008,33 +1069,33 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "Зададена е лоша стойност на променливата „%s“: „%s“" -#: object.c:234 +#: object.c:241 #, c-format msgid "unable to parse object: %s" msgstr "обектът „%s“ не може да бъде анализиран" -#: parse-options.c:534 +#: parse-options.c:546 msgid "..." msgstr "…" -#: parse-options.c:552 +#: parse-options.c:564 #, c-format msgid "usage: %s" msgstr "употреба: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:556 +#: parse-options.c:568 #, c-format msgid " or: %s" msgstr " или: %s" -#: parse-options.c:559 +#: parse-options.c:571 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:593 +#: parse-options.c:605 msgid "-NUM" msgstr "-ЧИСЛО" @@ -1102,11 +1163,15 @@ msgstr "" "Нищо не се изключва от шаблоните за изключване.\n" "Това често се случва, ако сте забравили да добавите „:/“ или „.“." +#: pretty.c:968 +msgid "unable to parse --pretty format" +msgstr "аргументът към опцията „--pretty“ не може да се анализира" + #: progress.c:225 msgid "done" msgstr "действието завърши" -#: read-cache.c:1260 +#: read-cache.c:1261 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1115,7 +1180,7 @@ msgstr "" "Зададена е неправилна стойност на настройката „index.version“.\n" "Ще се ползва версия %i" -#: read-cache.c:1270 +#: read-cache.c:1271 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1125,51 +1190,51 @@ msgstr "" "„GIT_INDEX_VERSION“.\n" "Ще се ползва версия %i" -#: remote.c:753 +#: remote.c:782 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“" -#: remote.c:757 +#: remote.c:786 #, c-format msgid "%s usually tracks %s, not %s" msgstr "„%s“ обикновено следи „%s“, а не „%s“" -#: remote.c:761 +#: remote.c:790 #, c-format msgid "%s tracks both %s and %s" msgstr "„%s“ следи както „%s“, така и „%s“" -#: remote.c:769 +#: remote.c:798 msgid "Internal error" msgstr "Вътрешна грешка" -#: remote.c:1943 +#: remote.c:1968 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n" -#: remote.c:1947 +#: remote.c:1972 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n" -#: remote.c:1950 +#: remote.c:1975 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Клонът е актуализиран към „%s“.\n" -#: remote.c:1954 +#: remote.c:1979 #, 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:1960 +#: remote.c:1985 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (публикувайте локалните си промени чрез „git push“)\n" -#: remote.c:1963 +#: remote.c:1988 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1179,11 +1244,11 @@ msgstr[0] "" msgstr[1] "" "Клонът ви е с %2$d подавания след „%1$s“ и може да бъде тривиално слят.\n" -#: remote.c:1971 +#: remote.c:1996 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (обновете локалния си клон чрез „git pull“)\n" -#: remote.c:1974 +#: remote.c:1999 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1198,33 +1263,41 @@ msgstr[1] "" "Текущият клон се е отделил от „%s“,\n" "двата имат съответно по %d и %d несъвпадащи подавания.\n" -#: remote.c:1984 +#: remote.c:2009 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n" -#: run-command.c:80 +#: run-command.c:87 msgid "open /dev/null failed" msgstr "неуспешно отваряне на „/dev/null“" -#: run-command.c:82 +#: run-command.c:89 #, c-format msgid "dup2(%d,%d) failed" msgstr "неуспешно изпълнение на dup2(%d,%d)" -#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893 -#: builtin/merge.c:1003 builtin/merge.c:1013 +#: send-pack.c:265 +msgid "failed to sign the push certificate" +msgstr "сертификатът за изтласкване не може да бъде подписан" + +#: send-pack.c:322 +msgid "the receiving end does not support --signed push" +msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“" + +#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892 +#: builtin/merge.c:1002 builtin/merge.c:1012 #, c-format msgid "Could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запис" -#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785 -#: builtin/merge.c:1005 builtin/merge.c:1018 +#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784 +#: builtin/merge.c:1004 builtin/merge.c:1017 #, c-format msgid "Could not write to '%s'" msgstr "„%s“ не може да бъде записан" # FIXME git add <path…> for consistence -#: sequencer.c:194 +#: sequencer.c:195 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1232,7 +1305,7 @@ msgstr "" "след коригирането на конфликтите, отбележете съответните\n" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“." -#: sequencer.c:197 +#: sequencer.c:198 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1243,236 +1316,232 @@ msgstr "" "подайте резултата с командата „git commit'“." # FIXME - must be the same as Could not write to '%s' above -#: sequencer.c:210 sequencer.c:841 sequencer.c:924 +#: sequencer.c:211 sequencer.c:852 sequencer.c:935 #, c-format msgid "Could not write to %s" msgstr "„%s“ не може да бъде записан" # FIXME wrap up as ffinishing the work on, in fact, full stop at end for consistency with below -#: sequencer.c:213 +#: sequencer.c:214 #, c-format msgid "Error wrapping up %s" msgstr "Обработката на „%s“ не завърши успешно." -#: sequencer.c:228 +#: sequencer.c:229 msgid "Your local changes would be overwritten by cherry-pick." msgstr "Локалните ви промени ще бъдат презаписани при отбирането на подавания." -#: sequencer.c:230 +#: sequencer.c:231 msgid "Your local changes would be overwritten by revert." msgstr "Локалните ви промени ще бъдат презаписани при отмяната на подавания." -#: sequencer.c:233 +#: sequencer.c:234 msgid "Commit your changes or stash them to proceed." msgstr "Подайте или скатайте промените, за да продължите" -#: sequencer.c:250 -msgid "Failed to lock HEAD during fast_forward_to" -msgstr "Указателят „HEAD“ не може да бъде заключен при тривиално сливане" - #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:293 +#: sequencer.c:304 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: новият индекс не може да бъде запазен" -#: sequencer.c:324 +#: sequencer.c:335 msgid "Could not resolve HEAD commit\n" msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито\n" -#: sequencer.c:344 +#: sequencer.c:355 msgid "Unable to update cache tree\n" msgstr "Дървото на кеша не може да бъде обновено\n" -#: sequencer.c:391 +#: sequencer.c:402 #, c-format msgid "Could not parse commit %s\n" msgstr "Подаването „%s“ не може да бъде анализирано\n" -#: sequencer.c:396 +#: sequencer.c:407 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Родителското подаване „%s“ не може да бъде анализирано\n" -#: sequencer.c:462 +#: sequencer.c:473 msgid "Your index file is unmerged." msgstr "Индексът не е слят." -#: sequencer.c:481 +#: sequencer.c:492 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Подаването „%s“ е сливане, но не е дадена опцията „-m“" -#: sequencer.c:489 +#: sequencer.c:500 #, c-format msgid "Commit %s does not have parent %d" msgstr "Подаването „%s“ няма родител %d" -#: sequencer.c:493 +#: sequencer.c:504 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "Указано е базово подаване, но подаването „%s“ не е сливане." #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:506 +#: sequencer.c:517 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: неразпозната стойност за родителското подаване „%s“" -#: sequencer.c:510 +#: sequencer.c:521 #, c-format msgid "Cannot get commit message for %s" msgstr "Неуспешно извличане на съобщението за подаване на „%s“" -#: sequencer.c:596 +#: sequencer.c:607 #, c-format msgid "could not revert %s... %s" msgstr "подаването „%s“… не може да бъде отменено: „%s“" -#: sequencer.c:597 +#: sequencer.c:608 #, c-format msgid "could not apply %s... %s" msgstr "подаването „%s“… не може да бъде приложено: „%s“" -#: sequencer.c:633 +#: sequencer.c:644 msgid "empty commit set passed" msgstr "зададено е празно множество от подавания" -#: sequencer.c:641 +#: sequencer.c:652 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: неуспешно изчитане на индекса" -#: sequencer.c:645 +#: sequencer.c:656 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: неуспешно обновяване на индекса" -#: sequencer.c:705 +#: sequencer.c:716 #, c-format msgid "Cannot %s during a %s" msgstr "По време на „%1$s“ не може да се извърши „%2$s“" -#: sequencer.c:727 +#: sequencer.c:738 #, c-format msgid "Could not parse line %d." msgstr "%d-ят ред не може да се анализира." -#: sequencer.c:732 +#: sequencer.c:743 msgid "No commits parsed." msgstr "Никое от подаванията не може да се разпознае." # FIXME Could not open %s. - full stop for consistence with next message -#: sequencer.c:745 +#: sequencer.c:756 #, c-format msgid "Could not open %s" msgstr "„%s“ не може да се прочете." -#: sequencer.c:749 +#: sequencer.c:760 #, c-format msgid "Could not read %s." msgstr "„%s“ не може да се отвори." -#: sequencer.c:756 +#: sequencer.c:767 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Файлът с описание на предстоящите действия — „%s“ не може да се ползва" -#: sequencer.c:786 +#: sequencer.c:797 #, c-format msgid "Invalid key: %s" msgstr "Неправилен ключ: „%s“" -#: sequencer.c:789 +#: sequencer.c:800 #, c-format msgid "Invalid value for %s: %s" msgstr "Неправилна стойност за „%s“: „%s“" -#: sequencer.c:801 +#: sequencer.c:812 #, c-format msgid "Malformed options sheet: %s" msgstr "Неправилно съдържание на файла с опции: „%s“" -#: sequencer.c:822 +#: sequencer.c:833 msgid "a cherry-pick or revert is already in progress" msgstr "" "в момента вече се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:823 +#: sequencer.c:834 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“" -#: sequencer.c:827 +#: sequencer.c:838 #, c-format msgid "Could not create sequencer directory %s" msgstr "Директорията за секвенсора „%s“ не може да бъде създадена" -#: sequencer.c:843 sequencer.c:928 +#: sequencer.c:854 sequencer.c:939 #, c-format msgid "Error wrapping up %s." msgstr "Обработката на „%s“ не завърши успешно." -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:873 sequencer.c:1009 msgid "no cherry-pick or revert in progress" msgstr "" "в момента не се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:864 +#: sequencer.c:875 msgid "cannot resolve HEAD" msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито" -#: sequencer.c:866 +#: sequencer.c:877 msgid "cannot abort from a branch yet to be born" msgstr "" "действието не може да бъде преустановено, когато сте на клон, който тепърва " "предстои да бъде създаден" -#: sequencer.c:888 builtin/apply.c:4062 +#: sequencer.c:899 builtin/apply.c:4128 #, c-format msgid "cannot open %s: %s" msgstr "файлът „%s“ не може да бъде отворен: %s" -#: sequencer.c:891 +#: sequencer.c:902 #, c-format msgid "cannot read %s: %s" msgstr "файлът „%s“ не може да бъде прочетен: %s" -#: sequencer.c:892 +#: sequencer.c:903 msgid "unexpected end of file" msgstr "неочакван край на файл" -#: sequencer.c:898 +#: sequencer.c:909 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е " "повреден" -#: sequencer.c:921 +#: sequencer.c:932 #, c-format msgid "Could not format %s." msgstr "Файлът „%s“ не може да се форматира по подходящия начин." -#: sequencer.c:1066 +#: sequencer.c:1077 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не може да се отбере „%s“" -#: sequencer.c:1069 +#: sequencer.c:1080 #, c-format msgid "%s: bad revision" msgstr "%s: неправилна версия" -#: sequencer.c:1103 +#: sequencer.c:1114 msgid "Can't revert as initial commit" msgstr "Първоначалното подаване не може да бъде отменено" -#: sequencer.c:1104 +#: sequencer.c:1115 msgid "Can't cherry-pick into empty head" msgstr "При празен връх не могат да се отбират подавания" -#: sha1_name.c:439 +#: sha1_name.c:440 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" @@ -1496,21 +1565,21 @@ msgstr "" "спрете това съобщение като изпълните командата:\n" "„git config advice.objectNameWarning false“" -#: sha1_name.c:1060 +#: sha1_name.c:1068 msgid "HEAD does not point to a branch" msgstr "Указателят „HEAD“ не сочи към клон" -#: sha1_name.c:1063 +#: sha1_name.c:1071 #, c-format msgid "No such branch: '%s'" msgstr "Не съществува клон на име „%s“" -#: sha1_name.c:1065 +#: sha1_name.c:1073 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Не е зададен клон-източник за клона „%s“" -#: sha1_name.c:1069 +#: sha1_name.c:1077 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "Клонът-източник „%s“ не е съхранен като следящ клон" @@ -1540,16 +1609,41 @@ msgstr "Записът „%s“ във файла „.gitmodules“ не мож msgid "staging updated .gitmodules failed" msgstr "неуспешно добавяне на променения файл „.gitmodules“ в индекса" -#: submodule.c:1118 builtin/init-db.c:363 +#: submodule.c:1111 builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "Връзката в Git „%s“ не може да бъде създадена" -#: submodule.c:1129 +#: submodule.c:1122 #, c-format msgid "Could not set core.worktree in %s" msgstr "Настройката „core.worktree“ не може да се зададе в „%s“" +#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565 +#: trailer.c:569 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "неправилна стойност „%s“ за настройката „%s“" + +#: trailer.c:551 trailer.c:556 builtin/remote.c:288 +#, c-format +msgid "more than one %s" +msgstr "стойността „%s“ се повтаря в настройките" + +#: trailer.c:589 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "празна завършваща лексема в епилога „%.*s“" + +#: trailer.c:709 +#, c-format +msgid "could not read input file '%s'" +msgstr "входният файл „%s“ не може да бъде прочетен" + +#: trailer.c:712 +msgid "could not read from stdin" +msgstr "от стандартния вход не може да се чете" + #: unpack-trees.c:202 msgid "Checking out files" msgstr "Изтегляне на файлове" @@ -1583,25 +1677,29 @@ msgstr "неправилен номер на порт" msgid "invalid '..' path segment" msgstr "неправилна част от пътя „..“" -#: wrapper.c:460 +#: wrapper.c:509 #, c-format msgid "unable to access '%s': %s" msgstr "няма достъп до „%s“: %s" -#: wrapper.c:481 +#: wrapper.c:530 #, c-format msgid "unable to access '%s'" msgstr "няма достъп до „%s“" -#: wrapper.c:492 +#: wrapper.c:541 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "текущият потребител не може да бъде открит във файла „/etc/passwd“: %s" -#: wrapper.c:493 +#: wrapper.c:542 msgid "no such user" msgstr "такъв потребител не съществува" +#: wrapper.c:550 +msgid "unable to get current working directory" +msgstr "текущата работна директория е недостъпна" + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Неслети пътища:" @@ -1751,15 +1849,15 @@ msgstr "неследено съдържание, " msgid "bug: unhandled diff status %c" msgstr "грешка: състоянието на промяната „%c“ не може да бъде обработено" -#: wt-status.c:764 +#: wt-status.c:761 msgid "Submodules changed but not updated:" msgstr "Подмодулите са променени, но не са обновени:" -#: wt-status.c:766 +#: wt-status.c:763 msgid "Submodule changes to be committed:" msgstr "Промени в подмодулите за подаване:" -#: wt-status.c:845 +#: wt-status.c:842 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1767,193 +1865,193 @@ msgstr "" "Не променяйте горния ред.\n" "Всичко отдолу ще бъде изтрито." -#: wt-status.c:936 +#: wt-status.c:933 msgid "You have unmerged paths." msgstr "Някои пътища не са слети." -#: wt-status.c:939 +#: wt-status.c:936 msgid " (fix conflicts and run \"git commit\")" msgstr " (коригирайте конфликтите и изпълнете „git commit“)" -#: wt-status.c:942 +#: wt-status.c:939 msgid "All conflicts fixed but you are still merging." msgstr "Всички конфликти са решени, но продължавате сливането." -#: wt-status.c:945 +#: wt-status.c:942 msgid " (use \"git commit\" to conclude merge)" msgstr " (използвайте „git commit“, за да завършите сливането)" -#: wt-status.c:955 +#: wt-status.c:952 msgid "You are in the middle of an am session." msgstr "В момента прилагате поредица от кръпки чрез „git am“." -#: wt-status.c:958 +#: wt-status.c:955 msgid "The current patch is empty." msgstr "Текущата кръпка е празна." -#: wt-status.c:962 +#: wt-status.c:959 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)" -#: wt-status.c:964 +#: wt-status.c:961 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)" -#: wt-status.c:966 +#: wt-status.c:963 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (използвайте „git am --abort“, за да възстановите първоначалния клон)" -#: wt-status.c:1026 wt-status.c:1043 +#: wt-status.c:1023 wt-status.c:1040 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "В момента пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1031 wt-status.c:1048 +#: wt-status.c:1028 wt-status.c:1045 msgid "You are currently rebasing." msgstr "В момента пребазирате." -#: wt-status.c:1034 +#: wt-status.c:1031 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)" -#: wt-status.c:1036 +#: wt-status.c:1033 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (използвайте „git rebase --skip“, за да пропуснете тази кръпка)" -#: wt-status.c:1038 +#: wt-status.c:1035 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (използвайте „git rebase --abort“, за да възстановите първоначалния клон)" -#: wt-status.c:1051 +#: wt-status.c:1048 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (всички конфликти са коригирани: изпълнете „git rebase --continue“)" -#: wt-status.c:1055 +#: wt-status.c:1052 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1060 +#: wt-status.c:1057 msgid "You are currently splitting a commit during a rebase." msgstr "В момента разделяте подаване докато пребазирате." -#: wt-status.c:1063 +#: wt-status.c:1060 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (След като работното ви дърво стане чисто, използвайте „git rebase --" "continue“)" -#: wt-status.c:1067 +#: wt-status.c:1064 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“." -#: wt-status.c:1072 +#: wt-status.c:1069 msgid "You are currently editing a commit during a rebase." msgstr "В момента редактирате подаване докато пребазирате." -#: wt-status.c:1075 +#: wt-status.c:1072 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (използвайте „git commit --amend“, за да редактирате текущото подаване)" -#: wt-status.c:1077 +#: wt-status.c:1074 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (използвайте „git rebase --continue“, след като завършите промените си)" -#: wt-status.c:1087 +#: wt-status.c:1084 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "В момента отбирате подаването „%s“." -#: wt-status.c:1092 +#: wt-status.c:1089 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)" -#: wt-status.c:1095 +#: wt-status.c:1092 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)" -#: wt-status.c:1097 +#: wt-status.c:1094 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (използвайте „git cherry-pick --abort“, за да отмените всички действия с " "отбиране)" -#: wt-status.c:1106 +#: wt-status.c:1103 #, c-format msgid "You are currently reverting commit %s." msgstr "В момента отменяте подаване „%s“." -#: wt-status.c:1111 +#: wt-status.c:1108 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)" -#: wt-status.c:1114 +#: wt-status.c:1111 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)" -#: wt-status.c:1116 +#: wt-status.c:1113 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (използвайте „git revert --abort“, за да преустановите отмяната на " "подаване)" -#: wt-status.c:1127 +#: wt-status.c:1124 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "В момента търсите двоично, като сте стартирали от клон „%s“." -#: wt-status.c:1131 +#: wt-status.c:1128 msgid "You are currently bisecting." msgstr "В момента търсите двоично." -#: wt-status.c:1134 +#: wt-status.c:1131 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (използвайте „git bisect reset“, за да се върнете към първоначалното " "състояние и клон)" -#: wt-status.c:1309 +#: wt-status.c:1306 msgid "On branch " msgstr "На клон " -#: wt-status.c:1316 +#: wt-status.c:1313 msgid "rebase in progress; onto " msgstr "извършвате пребазиране върху " -#: wt-status.c:1323 +#: wt-status.c:1320 msgid "HEAD detached at " msgstr "Указателят „HEAD“ не е свързан и е при подаване " -#: wt-status.c:1325 +#: wt-status.c:1322 msgid "HEAD detached from " msgstr "Указателят „HEAD“ не е свързан и е отделѐн от " -#: wt-status.c:1328 +#: wt-status.c:1325 msgid "Not currently on any branch." msgstr "Извън всички клони." -#: wt-status.c:1345 +#: wt-status.c:1342 msgid "Initial commit" msgstr "Първоначално подаване" -#: wt-status.c:1359 +#: wt-status.c:1356 msgid "Untracked files" msgstr "Неследени файлове" -#: wt-status.c:1361 +#: wt-status.c:1358 msgid "Ignored files" msgstr "Игнорирани файлове" -#: wt-status.c:1365 +#: wt-status.c:1362 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1965,32 +2063,32 @@ msgstr "" "изпълнението, но не трябва да забравяте ръчно да добавяте новите файлове.\n" "За повече подробности погледнете „git status help“." -#: wt-status.c:1371 +#: wt-status.c:1368 #, c-format msgid "Untracked files not listed%s" msgstr "Неследените файлове не са изведени%s" -#: wt-status.c:1373 +#: wt-status.c:1370 msgid " (use -u option to show untracked files)" msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)" -#: wt-status.c:1379 +#: wt-status.c:1376 msgid "No changes" msgstr "Няма промени" -#: wt-status.c:1384 +#: wt-status.c:1381 #, 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:1387 +#: wt-status.c:1384 #, c-format msgid "no changes added to commit\n" msgstr "към индекса за подаване не са добавени промени\n" -#: wt-status.c:1390 +#: wt-status.c:1387 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1999,97 +2097,97 @@ msgstr "" "към индекса за подаване не са добавени промени, но има нови файлове " "(използвайте „git add“, за да започне тяхното следене)\n" -#: wt-status.c:1393 +#: wt-status.c:1390 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n" -#: wt-status.c:1396 +#: wt-status.c:1393 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "липсват каквито и да е промени (създайте или копирайте файлове и използвайте " "„git add“, за да започне тяхното следене)\n" -#: wt-status.c:1399 wt-status.c:1404 +#: wt-status.c:1396 wt-status.c:1401 #, c-format msgid "nothing to commit\n" msgstr "липсват каквито и да е промени\n" -#: wt-status.c:1402 +#: wt-status.c:1399 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и " "неследените файлове)\n" -#: wt-status.c:1406 +#: wt-status.c:1403 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "липсват каквито и да е промени, работното дърво е чисто\n" -#: wt-status.c:1515 +#: wt-status.c:1512 msgid "HEAD (no branch)" msgstr "HEAD (извън клон)" -#: wt-status.c:1521 +#: wt-status.c:1518 msgid "Initial commit on " msgstr "Първоначално подаване на клон" -#: wt-status.c:1553 +#: wt-status.c:1550 msgid "gone" msgstr "изтрит" -#: wt-status.c:1555 wt-status.c:1563 +#: wt-status.c:1552 wt-status.c:1560 msgid "behind " msgstr "назад с " -#: compat/precompose_utf8.c:55 builtin/clone.c:356 +#: compat/precompose_utf8.c:55 builtin/clone.c:357 #, c-format msgid "failed to unlink '%s'" msgstr "неуспешно изтриване на „%s“" -#: builtin/add.c:21 +#: builtin/add.c:22 msgid "git add [options] [--] <pathspec>..." msgstr "git add [ОПЦИЯ…] [--] ПЪТ…" -#: builtin/add.c:64 +#: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "неочакван изходен код при генериране на разлика: %c" -#: builtin/add.c:69 builtin/commit.c:261 +#: builtin/add.c:70 builtin/commit.c:275 msgid "updating files failed" msgstr "неуспешно обновяване на файловете" -#: builtin/add.c:79 +#: builtin/add.c:80 #, c-format msgid "remove '%s'\n" msgstr "изтриване на „%s“\n" -#: builtin/add.c:133 +#: builtin/add.c:134 msgid "Unstaged changes after refreshing the index:" msgstr "Промени, които и след обновяването на индекса не са добавени към него:" -#: builtin/add.c:193 builtin/rev-parse.c:781 +#: builtin/add.c:194 builtin/rev-parse.c:785 msgid "Could not read the index" msgstr "Индексът не може да бъде прочетен" -#: builtin/add.c:204 +#: builtin/add.c:205 #, c-format msgid "Could not open '%s' for writing." msgstr "Файлът „%s“ не може да бъде отворен за запис." -#: builtin/add.c:208 +#: builtin/add.c:209 msgid "Could not write patch" msgstr "Кръпката не може да бъде записана" -#: builtin/add.c:213 +#: builtin/add.c:214 #, c-format msgid "Could not stat '%s'" msgstr "Не може да се получи информация чрез „stat“ за файла „%s“" -#: builtin/add.c:215 +#: builtin/add.c:216 msgid "Empty patch. Aborted." msgstr "Празна кръпка, преустановяване на действието." @@ -2103,15 +2201,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n" -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70 -#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375 #: builtin/rm.c:269 msgid "dry run" msgstr "пробно изпълнeние" -#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19 -#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606 -#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113 +#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 +#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "повече подробности" @@ -2119,7 +2217,7 @@ msgstr "повече подробности" msgid "interactive picking" msgstr "интерактивно отбиране на промени" -#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286 msgid "select hunks interactively" msgstr "интерактивен избор на парчета код" @@ -2196,82 +2294,82 @@ 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:919 -#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "файлът с индекса е повреден" -#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Новият индекс не може да бъде записан" -#: builtin/apply.c:57 +#: builtin/apply.c:58 msgid "git apply [options] [<patch>...]" msgstr "git apply [ОПЦИЯ…] [КРЪПКА…]" -#: builtin/apply.c:110 +#: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "непозната опция за знаците за интервали „%s“" -#: builtin/apply.c:125 +#: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "непозната опция за игнориране на знаците за интервали „%s“" -#: builtin/apply.c:825 +#: builtin/apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Регулярният израз за времето „%s“ не може за бъде компилиран" -#: builtin/apply.c:834 +#: builtin/apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "Регулярният израз върна %d при подадена последователност „%s“ на входа" -#: builtin/apply.c:915 +#: builtin/apply.c:916 #, c-format msgid "unable to find filename in patch at line %d" msgstr "Липсва име на файл на ред %d от кръпката" -#: builtin/apply.c:947 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: лош изход от командата „git-diff“ — на ред %2$d се очакваше „/dev/" "null“, а бе получен „%1$s“" -#: builtin/apply.c:951 +#: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: лош изход от командата „git-diff“ — на ред %d бе получено " "неправилно име на нов файл" -#: builtin/apply.c:952 +#: builtin/apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: лош изход от командата „git-diff“ — на ред %d бе получено " "неправилно име на стар файл" -#: builtin/apply.c:959 +#: builtin/apply.c:960 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply: лош изход от командата „git-diff“ — на ред %d се очакваше „/dev/" "null“" -#: builtin/apply.c:1422 +#: builtin/apply.c:1423 #, c-format msgid "recount: unexpected line: %.*s" msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“" -#: builtin/apply.c:1479 +#: builtin/apply.c:1480 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "част от кръпка без заглавна част на ред %d: %.*s" -#: builtin/apply.c:1496 +#: builtin/apply.c:1497 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2286,66 +2384,66 @@ msgstr[1] "" "След съкращаването на първите %d части от компонентите на пътя, в заглавната " "част на „git diff“ липсва информация за име на файл (ред: %d)" -#: builtin/apply.c:1656 +#: builtin/apply.c:1657 msgid "new file depends on old contents" msgstr "новият файл зависи от старото съдържание на файла" -#: builtin/apply.c:1658 +#: builtin/apply.c:1659 msgid "deleted file still has contents" msgstr "изтритият файл не е празен" -#: builtin/apply.c:1684 +#: builtin/apply.c:1685 #, c-format msgid "corrupt patch at line %d" msgstr "грешка в кръпката на ред %d" -#: builtin/apply.c:1720 +#: builtin/apply.c:1721 #, c-format msgid "new file %s depends on old contents" msgstr "новият файл „%s“ зависи от старото съдържание на файла" -#: builtin/apply.c:1722 +#: builtin/apply.c:1723 #, c-format msgid "deleted file %s still has contents" msgstr "изтритият файл „%s“ не е празен" # FIXME - double **?? -#: builtin/apply.c:1725 +#: builtin/apply.c:1726 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "●● предупреждение: файлът „%s“ вече е празен, но не е изтрит" -#: builtin/apply.c:1871 +#: builtin/apply.c:1872 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "грешка в двоичната кръпка на ред %d: %.*s" -#: builtin/apply.c:1900 +#: builtin/apply.c:1901 #, c-format msgid "unrecognized binary patch at line %d" msgstr "неразпозната двоичната кръпка на ред %d" -#: builtin/apply.c:1986 +#: builtin/apply.c:2052 #, c-format msgid "patch with only garbage at line %d" msgstr "кръпката е с изцяло повредени данни на ред %d" -#: builtin/apply.c:2076 +#: builtin/apply.c:2142 #, c-format msgid "unable to read symlink %s" msgstr "символната връзка „%s“ не може да бъде прочетена" -#: builtin/apply.c:2080 +#: builtin/apply.c:2146 #, c-format msgid "unable to open or read %s" msgstr "файлът „%s“ не може да бъде отворен или прочетен" -#: builtin/apply.c:2688 +#: builtin/apply.c:2754 #, c-format msgid "invalid start of line: '%c'" msgstr "неправилно начало на ред: „%c“" -#: builtin/apply.c:2806 +#: builtin/apply.c:2872 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -2354,13 +2452,13 @@ msgstr[0] "" msgstr[1] "" "%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)." -#: builtin/apply.c:2818 +#: builtin/apply.c:2884 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" "Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d" -#: builtin/apply.c:2824 +#: builtin/apply.c:2890 #, c-format msgid "" "while searching for:\n" @@ -2369,326 +2467,326 @@ msgstr "" "при търсене за:\n" "%.*s" -#: builtin/apply.c:2843 +#: builtin/apply.c:2909 #, c-format msgid "missing binary patch data for '%s'" msgstr "липсват данните за двоичната кръпка за „%s“" -#: builtin/apply.c:2944 +#: builtin/apply.c:3010 #, c-format msgid "binary patch does not apply to '%s'" msgstr "двоичната кръпка не може да бъде приложена върху „%s“" -#: builtin/apply.c:2950 +#: builtin/apply.c:3016 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "двоичната кръпка за „%s“ води до неправилни резултати (очакваше се SHA1: " "„%s“, а бе получено: „%s“)" -#: builtin/apply.c:2971 +#: builtin/apply.c:3037 #, c-format msgid "patch failed: %s:%ld" msgstr "неуспешно прилагане на кръпка: „%s:%ld“" -#: builtin/apply.c:3095 +#: builtin/apply.c:3161 #, c-format msgid "cannot checkout %s" msgstr "„%s“ не може да се изтегли" -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 +#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 #, c-format msgid "read of %s failed" msgstr "неуспешно прочитане на „%s“" -#: builtin/apply.c:3174 builtin/apply.c:3396 +#: builtin/apply.c:3240 builtin/apply.c:3462 #, c-format msgid "path %s has been renamed/deleted" msgstr "обектът с път „%s“ е преименуван или изтрит" -#: builtin/apply.c:3255 builtin/apply.c:3410 +#: builtin/apply.c:3321 builtin/apply.c:3476 #, c-format msgid "%s: does not exist in index" msgstr "„%s“ не съществува в индекса" -#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 +#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 #, c-format msgid "%s: %s" msgstr "„%s“: %s" -#: builtin/apply.c:3264 builtin/apply.c:3418 +#: builtin/apply.c:3330 builtin/apply.c:3484 #, c-format msgid "%s: does not match index" msgstr "„%s“ не съответства на индекса" -#: builtin/apply.c:3366 +#: builtin/apply.c:3432 msgid "removal patch leaves file contents" msgstr "изтриващата кръпка оставя файла непразен" -#: builtin/apply.c:3435 +#: builtin/apply.c:3501 #, c-format msgid "%s: wrong type" msgstr "„%s“: неправилен вид" -#: builtin/apply.c:3437 +#: builtin/apply.c:3503 #, c-format msgid "%s has type %o, expected %o" msgstr "„%s“ е от вид „%o“, а се очакваше „%o“" -#: builtin/apply.c:3538 +#: builtin/apply.c:3604 #, c-format msgid "%s: already exists in index" msgstr "„%s“: вече съществува в индекса" -#: builtin/apply.c:3541 +#: builtin/apply.c:3607 #, c-format msgid "%s: already exists in working directory" msgstr "„%s“: вече съществува в работната директория" -#: builtin/apply.c:3561 +#: builtin/apply.c:3627 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)" -#: builtin/apply.c:3566 +#: builtin/apply.c:3632 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“" -#: builtin/apply.c:3574 +#: builtin/apply.c:3640 #, c-format msgid "%s: patch does not apply" msgstr "Кръпката „%s“ не може да бъде приложена" -#: builtin/apply.c:3587 +#: builtin/apply.c:3653 #, c-format msgid "Checking patch %s..." msgstr "Проверяване на кръпката „%s“…" -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134 +#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“" -#: builtin/apply.c:3823 +#: builtin/apply.c:3889 #, c-format msgid "unable to remove %s from index" msgstr "„%s“ не може да се извади от индекса" -#: builtin/apply.c:3852 +#: builtin/apply.c:3918 #, c-format msgid "corrupt patch for submodule %s" msgstr "повредена кръпка за модула „%s“" -#: builtin/apply.c:3856 +#: builtin/apply.c:3922 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" "не може да се получи информация чрез „stat“ за новосъздадения файл „%s“" -#: builtin/apply.c:3861 +#: builtin/apply.c:3927 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "не може да се за създаде мястото за съхранение на новосъздадения файл „%s“" -#: builtin/apply.c:3864 builtin/apply.c:3972 +#: builtin/apply.c:3930 builtin/apply.c:4038 #, c-format msgid "unable to add cache entry for %s" msgstr "не може да се добави запис в кеша за „%s“" -#: builtin/apply.c:3897 +#: builtin/apply.c:3963 #, c-format msgid "closing file '%s'" msgstr "затваряне на файла „%s“" -#: builtin/apply.c:3946 +#: builtin/apply.c:4012 #, c-format msgid "unable to write file '%s' mode %o" msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“" -#: builtin/apply.c:4033 +#: builtin/apply.c:4099 #, c-format msgid "Applied patch %s cleanly." msgstr "Кръпката „%s“ бе приложена чисто." -#: builtin/apply.c:4041 +#: builtin/apply.c:4107 msgid "internal error" msgstr "вътрешна грешка" -#: builtin/apply.c:4044 +#: builtin/apply.c:4110 #, 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:4054 +#: builtin/apply.c:4120 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“" -#: builtin/apply.c:4075 +#: builtin/apply.c:4141 #, c-format msgid "Hunk #%d applied cleanly." msgstr "%d-то парче бе успешно приложено." -#: builtin/apply.c:4078 +#: builtin/apply.c:4144 #, c-format msgid "Rejected hunk #%d." msgstr "%d-то парче бе отхвърлено." -#: builtin/apply.c:4228 +#: builtin/apply.c:4234 msgid "unrecognized input" msgstr "непознат вход" -#: builtin/apply.c:4239 +#: builtin/apply.c:4245 msgid "unable to read index file" msgstr "индексът не може да бъде записан" -#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91 #: builtin/fetch.c:93 msgid "path" msgstr "път" -#: builtin/apply.c:4359 +#: builtin/apply.c:4363 msgid "don't apply changes matching the given path" msgstr "без прилагане на промените напасващи на дадения път" -#: builtin/apply.c:4362 +#: builtin/apply.c:4366 msgid "apply changes matching the given path" msgstr "прилагане на промените напасващи на дадения път" -#: builtin/apply.c:4364 +#: builtin/apply.c:4368 msgid "num" msgstr "БРОЙ" -#: builtin/apply.c:4365 +#: builtin/apply.c:4369 msgid "remove <num> leading slashes from traditional diff paths" msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата" -#: builtin/apply.c:4368 +#: builtin/apply.c:4372 msgid "ignore additions made by the patch" msgstr "игнориране на редовете добавени от тази кръпка" -#: builtin/apply.c:4370 +#: builtin/apply.c:4374 msgid "instead of applying the patch, output diffstat for the input" msgstr "извеждане на статистика на промените без прилагане на кръпката" -#: builtin/apply.c:4374 +#: builtin/apply.c:4378 msgid "show number of added and deleted lines in decimal notation" msgstr "извеждане на броя на добавените и изтритите редове" -#: builtin/apply.c:4376 +#: builtin/apply.c:4380 msgid "instead of applying the patch, output a summary for the input" msgstr "извеждане на статистика на входните данни без прилагане на кръпката" -#: builtin/apply.c:4378 +#: builtin/apply.c:4382 msgid "instead of applying the patch, see if the patch is applicable" msgstr "проверка дали кръпката може да се приложи, без действително прилагане" -#: builtin/apply.c:4380 +#: builtin/apply.c:4384 msgid "make sure the patch is applicable to the current index" msgstr "проверка дали кръпката може да бъде приложена към текущия индекс" -#: builtin/apply.c:4382 +#: builtin/apply.c:4386 msgid "apply a patch without touching the working tree" msgstr "прилагане на кръпката без промяна на работното дърво" -#: builtin/apply.c:4384 +#: builtin/apply.c:4388 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--" "summary“" -#: builtin/apply.c:4386 +#: builtin/apply.c:4390 msgid "attempt three-way merge if a patch does not apply" msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно" -#: builtin/apply.c:4388 +#: builtin/apply.c:4392 msgid "build a temporary index based on embedded index information" msgstr "" "създаване на временен индекс на база на включената информация за индекса" -#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 msgid "paths are separated with NUL character" msgstr "разделяне на пътищата с нулевия знак „NUL“" -#: builtin/apply.c:4393 +#: builtin/apply.c:4397 msgid "ensure at least <n> lines of context match" msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове" -#: builtin/apply.c:4394 +#: builtin/apply.c:4398 msgid "action" msgstr "действие" -#: builtin/apply.c:4395 +#: builtin/apply.c:4399 msgid "detect new or modified lines that have whitespace errors" msgstr "засичане на нови или променени редове с грешки в знаците за интервали" -#: builtin/apply.c:4398 builtin/apply.c:4401 +#: builtin/apply.c:4402 builtin/apply.c:4405 msgid "ignore changes in whitespace when finding context" msgstr "" "игнориране на промените в знаците за интервали при откриване на контекста" -#: builtin/apply.c:4404 +#: builtin/apply.c:4408 msgid "apply the patch in reverse" msgstr "прилагане на кръпката в обратна посока" -#: builtin/apply.c:4406 +#: builtin/apply.c:4410 msgid "don't expect at least one line of context" msgstr "без изискване на дори и един ред контекст" -#: builtin/apply.c:4408 +#: builtin/apply.c:4412 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“" -#: builtin/apply.c:4410 +#: builtin/apply.c:4414 msgid "allow overlapping hunks" msgstr "позволяване на застъпващи се парчета" -#: builtin/apply.c:4413 +#: builtin/apply.c:4417 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл" -#: builtin/apply.c:4416 +#: builtin/apply.c:4420 msgid "do not trust the line counts in the hunk headers" msgstr "без доверяване на номерата на редовете в заглавните части на парчетата" -#: builtin/apply.c:4418 +#: builtin/apply.c:4422 msgid "root" msgstr "НАЧАЛНА_ДИРЕКТОРИЯ" -#: builtin/apply.c:4419 +#: builtin/apply.c:4423 msgid "prepend <root> to all filenames" msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове" -#: builtin/apply.c:4441 +#: builtin/apply.c:4445 msgid "--3way outside a repository" msgstr "като „--3way“, но извън хранилище" -#: builtin/apply.c:4449 +#: builtin/apply.c:4453 msgid "--index outside a repository" msgstr "като „--index“, но извън хранилище" -#: builtin/apply.c:4452 +#: builtin/apply.c:4456 msgid "--cached outside a repository" msgstr "като „--cached“, но извън хранилище" -#: builtin/apply.c:4468 +#: builtin/apply.c:4472 #, c-format msgid "can't open patch '%s'" msgstr "кръпката „%s“ не може да бъде отворена" -#: builtin/apply.c:4482 +#: builtin/apply.c:4486 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "пренебрегната е %d грешка в знаците за интервали" msgstr[1] "пренебрегнати са %d грешки в знаците за интервали" -#: builtin/apply.c:4488 builtin/apply.c:4498 +#: builtin/apply.c:4492 builtin/apply.c:4502 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2868,7 +2966,7 @@ msgstr "" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2599 +#: builtin/blame.c:2602 msgid "4 years, 11 months ago" msgstr "преди 4 години и 11 месеца" @@ -2888,7 +2986,7 @@ msgstr "git branch [ОПЦИЯ…] [-r] (-d | -D) ИМЕ_НА_КЛОН…" msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "git branch [ОПЦИЯ…] (-m | -M) [СТАР_КЛОН] НОВ_КЛОН" -#: builtin/branch.c:150 +#: builtin/branch.c:152 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2897,7 +2995,7 @@ msgstr "" "изтриване на клона „%s“, който е слят към „%s“,\n" " но още не е слят към върха „HEAD“." -#: builtin/branch.c:154 +#: builtin/branch.c:156 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2906,12 +3004,12 @@ msgstr "" "отказване на изтриване на клона „%s“, който не е слят към\n" " „%s“, но е слят към върха „HEAD“." -#: builtin/branch.c:168 +#: builtin/branch.c:170 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Обектът-подаване за „%s“ не може да бъде открит" -#: builtin/branch.c:172 +#: builtin/branch.c:174 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2920,305 +3018,305 @@ msgstr "" "Клонът „%s“ не е слят напълно. Ако сте сигурни, че искате\n" "да го изтриете, изпълнете „git branch -D %s“." -#: builtin/branch.c:185 +#: builtin/branch.c:187 msgid "Update of config-file failed" msgstr "Неуспешно обновяване на конфигурационния файл" -#: builtin/branch.c:213 +#: builtin/branch.c:215 msgid "cannot use -a with -d" msgstr "Опцията „-a“ е несъвместима с опцията „-d“" -#: builtin/branch.c:219 +#: builtin/branch.c:221 msgid "Couldn't look up commit object for HEAD" msgstr "Обектът-подаване, сочен от указателя „HEAD“, не може да бъде открит" -#: builtin/branch.c:227 +#: builtin/branch.c:229 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "Не можете да изтриете клона „%s“, защото в момента е текущ." -#: builtin/branch.c:240 +#: builtin/branch.c:245 #, c-format msgid "remote branch '%s' not found." msgstr "отдалеченият клон „%s“ не може да бъде открит." -#: builtin/branch.c:241 +#: builtin/branch.c:246 #, c-format msgid "branch '%s' not found." msgstr "клонът „%s“ не може да бъде открит." -#: builtin/branch.c:255 +#: builtin/branch.c:260 #, c-format msgid "Error deleting remote branch '%s'" msgstr "Грешка при изтриването на отдалечения клон „%s“" -#: builtin/branch.c:256 +#: builtin/branch.c:261 #, c-format msgid "Error deleting branch '%s'" msgstr "Грешка при изтриването на клона „%s“" -#: builtin/branch.c:263 +#: builtin/branch.c:268 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "Изтрит отдалечен клон „%s“ (той сочеше към „%s“).\n" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n" -#: builtin/branch.c:366 +#: builtin/branch.c:370 #, c-format msgid "branch '%s' does not point at a commit" msgstr "клонът „%s“ не сочи към подаване" -#: builtin/branch.c:454 +#: builtin/branch.c:459 #, c-format msgid "[%s: gone]" msgstr "[%s: изтрит]" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:464 +#: builtin/branch.c:469 #, c-format msgid "[%s: behind %d]" msgstr "[%s: назад с %d]" -#: builtin/branch.c:466 +#: builtin/branch.c:471 #, c-format msgid "[behind %d]" msgstr "[назад с %d]" -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: напред с %d]" -#: builtin/branch.c:472 +#: builtin/branch.c:477 #, c-format msgid "[ahead %d]" msgstr "[напред с %d]" -#: builtin/branch.c:475 +#: builtin/branch.c:480 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: напред с %d, назад с %d]" -#: builtin/branch.c:478 +#: builtin/branch.c:483 #, c-format msgid "[ahead %d, behind %d]" msgstr "[напред с %d, назад с %d]" # FIXME ** how many?? -#: builtin/branch.c:502 +#: builtin/branch.c:496 msgid " **** invalid ref ****" msgstr " ●●●● неправилен указател ●●●●" -#: builtin/branch.c:594 +#: builtin/branch.c:587 #, c-format msgid "(no branch, rebasing %s)" msgstr "(извън клон, пребазиране на „%s“)" -#: builtin/branch.c:597 +#: builtin/branch.c:590 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(извън клон, двоично търсене от „%s“)" -#: builtin/branch.c:600 +#: builtin/branch.c:593 #, c-format msgid "(detached from %s)" msgstr "(състояние, несвързано към „%s“)" -#: builtin/branch.c:603 +#: builtin/branch.c:596 msgid "(no branch)" msgstr "(извън клон)" -#: builtin/branch.c:649 +#: builtin/branch.c:643 #, c-format msgid "object '%s' does not point to a commit" msgstr "обектът „%s“ не сочи към подаване" -#: builtin/branch.c:681 +#: builtin/branch.c:691 msgid "some refs could not be read" msgstr "някои указатели не могат да бъдат прочетени" -#: builtin/branch.c:694 +#: builtin/branch.c:704 msgid "cannot rename the current branch while not on any." msgstr "" "не можете да преименувате текущия клон, защото сте извън който и да е клон" -#: builtin/branch.c:704 +#: builtin/branch.c:714 #, c-format msgid "Invalid branch name: '%s'" msgstr "Неправилно име на клон: „%s“" -#: builtin/branch.c:719 +#: builtin/branch.c:729 msgid "Branch rename failed" msgstr "Неуспешно преименуване на клон" -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "На клона с неправилно име „%s“ е дадено служебно име" -#: builtin/branch.c:727 +#: builtin/branch.c:737 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен" -#: builtin/branch.c:734 +#: builtin/branch.c:744 msgid "Branch is renamed, but update of config-file failed" msgstr "Клонът е преименуван, но конфигурационният файл не е обновен" -#: builtin/branch.c:749 +#: builtin/branch.c:759 #, c-format msgid "malformed object name %s" msgstr "неправилно име на обект „%s“" -#: builtin/branch.c:773 +#: builtin/branch.c:783 #, c-format msgid "could not write branch description template: %s" msgstr "шаблонът за описание на клон не бе записан: „%s“" -#: builtin/branch.c:803 +#: builtin/branch.c:813 msgid "Generic options" msgstr "Общи настройки" -#: builtin/branch.c:805 +#: builtin/branch.c:815 msgid "show hash and subject, give twice for upstream branch" msgstr "" "извеждане на хеша и темата. Повтарянето на опцията прибавя отдалечените клони" -#: builtin/branch.c:806 +#: builtin/branch.c:816 msgid "suppress informational messages" msgstr "без информационни съобщения" -#: builtin/branch.c:807 +#: builtin/branch.c:817 msgid "set up tracking mode (see git-pull(1))" msgstr "задаване на режима на следене (виж git-pull(1))" -#: builtin/branch.c:809 +#: builtin/branch.c:819 msgid "change upstream info" msgstr "смяна на следения клон" -#: builtin/branch.c:813 +#: builtin/branch.c:823 msgid "use colored output" msgstr "цветен изход" -#: builtin/branch.c:814 +#: builtin/branch.c:824 msgid "act on remote-tracking branches" msgstr "действие върху следящите клони" -#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 -#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574 -#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615 -#: builtin/tag.c:621 +#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 +#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623 +#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616 +#: builtin/tag.c:622 msgid "commit" msgstr "подаване" -#: builtin/branch.c:818 builtin/branch.c:824 +#: builtin/branch.c:828 builtin/branch.c:834 msgid "print only branches that contain the commit" msgstr "извеждане само на клоните, които съдържат това подаване" -#: builtin/branch.c:830 +#: builtin/branch.c:840 msgid "Specific git-branch actions:" msgstr "Специални действия на „git-branch“:" -#: builtin/branch.c:831 +#: builtin/branch.c:841 msgid "list both remote-tracking and local branches" msgstr "извеждане както на следящите, така и на локалните клони" -#: builtin/branch.c:833 +#: builtin/branch.c:843 msgid "delete fully merged branch" msgstr "изтриване на клони, които са напълно слети" -#: builtin/branch.c:834 +#: builtin/branch.c:844 msgid "delete branch (even if not merged)" msgstr "изтриване и на клони, които не са напълно слети" -#: builtin/branch.c:835 +#: builtin/branch.c:845 msgid "move/rename a branch and its reflog" msgstr "" "преместване/преименуване на клон и принадлежащият му журнал на указателите" -#: builtin/branch.c:836 +#: builtin/branch.c:846 msgid "move/rename a branch, even if target exists" msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име" -#: builtin/branch.c:837 +#: builtin/branch.c:847 msgid "list branch names" msgstr "извеждане на имената на клоните" -#: builtin/branch.c:838 +#: builtin/branch.c:848 msgid "create the branch's reflog" msgstr "създаване на журнала на указателите на клона" -#: builtin/branch.c:840 +#: builtin/branch.c:850 msgid "edit the description for the branch" msgstr "редактиране на описанието на клона" -#: builtin/branch.c:841 +#: builtin/branch.c:851 msgid "force creation (when already exists)" msgstr "принудително създаване, дори ако съществува клон с такова име" -#: builtin/branch.c:844 +#: builtin/branch.c:854 msgid "print only not merged branches" msgstr "извеждане само на неслетите клони" -#: builtin/branch.c:850 +#: builtin/branch.c:860 msgid "print only merged branches" msgstr "извеждане само на слетите клони" -#: builtin/branch.c:854 +#: builtin/branch.c:864 msgid "list branches in columns" msgstr "извеждане по колони" -#: builtin/branch.c:867 +#: builtin/branch.c:877 msgid "Failed to resolve HEAD as a valid ref." msgstr "Не може да се открие към какво сочи указателят „HEAD“" -#: builtin/branch.c:872 builtin/clone.c:636 +#: builtin/branch.c:881 builtin/clone.c:634 msgid "HEAD not found below refs/heads!" msgstr "В директорията „refs/heads“ липсва файл „HEAD“" -#: builtin/branch.c:896 +#: builtin/branch.c:903 msgid "--column and --verbose are incompatible" msgstr "Опциите „--column“ и „--verbose“ са несъвместими" -#: builtin/branch.c:902 builtin/branch.c:941 +#: builtin/branch.c:909 builtin/branch.c:948 msgid "branch name required" msgstr "Необходимо е име на клон" -#: builtin/branch.c:917 +#: builtin/branch.c:924 msgid "Cannot give description to detached HEAD" msgstr "Не може да зададете описание на „HEAD“ извън клон" -#: builtin/branch.c:922 +#: builtin/branch.c:929 msgid "cannot edit description of more than one branch" msgstr "Не може да редактирате описанието на повече от един клон едновременно" -#: builtin/branch.c:929 +#: builtin/branch.c:936 #, c-format msgid "No commit on branch '%s' yet." msgstr "В клона „%s“ все още няма подавания." -#: builtin/branch.c:932 +#: builtin/branch.c:939 #, c-format msgid "No branch named '%s'." msgstr "Липсва клон на име „%s“." -#: builtin/branch.c:947 +#: builtin/branch.c:954 msgid "too many branches for a rename operation" msgstr "Прекалено много клони за преименуване" -#: builtin/branch.c:952 +#: builtin/branch.c:959 msgid "too many branches to set new upstream" msgstr "Прекалено много клони за задаване на следене" -#: builtin/branch.c:956 +#: builtin/branch.c:963 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3226,39 +3324,39 @@ msgstr "" "Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към " "никой клон." -#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 +#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009 #, c-format msgid "no such branch '%s'" msgstr "Няма клон на име „%s“." -#: builtin/branch.c:963 +#: builtin/branch.c:970 #, c-format msgid "branch '%s' does not exist" msgstr "Не съществува клон на име „%s“." -#: builtin/branch.c:975 +#: builtin/branch.c:982 msgid "too many branches to unset upstream" msgstr "Прекалено много клони за махане на следене" -#: builtin/branch.c:979 +#: builtin/branch.c:986 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон." -#: builtin/branch.c:985 +#: builtin/branch.c:992 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Няма информация клонът „%s“ да следи някой друг" -#: builtin/branch.c:999 +#: builtin/branch.c:1006 msgid "it does not make sense to create 'HEAD' manually" msgstr "Няма никакъв смисъл ръчно да създавате „HEAD“." -#: builtin/branch.c:1005 +#: builtin/branch.c:1012 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "Опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон" -#: builtin/branch.c:1008 +#: builtin/branch.c:1015 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3267,7 +3365,7 @@ msgstr "" "Опцията „--set-upstream“ вече е остаряла и предстои да бъде махната. " "Използвайте „--track“ или „--set-upstream-to“\n" -#: builtin/branch.c:1025 +#: builtin/branch.c:1032 #, c-format msgid "" "\n" @@ -3278,12 +3376,12 @@ msgstr "" "За да накарате „%s“ да следи „%s“, изпълнете следната команда:\n" "\n" -#: builtin/branch.c:1026 +#: builtin/branch.c:1033 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1027 +#: builtin/branch.c:1034 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3301,48 +3399,48 @@ msgstr "За създаването на пратка е необходимо х msgid "Need a repository to unbundle." msgstr "За приемането на пратка е необходимо хранилище." -#: builtin/cat-file.c:331 +#: builtin/cat-file.c:332 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|ВИД|--textconv) ОБЕКТ" -#: builtin/cat-file.c:332 +#: builtin/cat-file.c:333 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < СПИСЪК_С_ОБЕКТИ" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:370 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" "ВИДът може да е: „blob“ (обект BLOB), „tree“ (дърво), „commit“ (подаване), " "„tag“ (етикет)" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:371 msgid "show object type" msgstr "извеждане на вида на обект" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:372 msgid "show object size" msgstr "извеждане на размера на обект" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:374 msgid "exit with zero when there's no error" msgstr "изход с 0, когато няма грешка" -#: builtin/cat-file.c:374 +#: builtin/cat-file.c:375 msgid "pretty-print object's content" msgstr "форматирано извеждане на съдържанието на обекта" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:377 msgid "for blob objects, run textconv on object's content" msgstr "" "да се стартира програмата зададена в настройката „textconv“ за преобразуване " "на съдържанието на обекта" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:379 msgid "show info and content of objects fed from the standard input" msgstr "" "извеждане на информация и съдържание на обектите подадени на стандартния вход" -#: builtin/cat-file.c:381 +#: builtin/cat-file.c:382 msgid "show info about objects fed from the standard input" msgstr "извеждане на информация за обектите подадени на стандартния вход" @@ -3362,7 +3460,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:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "изчитане на имената на файловете от стандартния вход" @@ -3370,7 +3468,7 @@ msgstr "изчитане на имената на файловете от ста msgid "terminate input and output records by a NUL character" msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“" -#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274 msgid "suppress progress reporting" msgstr "без показване на напредъка" @@ -3541,46 +3639,46 @@ msgstr "пътят „%s“ не е слят" msgid "you need to resolve your current index first" msgstr "първо трябва да коригирате индекса си" -#: builtin/checkout.c:591 +#: builtin/checkout.c:597 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Журналът на указателите за „%s“ не може да бъде създаден\n" -#: builtin/checkout.c:629 +#: builtin/checkout.c:635 msgid "HEAD is now at" msgstr "Указателят „HEAD“ в момента сочи към" -#: builtin/checkout.c:636 +#: builtin/checkout.c:642 #, c-format msgid "Reset branch '%s'\n" msgstr "Зануляване на клона „%s“\n" -#: builtin/checkout.c:639 +#: builtin/checkout.c:645 #, c-format msgid "Already on '%s'\n" msgstr "Вече сте на „%s“\n" -#: builtin/checkout.c:643 +#: builtin/checkout.c:649 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Преминаване към клона „%s“ и зануляване на промените\n" -#: builtin/checkout.c:645 builtin/checkout.c:1026 +#: builtin/checkout.c:651 builtin/checkout.c:1032 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Преминахте към новия клон „%s“\n" -#: builtin/checkout.c:647 +#: builtin/checkout.c:653 #, c-format msgid "Switched to branch '%s'\n" msgstr "Преминахте към клона „%s“\n" -#: builtin/checkout.c:699 +#: builtin/checkout.c:705 #, c-format msgid " ... and %d more.\n" msgstr "… и още %d.\n" -#: builtin/checkout.c:705 +#: builtin/checkout.c:711 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3602,7 +3700,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:723 +#: builtin/checkout.c:729 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3617,143 +3715,143 @@ msgstr "" " git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n" "\n" -#: builtin/checkout.c:753 +#: builtin/checkout.c:759 msgid "internal error in revision walk" msgstr "вътрешна грешка при обхождането на версиите" -#: builtin/checkout.c:757 +#: builtin/checkout.c:763 msgid "Previous HEAD position was" msgstr "Преди това „HEAD“ сочеше към" -#: builtin/checkout.c:784 builtin/checkout.c:1021 +#: builtin/checkout.c:790 builtin/checkout.c:1027 msgid "You are on a branch yet to be born" msgstr "В момента сте на клон, който предстои да бъде създаден" -#: builtin/checkout.c:928 +#: builtin/checkout.c:934 #, c-format msgid "only one reference expected, %d given." msgstr "очакваше се един указател, а сте подали %d." -#: builtin/checkout.c:967 +#: builtin/checkout.c:973 #, c-format msgid "invalid reference: %s" msgstr "неправилен указател: %s" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1002 #, c-format msgid "reference is not a tree: %s" msgstr "указателят не сочи към обект-дърво: %s" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1041 msgid "paths cannot be used with switching branches" msgstr "задаването на път е несъвместимо с преминаването от един клон към друг" -#: builtin/checkout.c:1038 builtin/checkout.c:1042 +#: builtin/checkout.c:1044 builtin/checkout.c:1048 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг" -#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054 -#: builtin/checkout.c:1057 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 +#: builtin/checkout.c:1063 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1068 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" "За да преминете към клон, подайте указател, който сочи към подаване. „%s“ не " "е такъв" -#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "клон" -#: builtin/checkout.c:1085 +#: builtin/checkout.c:1091 msgid "create and checkout a new branch" msgstr "създаване и преминаване към нов клон" -#: builtin/checkout.c:1087 +#: builtin/checkout.c:1093 msgid "create/reset and checkout a branch" msgstr "създаване/зануляване на клон и преминаване към него" -#: builtin/checkout.c:1088 +#: builtin/checkout.c:1094 msgid "create reflog for new branch" msgstr "създаване на журнал на указателите за нов клон" -#: builtin/checkout.c:1089 +#: builtin/checkout.c:1095 msgid "detach the HEAD at named commit" msgstr "отделяне на указателя „HEAD“ към указаното подаване" -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1096 msgid "set upstream info for new branch" msgstr "задаване на кой клон бива следен при създаването на новия клон" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new-branch" msgstr "НОВ_КЛОН" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new unparented branch" msgstr "нов клон без родител" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1099 msgid "checkout our version for unmerged files" msgstr "изтегляне на вашата версия на неслетите файлове" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1101 msgid "checkout their version for unmerged files" msgstr "изтегляне на чуждата версия на неслетите файлове" -#: builtin/checkout.c:1097 +#: builtin/checkout.c:1103 msgid "force checkout (throw away local modifications)" msgstr "принудително изтегляне (вашите промени ще бъдат занулени)" -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1104 msgid "perform a 3-way merge with the new branch" msgstr "извършване на тройно сливане с новия клон" -#: builtin/checkout.c:1099 builtin/merge.c:225 +#: builtin/checkout.c:1105 builtin/merge.c:226 msgid "update ignored files (default)" msgstr "обновяване на игнорираните файлове (стандартно)" -#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245 +#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245 msgid "style" msgstr "стил" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1107 msgid "conflict style (merge or diff3)" msgstr "действие при конфликт (сливане или тройна разлика)" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1110 msgid "do not limit pathspecs to sparse entries only" msgstr "без ограничаване на изброените пътища само до частично изтеглените" -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1112 msgid "second guess 'git checkout no-such-branch'" msgstr "" "последващ опит за отгатване след неуспешен опит с „git checkout no-such-" "branch“" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1135 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1152 msgid "--track needs a branch name" msgstr "опцията „--track“ изисква име на клон" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1157 msgid "Missing branch name; try -b" msgstr "Липсва име на клон, използвайте опцията „-b“" -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1194 msgid "invalid path specification" msgstr "указан е неправилен път" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1201 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3762,12 +3860,12 @@ msgstr "" "Не можете едновременно да обновявате пътища и да преминете към клона „%s“.\n" "Дали не искате да изтеглите „%s“, който не сочи към подаване?" -#: builtin/checkout.c:1202 +#: builtin/checkout.c:1206 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“" -#: builtin/checkout.c:1206 +#: builtin/checkout.c:1210 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3841,7 +3939,7 @@ msgstr "" #: builtin/clean.c:517 #, c-format msgid "Huh (%s)?" -msgstr "Неправилен избор (%s)" +msgstr "Неправилен избор (%s). Изберете отново." # FIXME - should we use >> or sth else #: builtin/clean.c:659 @@ -3922,7 +4020,7 @@ msgstr "интерактивно изтриване" msgid "remove whole directories" msgstr "изтриване на цели директории" -#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714 +#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "шаблон" @@ -3960,148 +4058,148 @@ msgstr "" "което изисква някоя от опциите „-i“, „-n“ или „-f“. Няма да се извърши " "изчистване" -#: builtin/clone.c:36 +#: builtin/clone.c:37 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" -#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222 -#: builtin/push.c:503 +#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223 +#: builtin/push.c:514 msgid "force progress reporting" msgstr "извеждане на напредъка" -#: builtin/clone.c:66 +#: builtin/clone.c:67 msgid "don't create a checkout" msgstr "без създаване на работно дърво" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 msgid "create a bare repository" msgstr "създаване на голо хранилище" -#: builtin/clone.c:71 +#: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" msgstr "" "създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)" -#: builtin/clone.c:73 +#: builtin/clone.c:74 msgid "to clone from a local repository" msgstr "клониране от локално хранилище" -#: builtin/clone.c:75 +#: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" msgstr "без твърди връзки, файловете винаги да се копират" -#: builtin/clone.c:77 +#: builtin/clone.c:78 msgid "setup as shared repository" msgstr "настройване за споделено хранилище" -#: builtin/clone.c:79 builtin/clone.c:81 +#: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" msgstr "инициализиране на подмодулите при това клониране" -#: builtin/clone.c:82 builtin/init-db.c:483 +#: builtin/clone.c:83 builtin/init-db.c:485 msgid "template-directory" msgstr "директория с шаблони" -#: builtin/clone.c:83 builtin/init-db.c:484 +#: builtin/clone.c:84 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "директория, която съдържа шаблоните, които да се ползват" -#: builtin/clone.c:85 +#: builtin/clone.c:86 msgid "reference repository" msgstr "еталонно хранилище" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "ИМЕ" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "use <name> instead of 'origin' to track upstream" msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "path to git-upload-pack on the remote" msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище" -#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659 msgid "depth" msgstr "ДЪЛБОЧИНА" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "create a shallow clone of that depth" msgstr "плитко клониране до тази ДЪЛБОЧИНА" -#: builtin/clone.c:95 +#: builtin/clone.c:96 msgid "clone only one branch, HEAD or --branch" msgstr "" "клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично " "зададения с „--branch“" -#: builtin/clone.c:96 builtin/init-db.c:492 +#: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ" -#: builtin/clone.c:97 builtin/init-db.c:493 +#: builtin/clone.c:98 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "key=value" msgstr "КЛЮЧ=СТОЙНОСТ" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "set config inside the new repository" msgstr "задаване на настройките на новото хранилище" -#: builtin/clone.c:252 +#: builtin/clone.c:253 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "еталонното хранилище „%s“ не е локално" -#: builtin/clone.c:256 +#: builtin/clone.c:257 #, c-format msgid "reference repository '%s' is shallow" msgstr "еталонното хранилище „%s“ е плитко" -#: builtin/clone.c:259 +#: builtin/clone.c:260 #, c-format msgid "reference repository '%s' is grafted" msgstr "еталонното хранилище „%s“ е с присаждане" -#: builtin/clone.c:321 +#: builtin/clone.c:322 #, c-format msgid "failed to create directory '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/clone.c:323 builtin/diff.c:83 +#: builtin/clone.c:324 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "не може да бъде получена информация чрез „stat“ за „%s“" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "%s exists and is not a directory" msgstr "„%s“ съществува и не е директория" -#: builtin/clone.c:339 +#: builtin/clone.c:340 #, c-format msgid "failed to stat %s\n" msgstr "не може да бъде получена информация чрез „stat“ за „%s“\n" -#: builtin/clone.c:361 +#: builtin/clone.c:362 #, c-format msgid "failed to create link '%s'" msgstr "връзката „%s“ не може да бъде създадена" -#: builtin/clone.c:365 +#: builtin/clone.c:366 #, c-format msgid "failed to copy file to '%s'" msgstr "файлът не може да бъде копиран като „%s“" -#: builtin/clone.c:388 builtin/clone.c:565 +#: builtin/clone.c:389 builtin/clone.c:563 #, c-format msgid "done.\n" msgstr "действието завърши.\n" @@ -4117,7 +4215,7 @@ msgstr "" "клон в момента са изтеглени с командата „git status“. Можете да\n" "завършите изтеглянето на клона с командата „git checkout -f HEAD“.\n" -#: builtin/clone.c:480 +#: builtin/clone.c:478 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" @@ -4125,107 +4223,107 @@ msgstr "" "и който следва да бъде изтеглен, не съществува." # FIXME translator note that the space at end is necesssary -#: builtin/clone.c:560 +#: builtin/clone.c:558 #, c-format msgid "Checking connectivity... " msgstr "Проверка на връзката… " -#: builtin/clone.c:563 +#: builtin/clone.c:561 msgid "remote did not send all necessary objects" msgstr "отдалеченото хранилище не изпрати всички необходими обекти." -#: builtin/clone.c:627 +#: builtin/clone.c:625 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n" "което не съществува. Не може да се изтегли определен клон.\n" -#: builtin/clone.c:658 +#: builtin/clone.c:656 msgid "unable to checkout working tree" msgstr "работното дърво не може да бъде подготвено" -#: builtin/clone.c:768 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "Прекалено много аргументи." -#: builtin/clone.c:772 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "Трябва да укажете кое хранилище искате да клонирате." -#: builtin/clone.c:783 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "опциите „--bare“ и „--origin %s“ са несъвместими." -#: builtin/clone.c:786 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими." -#: builtin/clone.c:799 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "не съществува хранилище „%s“" -#: builtin/clone.c:805 builtin/fetch.c:1143 +#: builtin/clone.c:802 builtin/fetch.c:1155 #, c-format msgid "depth %s is not a positive number" msgstr "дълбочината трябва да е положително цяло число, а не „%s“" -#: builtin/clone.c:815 +#: builtin/clone.c:812 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевият път „%s“ съществува и не е празна директория." -#: builtin/clone.c:825 +#: builtin/clone.c:822 #, c-format msgid "working tree '%s' already exists." msgstr "в „%s“ вече съществува работно дърво." -#: builtin/clone.c:838 builtin/clone.c:850 +#: builtin/clone.c:835 builtin/clone.c:847 #, c-format msgid "could not create leading directories of '%s'" msgstr "родителските директории на „%s“ не могат да бъдат създадени" -#: builtin/clone.c:841 +#: builtin/clone.c:838 #, c-format msgid "could not create work tree dir '%s'." msgstr "работното дърво в „%s“ не може да бъде създадено." -#: builtin/clone.c:860 +#: builtin/clone.c:857 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клониране и създаване на голо хранилище в „%s“…\n" -#: builtin/clone.c:862 +#: builtin/clone.c:859 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клониране и създаване на хранилище в „%s“…\n" -#: builtin/clone.c:898 +#: builtin/clone.c:895 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--depth“ се игнорира. Ползвайте схемата " "„file://“." -#: builtin/clone.c:901 +#: builtin/clone.c:898 msgid "source repository is shallow, ignoring --local" msgstr "клонираното хранилище е плитко, затова опцията „--local“ се игнорира" -#: builtin/clone.c:906 +#: builtin/clone.c:903 msgid "--local is ignored" msgstr "опцията „--local“ се игнорира" -#: builtin/clone.c:910 +#: builtin/clone.c:907 #, c-format msgid "Don't know how to clone %s" msgstr "Не се поддържа клониране на връзки от вида „%s“ " -#: builtin/clone.c:961 builtin/clone.c:969 +#: builtin/clone.c:958 builtin/clone.c:966 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“" -#: builtin/clone.c:972 +#: builtin/clone.c:969 msgid "You appear to have cloned an empty repository." msgstr "Изглежда клонирахте празно хранилище." @@ -4261,15 +4359,43 @@ msgstr "Поле в знаци между колоните" msgid "--command must be the first argument" msgstr "опцията „--command“ трябва да е първият аргумент" -#: builtin/commit.c:36 +#: builtin/commit.c:37 msgid "git commit [options] [--] <pathspec>..." msgstr "git commit [ОПЦИЯ…] [--] ПЪТ…" -#: builtin/commit.c:41 +#: builtin/commit.c:42 msgid "git status [options] [--] <pathspec>..." msgstr "git status [ОПЦИЯ…] [--] ПЪТ…" -#: builtin/commit.c:46 +#: builtin/commit.c:47 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"Името и адресът за е-поща са настроени автоматично на базата на името на\n" +"потребителя и името на машината. Проверете дали са верни. Можете да спрете\n" +"това съобщение като изрично зададете стойностите. Изпълнете следната " +"команда\n" +"и следвайте инструкциите в текстовия ви редактор, за да редактирате\n" +"конфигурационния файл:\n" +"\n" +" git config --global --edit\n" +"\n" +"След като направите това, можете да коригирате информацията за автора на\n" +"текущото подаване чрез:\n" +"\n" +" git commit --amend --reset-author\n" + +#: builtin/commit.c:60 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4294,7 +4420,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:58 +#: builtin/commit.c:72 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -4306,7 +4432,7 @@ msgstr "" "с опцията „--allow-empty“, или да го изтриете от историята с командата:\n" "„git reset HEAD^“.\n" -#: builtin/commit.c:63 +#: builtin/commit.c:77 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4321,11 +4447,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:70 +#: builtin/commit.c:84 msgid "Otherwise, please use 'git reset'\n" msgstr "В противен случай използвайте командата „git reset“\n" -#: builtin/commit.c:73 +#: builtin/commit.c:87 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4341,58 +4467,75 @@ msgstr "" "Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n" "останалите подавания.\n" -#: builtin/commit.c:288 +#: builtin/commit.c:302 msgid "failed to unpack HEAD tree object" -msgstr "неуспешно изваждана на върховото дърво (HEAD tree object) от пакет" +msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет" -#: builtin/commit.c:328 +#: builtin/commit.c:342 msgid "unable to create temporary index" -msgstr "неуспешно създаване на временен индекс" +msgstr "временният индекс не може да бъде създаден" -#: builtin/commit.c:334 +#: builtin/commit.c:348 msgid "interactive add failed" msgstr "неуспешно интерактивно добавяне" -#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435 +#: builtin/commit.c:359 +msgid "unable to write index file" +msgstr "индексът не може да бъде записан" + +#: builtin/commit.c:361 +msgid "unable to update temporary index" +msgstr "временният индекс не може да бъде обновен" + +#: builtin/commit.c:363 +msgid "Failed to update main cache tree" +msgstr "Дървото на основния кеш не може да бъде обновено" + +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 msgid "unable to write new_index file" -msgstr "неуспешен запис на новия индекс" +msgstr "новият индекс не може да бъде записан" -#: builtin/commit.c:418 +#: builtin/commit.c:443 msgid "cannot do a partial commit during a merge." msgstr "по време на сливане не може да се извърши частично подаване." -#: builtin/commit.c:420 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a cherry-pick." msgstr "по време на отбиране не може да се извърши частично подаване." -#: builtin/commit.c:429 +#: builtin/commit.c:454 msgid "cannot read the index" msgstr "индексът не може да бъде прочетен" -#: builtin/commit.c:447 +#: builtin/commit.c:473 msgid "unable to write temporary index file" msgstr "временният индекс не може да бъде записан" -#: builtin/commit.c:557 builtin/commit.c:563 +#: builtin/commit.c:592 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "заглавната част за автор в подаването „%s“ липсва" + +#: builtin/commit.c:594 #, c-format -msgid "invalid commit: %s" -msgstr "неправилно подаване: %s" +msgid "commit '%s' has malformed author line" +msgstr "заглавната част за автор в подаването „%s“ е неправилна" -#: builtin/commit.c:585 +#: builtin/commit.c:613 msgid "malformed --author parameter" msgstr "неправилен параметър към опцията „--author“" -#: builtin/commit.c:592 +#: builtin/commit.c:621 #, c-format msgid "invalid date format: %s" msgstr "неправилен формат на дата: %s" -#: builtin/commit.c:609 +#: builtin/commit.c:642 #, c-format msgid "Malformed ident string: '%s'" msgstr "Неправилен низ за идентичност: „%s“" -#: builtin/commit.c:642 +#: builtin/commit.c:675 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4400,44 +4543,44 @@ msgstr "" "не може да се избере знак за коментар — в текущото съобщение за подаване са " "използвани всички подобни знаци" -#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086 +#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120 #, c-format msgid "could not lookup commit %s" msgstr "следното подаване не може да бъде открито: %s" -#: builtin/commit.c:691 builtin/shortlog.c:273 +#: builtin/commit.c:724 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(изчитане на съобщението за подаване от стандартния вход)\n" -#: builtin/commit.c:693 +#: builtin/commit.c:726 msgid "could not read log from standard input" msgstr "съобщението за подаване не бе прочетено стандартния вход" -#: builtin/commit.c:697 +#: builtin/commit.c:730 #, c-format msgid "could not read log file '%s'" msgstr "файлът със съобщението за подаване „%s“ не може да бъде прочетен" -#: builtin/commit.c:719 +#: builtin/commit.c:752 msgid "could not read MERGE_MSG" msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено" -#: builtin/commit.c:723 +#: builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "съобщението за смачкване SQUASH_MSG не може да бъде прочетено" -#: builtin/commit.c:727 +#: builtin/commit.c:760 #, c-format msgid "could not read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: builtin/commit.c:798 +#: builtin/commit.c:831 msgid "could not write commit template" msgstr "шаблонът за подаване не може да бъде запазен" # FIXME -#: builtin/commit.c:816 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -4453,7 +4596,7 @@ msgstr "" "и опитайте отново.\n" # FIXME -#: builtin/commit.c:821 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -4469,7 +4612,7 @@ msgstr "" " %s\n" "и опитайте отново.\n" -#: builtin/commit.c:834 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4478,7 +4621,7 @@ msgstr "" "Въведете съобщението за подаване на промените. Редовете, които започват\n" "с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n" -#: builtin/commit.c:841 +#: builtin/commit.c:874 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4489,155 +4632,158 @@ msgstr "" "с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n" "съобщение преустановява подаването.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:888 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sАвтор: %.*s <%.*s>" -#: builtin/commit.c:863 +#: builtin/commit.c:896 #, c-format msgid "%sDate: %s" msgstr "%sДата: %s" -#: builtin/commit.c:870 +#: builtin/commit.c:903 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sПодаващ: %.*s <%.*s>" -#: builtin/commit.c:888 +#: builtin/commit.c:921 msgid "Cannot read index" msgstr "Индексът не може да бъде прочетен" -#: builtin/commit.c:945 +#: builtin/commit.c:978 msgid "Error building trees" msgstr "Грешка при изграждане на дърветата" -#: builtin/commit.c:960 builtin/tag.c:495 +#: builtin/commit.c:993 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n" -#: builtin/commit.c:1061 +#: builtin/commit.c:1095 #, c-format msgid "No existing author found with '%s'" msgstr "Не е открит автор с име „%s“." -#: builtin/commit.c:1076 builtin/commit.c:1316 +#: builtin/commit.c:1110 builtin/commit.c:1350 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Неправилна стойност за неследените файлове: „%s“" -#: builtin/commit.c:1113 +#: builtin/commit.c:1147 msgid "--long and -z are incompatible" msgstr "Опциите „--long“ и „-z“ са несъвместими." -#: builtin/commit.c:1143 +#: builtin/commit.c:1177 msgid "Using both --reset-author and --author does not make sense" msgstr "Опциите „--reset-author“ и „--author“ са несъвместими." -#: builtin/commit.c:1152 +#: builtin/commit.c:1186 msgid "You have nothing to amend." msgstr "Няма какво да бъде поправено." -#: builtin/commit.c:1155 +#: builtin/commit.c:1189 msgid "You are in the middle of a merge -- cannot amend." msgstr "В момента се извършва сливане, не можете да поправяте." -#: builtin/commit.c:1157 +#: builtin/commit.c:1191 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "В момента се извършва отбиране на подаване, не можете да поправяте." -#: builtin/commit.c:1160 +#: builtin/commit.c:1194 msgid "Options --squash and --fixup cannot be used together" msgstr "Опциите „--squash“ и „--fixup“ са несъвместими." -#: builtin/commit.c:1170 +#: builtin/commit.c:1204 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими." -#: builtin/commit.c:1172 +#: builtin/commit.c:1206 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“, „-F“ и „--fixup“." -#: builtin/commit.c:1180 +#: builtin/commit.c:1214 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n" "„--amend“." -#: builtin/commit.c:1197 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n" "несъвместими." -#: builtin/commit.c:1199 +#: builtin/commit.c:1233 msgid "No paths with --include/--only does not make sense." msgstr "Опциите „--include“ и „--only“ изискват аргументи." # FIXME bad message -#: builtin/commit.c:1201 +#: builtin/commit.c:1235 msgid "Clever... amending the last one with dirty index." msgstr "" -"Поправяте последното подаване докато индексът има проблеми. Това е лоша идея." +"Чудесно сте се сетили как да поправите съобщението на последното подаване " +"при\n" +"променен индекс. Споделете и с друг потребител трика с „git commit --amend -" +"o“." -#: builtin/commit.c:1203 +#: builtin/commit.c:1237 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "Зададени са изрични пътища без опциите „-i“ или „-o“. Приема се, че все едно " "сте\n" "ползвали опцията „--only“ с ПЪТища…" -#: builtin/commit.c:1215 builtin/tag.c:727 +#: builtin/commit.c:1249 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Несъществуващ режим на изчистване „%s“" -#: builtin/commit.c:1220 +#: builtin/commit.c:1254 msgid "Paths with -a does not make sense." msgstr "Опцията „-a“ е несъвместима със задаването на пътища." -#: builtin/commit.c:1330 builtin/commit.c:1595 +#: builtin/commit.c:1364 builtin/commit.c:1644 msgid "show status concisely" msgstr "кратка информация за състоянието" -#: builtin/commit.c:1332 builtin/commit.c:1597 +#: builtin/commit.c:1366 builtin/commit.c:1646 msgid "show branch information" msgstr "информация за клоните" -#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489 +#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500 msgid "machine-readable output" msgstr "формат на изхода за четене от програма" -#: builtin/commit.c:1337 builtin/commit.c:1601 +#: builtin/commit.c:1371 builtin/commit.c:1650 msgid "show status in long format (default)" msgstr "подробна информация за състоянието (стандартно)" -#: builtin/commit.c:1340 builtin/commit.c:1604 +#: builtin/commit.c:1374 builtin/commit.c:1653 msgid "terminate entries with NUL" msgstr "разделяне на елементите с нулевия знак „NUL“" -#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703 -#: builtin/fast-export.c:706 builtin/tag.c:602 +#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980 +#: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "режим" -#: builtin/commit.c:1343 builtin/commit.c:1607 +#: builtin/commit.c:1377 builtin/commit.c:1656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "извеждане на неследените файлове. Възможните режими са „all“ (подробна\n" "информация), „normal“ (кратка информация), „no“ (без неследените файлове).\n" "Стандартният режим е: „all“." -#: builtin/commit.c:1346 +#: builtin/commit.c:1380 msgid "show ignored files" msgstr "извеждане на игнорираните файлове" -#: builtin/commit.c:1347 parse-options.h:153 +#: builtin/commit.c:1381 parse-options.h:153 msgid "when" msgstr "кога" -#: builtin/commit.c:1348 +#: builtin/commit.c:1382 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4646,224 +4792,216 @@ msgstr "" "една от\n" "„all“ (всички), „dirty“ (тези с неподадени промени), „untracked“ (неследени)" -#: builtin/commit.c:1350 +#: builtin/commit.c:1384 msgid "list untracked files in columns" msgstr "извеждане на неследените файлове в колони" -#: builtin/commit.c:1419 +#: builtin/commit.c:1471 msgid "couldn't look up newly created commit" msgstr "току що създаденото подаване не може да бъде открито" -#: builtin/commit.c:1421 +#: builtin/commit.c:1473 msgid "could not parse newly created commit" msgstr "току що създаденото подаване не може да бъде анализирано" -#: builtin/commit.c:1469 +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "несвързан връх „HEAD“" -#: builtin/commit.c:1471 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr " (начално подаване)" -#: builtin/commit.c:1565 +#: builtin/commit.c:1614 msgid "suppress summary after successful commit" msgstr "без информация след успешно подаване" -#: builtin/commit.c:1566 +#: builtin/commit.c:1615 msgid "show diff in commit message template" msgstr "добавяне на разликата към шаблона за съобщението при подаване" -#: builtin/commit.c:1568 +#: builtin/commit.c:1617 msgid "Commit message options" msgstr "Опции за съобщението при подаване" -#: builtin/commit.c:1569 builtin/tag.c:600 +#: builtin/commit.c:1618 builtin/tag.c:601 msgid "read message from file" msgstr "взимане на съобщението от файл" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "author" msgstr "автор" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "override author for commit" msgstr "задаване на автор за подаването" -#: builtin/commit.c:1571 builtin/gc.c:286 +#: builtin/commit.c:1620 builtin/gc.c:275 msgid "date" msgstr "дата" -#: builtin/commit.c:1571 +#: builtin/commit.c:1620 msgid "override date for commit" msgstr "задаване на дата за подаването" -#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409 -#: builtin/notes.c:566 builtin/tag.c:598 +#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/tag.c:599 msgid "message" msgstr "съобщение" -#: builtin/commit.c:1572 +#: builtin/commit.c:1621 msgid "commit message" msgstr "съобщение при подаване" -#: builtin/commit.c:1573 +#: builtin/commit.c:1622 msgid "reuse and edit message from specified commit" msgstr "преизползване и редактиране на съобщението от указаното подаване" -#: builtin/commit.c:1574 +#: builtin/commit.c:1623 msgid "reuse message from specified commit" msgstr "преизползване на съобщението от указаното подаване" -#: builtin/commit.c:1575 +#: builtin/commit.c:1624 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "използване на автоматичното съобщение при смачкване за вкарване на " "указаното\n" "подаване в предното без следа" -#: builtin/commit.c:1576 +#: builtin/commit.c:1625 msgid "use autosquash formatted message to squash specified commit" msgstr "" "използване на автоматичното съобщение при смачкване за смачкване на " "указаното\n" "подаване в предното" -#: builtin/commit.c:1577 +#: builtin/commit.c:1626 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)" -#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86 +#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "добавяне на поле за подпис — „Signed-off-by:“" -#: builtin/commit.c:1579 +#: builtin/commit.c:1628 msgid "use specified template file" msgstr "използване на указания шаблонен файл" -#: builtin/commit.c:1580 +#: builtin/commit.c:1629 msgid "force edit of commit" msgstr "редактиране на подаване" -#: builtin/commit.c:1581 +#: builtin/commit.c:1630 msgid "default" msgstr "стандартно" -#: builtin/commit.c:1581 builtin/tag.c:603 +#: builtin/commit.c:1630 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "кои празни знаци и #коментари да се махат от съобщенията" -#: builtin/commit.c:1582 +#: builtin/commit.c:1631 msgid "include status in commit message template" msgstr "вмъкване на състоянието в шаблона за съобщението при подаване" -#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92 -#: builtin/tag.c:604 +#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92 +#: builtin/tag.c:605 msgid "key-id" msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ" -#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93 +#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93 msgid "GPG sign commit" msgstr "подписване на подаването с GPG" -#: builtin/commit.c:1587 +#: builtin/commit.c:1636 msgid "Commit contents options" msgstr "Опции за избор на файлове при подаване" -#: builtin/commit.c:1588 +#: builtin/commit.c:1637 msgid "commit all changed files" msgstr "подаване на всички променени файлове" -#: builtin/commit.c:1589 +#: builtin/commit.c:1638 msgid "add specified files to index for commit" msgstr "добавяне на указаните файлове към индекса за подаване" -#: builtin/commit.c:1590 +#: builtin/commit.c:1639 msgid "interactively add files" msgstr "интерактивно добавяне на файлове" -#: builtin/commit.c:1591 +#: builtin/commit.c:1640 msgid "interactively add changes" msgstr "интерактивно добавяне на промени" -#: builtin/commit.c:1592 +#: builtin/commit.c:1641 msgid "commit only specified files" msgstr "подаване само на указаните файлове" -#: builtin/commit.c:1593 +#: builtin/commit.c:1642 msgid "bypass pre-commit hook" msgstr "без изпълнение на куката преди подаване (pre-commit)" -#: builtin/commit.c:1594 +#: builtin/commit.c:1643 msgid "show what would be committed" msgstr "отпечатване на това, което би било подадено" -#: builtin/commit.c:1605 +#: builtin/commit.c:1654 msgid "amend previous commit" msgstr "поправяне на предишното подаване" -#: builtin/commit.c:1606 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" msgstr "без изпълнение на куката след презаписване (post-rewrite)" -#: builtin/commit.c:1611 +#: builtin/commit.c:1660 msgid "ok to record an empty change" msgstr "позволяване на празни подавания" -#: builtin/commit.c:1613 +#: builtin/commit.c:1662 msgid "ok to record a change with an empty message" msgstr "позволяване на подавания с празни съобщения" -#: builtin/commit.c:1641 +#: builtin/commit.c:1691 msgid "could not parse HEAD commit" msgstr "върховото подаване „HEAD“ не може да бъде прочетено" -#: builtin/commit.c:1680 builtin/merge.c:518 +#: builtin/commit.c:1730 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "файлът не може да бъде прочетен: „%s“" -#: builtin/commit.c:1687 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)" -#: builtin/commit.c:1694 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен" -#: builtin/commit.c:1713 +#: builtin/commit.c:1763 #, c-format msgid "could not read commit message: %s" msgstr "съобщението за подаване не може да бъде прочетено: %s" -#: builtin/commit.c:1724 +#: builtin/commit.c:1774 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Неизвършване на подаване поради нередактирано съобщение.\n" -#: builtin/commit.c:1729 +#: builtin/commit.c:1779 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Неизвършване на подаване поради празно съобщение.\n" -#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875 msgid "failed to write commit object" msgstr "обектът за подаването не може да бъде записан" -#: builtin/commit.c:1756 -msgid "cannot lock HEAD ref" -msgstr "указателят към върха „HEAD“ не може да бъде заключен" - -#: builtin/commit.c:1769 -msgid "cannot update HEAD ref" -msgstr "указателят към върха „HEAD“ не може да бъде обновен" - -#: builtin/commit.c:1780 +#: builtin/commit.c:1827 msgid "" "Repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full or quota is\n" +"new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" "Хранилището е обновено, но новият файл за индекс „new_index“\n" @@ -5004,64 +5142,88 @@ msgstr "разделяне на стойностите с нулевия зна msgid "respect include directives on lookup" msgstr "при търсене да се уважат и директивите за включване" -#: builtin/count-objects.c:82 +#: builtin/config.c:315 +msgid "unable to parse default color value" +msgstr "неразпозната стойност на стандартния цвят" + +#: builtin/config.c:455 +#, c-format +msgid "" +"# This is Git's per-user configuration file.\n" +"[core]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tuser = %s\n" +"#\temail = %s\n" +msgstr "" +"# Това е потребителският ви конфигурационен файл за Git.\n" +"[core]\n" +"# Проверете и разкоментирайте следните два реда:\n" +"#\tuser = %s\n" +"#\temail = %s\n" + +#: builtin/config.c:590 +#, c-format +msgid "cannot create configuration file %s" +msgstr "конфигурационният файл „%s“ не може да бъде създаден" + +#: builtin/count-objects.c:55 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:65 msgid "print sizes in human readable format" msgstr "извеждане на размерите на обектите във формат лесно четим от хора" # FIXME ... instead of *??? -#: builtin/describe.c:16 +#: builtin/describe.c:17 msgid "git describe [options] <commit-ish>*" msgstr "git describe [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…" -#: builtin/describe.c:17 +#: builtin/describe.c:18 msgid "git describe [options] --dirty" msgstr "git describe [ОПЦИЯ…] --dirty" -#: builtin/describe.c:216 +#: builtin/describe.c:217 #, c-format msgid "annotated tag %s not available" msgstr "не съществува анотиран етикет „%s“" -#: builtin/describe.c:220 +#: builtin/describe.c:221 #, c-format msgid "annotated tag %s has no embedded name" msgstr "в анотирания етикет „%s“ липсва вградено име" -#: builtin/describe.c:222 +#: builtin/describe.c:223 #, c-format msgid "tag '%s' is really '%s' here" msgstr "етикетът „%s“ тук е всъщност „%s“" -#: builtin/describe.c:249 +#: builtin/describe.c:250 builtin/log.c:452 #, c-format msgid "Not a valid object name %s" msgstr "Неправилно име на обект „%s“" -#: builtin/describe.c:252 +#: builtin/describe.c:253 #, c-format msgid "%s is not a valid '%s' object" msgstr "„%s“ е неправилен обект „%s“" -#: builtin/describe.c:269 +#: builtin/describe.c:270 #, c-format msgid "no tag exactly matches '%s'" msgstr "никой етикет не напасва точно „%s“" -#: builtin/describe.c:271 +#: builtin/describe.c:272 #, c-format msgid "searching to describe %s\n" msgstr "търсене за описание на „%s“\n" -#: builtin/describe.c:318 +#: builtin/describe.c:319 #, c-format msgid "finished search at %s\n" msgstr "търсенето приключи при „%s“\n" -#: builtin/describe.c:345 +#: builtin/describe.c:346 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -5070,7 +5232,7 @@ msgstr "" "Никой анотиран етикет не описва „%s“.\n" "Съществуват и неанотирани етикети. Пробвайте с опцията „--tags“." -#: builtin/describe.c:349 +#: builtin/describe.c:350 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -5080,12 +5242,12 @@ msgstr "" "Пробвайте с опцията „--always“ или създайте етикети." # FIXME - plural -#: builtin/describe.c:370 +#: builtin/describe.c:371 #, c-format msgid "traversed %lu commits\n" msgstr "претърсени са %lu подавания\n" -#: builtin/describe.c:373 +#: builtin/describe.c:374 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -5094,145 +5256,149 @@ msgstr "" "открити са над %i етикета, изведени са последните %i,\n" "търсенето бе прекратено при „%s“.\n" -#: builtin/describe.c:395 +#: builtin/describe.c:396 msgid "find the tag that comes after the commit" msgstr "откриване на етикета, който следва подаване" -#: builtin/describe.c:396 +#: builtin/describe.c:397 msgid "debug search strategy on stderr" msgstr "" "извеждане на информация за трасиране на стратегията за търсене на " "стандартната грешка" -#: builtin/describe.c:397 +#: builtin/describe.c:398 msgid "use any ref" msgstr "използване на произволен указател" -#: builtin/describe.c:398 +#: builtin/describe.c:399 msgid "use any tag, even unannotated" msgstr "използване на всеки етикет — включително и неанотираните" -#: builtin/describe.c:399 +#: builtin/describe.c:400 msgid "always use long format" msgstr "винаги да се ползва дългият формат" -#: builtin/describe.c:400 +#: builtin/describe.c:401 msgid "only follow first parent" msgstr "проследяване само на първия родител" -#: builtin/describe.c:403 +#: builtin/describe.c:404 msgid "only output exact matches" msgstr "извеждане само на точните съвпадения" -#: builtin/describe.c:405 +#: builtin/describe.c:406 msgid "consider <n> most recent tags (default: 10)" msgstr "да се търси само в този БРОЙ последни етикети (стандартно: 10)" -#: builtin/describe.c:407 +#: builtin/describe.c:408 msgid "only consider tags matching <pattern>" msgstr "да се търси само измежду етикетите напасващи този ШАБЛОН" -#: builtin/describe.c:409 builtin/name-rev.c:318 +#: builtin/describe.c:410 builtin/name-rev.c:318 msgid "show abbreviated commit object as fallback" msgstr "извеждане на съкратено име на обект като резервен вариант" -#: builtin/describe.c:410 +#: builtin/describe.c:411 msgid "mark" msgstr "МАРКЕР" -#: builtin/describe.c:411 +#: builtin/describe.c:412 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "добавяне на такъв МАРКЕР на работното дърво (стандартно е „-dirty“)" -#: builtin/describe.c:429 +#: builtin/describe.c:430 msgid "--long is incompatible with --abbrev=0" msgstr "Опциите „--long“ и „--abbrev=0“ са несъвместими" -#: builtin/describe.c:455 +#: builtin/describe.c:456 msgid "No names found, cannot describe anything." msgstr "Не са открити имена — нищо не може да бъде описано." -#: builtin/describe.c:475 +#: builtin/describe.c:476 msgid "--dirty is incompatible with commit-ishes" msgstr "опцията „--dirty“ е несъвместима с указател към подаване" -#: builtin/diff.c:85 +#: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" msgstr "„%s“: не е нито обикновен файл, нито символна връзка" -#: builtin/diff.c:236 +#: builtin/diff.c:237 #, c-format msgid "invalid option: %s" msgstr "неправилна опция: %s" -#: builtin/diff.c:357 +#: builtin/diff.c:358 msgid "Not a git repository" msgstr "Не е хранилище на Git" -#: builtin/diff.c:400 +#: builtin/diff.c:401 #, c-format msgid "invalid object '%s' given." msgstr "зададен е неправилен обект „%s“." -#: builtin/diff.c:409 +#: builtin/diff.c:410 #, c-format msgid "more than two blobs given: '%s'" msgstr "зададени са повече от 2 обекта: „%s“" -#: builtin/diff.c:416 +#: builtin/diff.c:417 #, c-format msgid "unhandled object '%s' given." msgstr "зададен е неподдържан обект „%s“." -#: builtin/fast-export.c:23 +#: builtin/fast-export.c:24 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [ОПЦИИ_ЗА_СПИСЪКА_С_ВЕРСИИ]" -#: builtin/fast-export.c:702 +#: builtin/fast-export.c:979 msgid "show progress after <n> objects" msgstr "Съобщение за напредъка на всеки такъв БРОЙ обекта" -#: builtin/fast-export.c:704 +#: builtin/fast-export.c:981 msgid "select handling of signed tags" msgstr "Как да се обработват подписаните етикети" -#: builtin/fast-export.c:707 +#: builtin/fast-export.c:984 msgid "select handling of tags that tag filtered objects" msgstr "Как да се обработват етикетите на филтрираните обекти" -#: builtin/fast-export.c:710 +#: builtin/fast-export.c:987 msgid "Dump marks to this file" msgstr "Запазване на маркерите в този файл" -#: builtin/fast-export.c:712 +#: builtin/fast-export.c:989 msgid "Import marks from this file" msgstr "Внасяне на маркерите от този файл" -#: builtin/fast-export.c:714 +#: builtin/fast-export.c:991 msgid "Fake a tagger when tags lack one" msgstr "Да се използва изкуствено име на човек при липса на задаващ етикета" -#: builtin/fast-export.c:716 +#: builtin/fast-export.c:993 msgid "Output full tree for each commit" msgstr "Извеждане на цялото дърво за всяко подаване" -#: builtin/fast-export.c:718 +#: builtin/fast-export.c:995 msgid "Use the done feature to terminate the stream" msgstr "Използване на маркер за завършване на потока" -#: builtin/fast-export.c:719 +#: builtin/fast-export.c:996 msgid "Skip output of blob data" msgstr "Без извеждане на съдържанието на обектите BLOB" -#: builtin/fast-export.c:720 +#: builtin/fast-export.c:997 msgid "refspec" msgstr "указател на версия" -#: builtin/fast-export.c:721 +#: builtin/fast-export.c:998 msgid "Apply refspec to exported refs" msgstr "Прилагане на указателя на версия към изнесените указатели" +#: builtin/fast-export.c:999 +msgid "anonymize output" +msgstr "анонимизиране на извежданата информация" + #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]" @@ -5305,7 +5471,7 @@ msgstr "задълбочаване на историята на плитко х msgid "convert to a complete repository" msgstr "превръщане в пълно хранилище" -#: builtin/fetch.c:118 builtin/log.c:1205 +#: builtin/fetch.c:118 builtin/log.c:1208 msgid "dir" msgstr "директория" @@ -5333,80 +5499,80 @@ msgstr "указване на картата с указатели за дост msgid "Couldn't find remote ref HEAD" msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит" -#: builtin/fetch.c:440 +#: builtin/fetch.c:454 #, c-format msgid "object %s not found" msgstr "обектът „%s“ липсва" -#: builtin/fetch.c:445 +#: builtin/fetch.c:459 msgid "[up to date]" msgstr "[актуализиран]" -#: builtin/fetch.c:459 +#: builtin/fetch.c:473 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s → %s (в текущия клон не може да се доставя)" -#: builtin/fetch.c:460 builtin/fetch.c:546 +#: builtin/fetch.c:474 builtin/fetch.c:560 msgid "[rejected]" msgstr "[отхвърлен]" -#: builtin/fetch.c:471 +#: builtin/fetch.c:485 msgid "[tag update]" msgstr "[обновяване на етикетите]" -#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526 +#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 msgid " (unable to update local ref)" msgstr " (локалните указатели не могат да бъдат обновени)" -#: builtin/fetch.c:491 +#: builtin/fetch.c:505 msgid "[new tag]" msgstr "[нов етикет]" -#: builtin/fetch.c:494 +#: builtin/fetch.c:508 msgid "[new branch]" msgstr "[нов клон]" -#: builtin/fetch.c:497 +#: builtin/fetch.c:511 msgid "[new ref]" msgstr "[нов указател]" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "unable to update local ref" msgstr "локален указател не може да бъде обновен" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "forced update" msgstr "принудително обновяване" -#: builtin/fetch.c:548 +#: builtin/fetch.c:562 msgid "(non-fast-forward)" msgstr "(сливането не е тривиално)" -#: builtin/fetch.c:581 builtin/fetch.c:814 +#: builtin/fetch.c:595 builtin/fetch.c:828 #, c-format msgid "cannot open %s: %s\n" msgstr "файлът „%s“ не може да бъде отворен: %s\n" -#: builtin/fetch.c:590 +#: builtin/fetch.c:604 #, c-format msgid "%s did not send all necessary objects\n" msgstr "хранилището „%s“ не изпрати всички необходими обекти\n" -#: builtin/fetch.c:608 +#: builtin/fetch.c:622 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат " "обновявани" -#: builtin/fetch.c:696 builtin/fetch.c:779 +#: builtin/fetch.c:710 builtin/fetch.c:793 #, c-format msgid "From %.*s\n" msgstr "От %.*s\n" # FIXME - is the space necessary -#: builtin/fetch.c:707 +#: builtin/fetch.c:721 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5416,55 +5582,55 @@ msgstr "" "„git remote prune %s“, за да премахнете остарелите клони, които\n" "предизвикват конфликта" -#: builtin/fetch.c:759 +#: builtin/fetch.c:773 #, c-format msgid " (%s will become dangling)" msgstr " (обектът „%s“ ще се окаже извън клон)" -#: builtin/fetch.c:760 +#: builtin/fetch.c:774 #, c-format msgid " (%s has become dangling)" msgstr " (обектът „%s“ вече е извън клон)" -#: builtin/fetch.c:784 +#: builtin/fetch.c:798 msgid "[deleted]" msgstr "[изтрит]" -#: builtin/fetch.c:785 builtin/remote.c:1059 +#: builtin/fetch.c:799 builtin/remote.c:1063 msgid "(none)" msgstr "(нищо)" -#: builtin/fetch.c:804 +#: builtin/fetch.c:818 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Не може да изтегляте в текущия клон „%s“ на хранилище, което не е голо" -#: builtin/fetch.c:823 +#: builtin/fetch.c:837 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“" -#: builtin/fetch.c:826 +#: builtin/fetch.c:840 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Опцията „%s“ се игнорира при „%s“\n" -#: builtin/fetch.c:882 +#: builtin/fetch.c:896 #, c-format msgid "Don't know how to fetch from %s" msgstr "Не се поддържа доставяне от „%s“" -#: builtin/fetch.c:1044 +#: builtin/fetch.c:1058 #, c-format msgid "Fetching %s\n" msgstr "Доставяне на „%s“\n" -#: builtin/fetch.c:1046 builtin/remote.c:90 +#: builtin/fetch.c:1060 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "„%s“ не може да се достави" -#: builtin/fetch.c:1064 +#: builtin/fetch.c:1078 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5472,33 +5638,33 @@ msgstr "" "Не сте указали отдалечено хранилище. Задайте или адрес, или име\n" "на отдалечено хранилище, откъдето да се доставят новите версии." -#: builtin/fetch.c:1087 +#: builtin/fetch.c:1101 msgid "You need to specify a tag name." msgstr "Трябва да укажете име на етикет." -#: builtin/fetch.c:1131 +#: builtin/fetch.c:1143 msgid "--depth and --unshallow cannot be used together" msgstr "опциите „--depth“ и „--unshallow“ са несъвместими" -#: builtin/fetch.c:1133 +#: builtin/fetch.c:1145 msgid "--unshallow on a complete repository does not make sense" msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище" -#: builtin/fetch.c:1156 +#: builtin/fetch.c:1168 msgid "fetch --all does not take a repository argument" msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1170 msgid "fetch --all does not make sense with refspecs" msgstr "" "към „git fetch --all“ не можете да добавите аргумент — указател на версия" -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1181 #, c-format msgid "No such remote or remote group: %s" msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1189 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Указването на група и указването на версия са несъвместими" @@ -5507,8 +5673,8 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m СЪОБЩЕНИЕ] [--log[=БРОЙ]|--no-log] [--file ФАЙЛ]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698 -#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589 +#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590 #: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "БРОЙ" @@ -5535,100 +5701,104 @@ msgstr "за начало на съобщението да се ползва Т msgid "file to read from" msgstr "файл, от който да се чете" -#: builtin/for-each-ref.c:1051 +#: builtin/for-each-ref.c:676 +msgid "unable to parse format" +msgstr "форматът не може да бъде анализиран" + +#: builtin/for-each-ref.c:1057 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [ОПЦИЯ…] [ШАБЛОН]" -#: builtin/for-each-ref.c:1066 +#: builtin/for-each-ref.c:1072 msgid "quote placeholders suitably for shells" msgstr "цитиране подходящо за командни интерпретатори на обвивката" -#: builtin/for-each-ref.c:1068 +#: builtin/for-each-ref.c:1074 msgid "quote placeholders suitably for perl" msgstr "цитиране подходящо за perl" -#: builtin/for-each-ref.c:1070 +#: builtin/for-each-ref.c:1076 msgid "quote placeholders suitably for python" msgstr "цитиране подходящо за python" -#: builtin/for-each-ref.c:1072 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for tcl" msgstr "цитиране подходящо за tcl" -#: builtin/for-each-ref.c:1075 +#: builtin/for-each-ref.c:1081 msgid "show only <n> matched refs" msgstr "извеждане само на този БРОЙ напаснати указатели" -#: builtin/for-each-ref.c:1076 builtin/replace.c:435 +#: builtin/for-each-ref.c:1082 builtin/replace.c:438 msgid "format" msgstr "ФОРМАТ" -#: builtin/for-each-ref.c:1076 +#: builtin/for-each-ref.c:1082 msgid "format to use for the output" msgstr "ФОРМАТ за изхода" -#: builtin/for-each-ref.c:1077 +#: builtin/for-each-ref.c:1083 msgid "key" msgstr "ключ" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1084 msgid "field name to sort on" msgstr "име на полето, по което да е подредбата" -#: builtin/fsck.c:147 builtin/prune.c:172 +#: builtin/fsck.c:147 builtin/prune.c:136 msgid "Checking connectivity" msgstr "Проверка на връзката" -#: builtin/fsck.c:538 +#: builtin/fsck.c:540 msgid "Checking object directories" msgstr "Проверка на директориите с обекти" -#: builtin/fsck.c:601 +#: builtin/fsck.c:603 msgid "git fsck [options] [<object>...]" msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]" -#: builtin/fsck.c:607 +#: builtin/fsck.c:609 msgid "show unreachable objects" msgstr "показване на недостижимите обекти" -#: builtin/fsck.c:608 +#: builtin/fsck.c:610 msgid "show dangling objects" msgstr "показване на обектите извън клоните" -#: builtin/fsck.c:609 +#: builtin/fsck.c:611 msgid "report tags" msgstr "показване на етикетите" -#: builtin/fsck.c:610 +#: builtin/fsck.c:612 msgid "report root nodes" msgstr "показване на кореновите възли" -#: builtin/fsck.c:611 +#: builtin/fsck.c:613 msgid "make index objects head nodes" msgstr "задаване на обекти от индекса да са коренови" # FIXME bad message -#: builtin/fsck.c:612 +#: builtin/fsck.c:614 msgid "make reflogs head nodes (default)" msgstr "проследяване на указателите от журнала като глави (стандартно)" -#: builtin/fsck.c:613 +#: builtin/fsck.c:615 msgid "also consider packs and alternate objects" msgstr "допълнително да се проверяват пакетите и алтернативните обекти" -#: builtin/fsck.c:614 +#: builtin/fsck.c:616 msgid "enable more strict checking" msgstr "по-строги проверки" -#: builtin/fsck.c:616 +#: builtin/fsck.c:618 msgid "write dangling objects in .git/lost-found" msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“" -#: builtin/fsck.c:617 builtin/prune.c:144 +#: builtin/fsck.c:619 builtin/prune.c:108 msgid "show progress" msgstr "показване на напредъка" -#: builtin/fsck.c:667 +#: builtin/fsck.c:669 msgid "Checking objects" msgstr "Проверка на обектите" @@ -5637,53 +5807,53 @@ msgstr "Проверка на обектите" msgid "git gc [options]" msgstr "git gc [ОПЦИЯ…]" -#: builtin/gc.c:91 +#: builtin/gc.c:79 #, c-format -msgid "Invalid %s: '%s'" -msgstr "Неправилна стойност за „%s“: „%s“" +msgid "Invalid gc.pruneexpire: '%s'" +msgstr "Неправилна стойност за настройката „gc.pruneexpire“: %s" -#: builtin/gc.c:118 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "прекалено дълга директория с обекти „%.*s“" -#: builtin/gc.c:287 +#: builtin/gc.c:276 msgid "prune unreferenced objects" msgstr "окастряне на обектите, към които нищо не сочи" -#: builtin/gc.c:289 +#: builtin/gc.c:278 msgid "be more thorough (increased runtime)" msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)" -#: builtin/gc.c:290 +#: builtin/gc.c:279 msgid "enable auto-gc mode" msgstr "включване на автоматичното събиране на боклука (auto-gc)" -#: builtin/gc.c:291 +#: builtin/gc.c:280 msgid "force running gc even if there may be another gc running" msgstr "" "изрично стартиране на събирането на боклука, дори и ако вече работи друго " "събиране" -#: builtin/gc.c:332 +#: builtin/gc.c:321 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Автоматично пакетиране на заден фон на хранилището за по-добра " "производителност.\n" -#: builtin/gc.c:334 +#: builtin/gc.c:323 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n" -#: builtin/gc.c:335 +#: builtin/gc.c:324 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" "Вижте ръководството за повече информация как да изпълните „git help gc“.\n" -#: builtin/gc.c:353 +#: builtin/gc.c:342 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5692,7 +5862,7 @@ msgstr "" "процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n" "опцията „--force“)" -#: builtin/gc.c:375 +#: builtin/gc.c:364 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5940,7 +6110,7 @@ msgstr "" msgid "both --cached and trees are given." msgstr "опцията „--cached“ е несъвместима със задаване на дърво." -#: builtin/hash-object.c:60 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." @@ -5948,31 +6118,38 @@ msgstr "" "git hash-object [-t ВИД] [-w] [--path=ФАЙЛ|--no-filters] [--stdin] [--] ФАЙЛ…" # FIXME - list of paths or path... -#: builtin/hash-object.c:61 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < ПЪТ…" -#: builtin/hash-object.c:72 builtin/tag.c:609 +#: builtin/hash-object.c:94 builtin/tag.c:610 msgid "type" msgstr "ВИД" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:94 msgid "object type" msgstr "вид на обекта" -#: builtin/hash-object.c:73 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "записване на обекта в базата от данни за обектите" -#: builtin/hash-object.c:74 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "изчитане на обекта от стандартния вход" -#: builtin/hash-object.c:76 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "запазване на файла както е — без филтри" -#: builtin/hash-object.c:77 +#: builtin/hash-object.c:100 +msgid "" +"just hash any random garbage to create corrupt objects for debugging Git" +msgstr "" +"създаване и хеширане на произволни данни за повредени обекти за трасиране на " +"Git" + +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "обработване на файла все едно е с този път" @@ -6005,25 +6182,25 @@ msgstr "git help [--all] [--guides] [--man|--web|--info] [КОМАНДА]" msgid "unrecognized help format '%s'" msgstr "непознат формат на помощта „%s“" -#: builtin/help.c:92 +#: builtin/help.c:91 msgid "Failed to start emacsclient." msgstr "Неуспешно стартиране на „emacsclient“." -#: builtin/help.c:105 +#: builtin/help.c:104 msgid "Failed to parse emacsclient version." msgstr "Версията на „emacsclient“ не може да се анализира." -#: builtin/help.c:113 +#: builtin/help.c:112 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "Прекалено стара версия на „emacsclient“ — %d (< 22)." -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 #, c-format msgid "failed to exec '%s': %s" msgstr "неуспешно изпълнение на „%s“: %s" -#: builtin/help.c:216 +#: builtin/help.c:215 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -6032,7 +6209,7 @@ msgstr "" "„%s“: път към неподдържана програма за преглед на\n" " ръководството. Вместо нея пробвайте „man.<tool>.cmd“." -#: builtin/help.c:228 +#: builtin/help.c:227 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -6041,25 +6218,29 @@ msgstr "" "„%s“: команда за поддържана програма за преглед на\n" " ръководството. Вместо нея пробвайте „man.<tool>.path“." -#: builtin/help.c:353 +#: builtin/help.c:352 #, c-format msgid "'%s': unknown man viewer." msgstr "„%s“: непозната програма за преглед на ръководството." -#: builtin/help.c:370 +#: builtin/help.c:369 msgid "no man viewer handled the request" msgstr "никоя програма за преглед на ръководство не успя да обработи заявката" -#: builtin/help.c:378 +#: builtin/help.c:377 msgid "no info viewer handled the request" msgstr "" "никоя програма за преглед на информационните страници не успя да обработи " "заявката" -#: builtin/help.c:424 +#: builtin/help.c:423 msgid "Defining attributes per path" msgstr "Указване на атрибути към път" +#: builtin/help.c:424 +msgid "Everyday Git With 20 Commands Or So" +msgstr "Ежедневието в Git в рамките на 20-ина команди" + #: builtin/help.c:425 msgid "A Git glossary" msgstr "Речник с термините на Git" @@ -6099,275 +6280,281 @@ msgid "`git %s' is aliased to `%s'" msgstr "„git %s“ е синоним на „%s“" # FIXME merge with next? -#: builtin/index-pack.c:145 +#: builtin/index-pack.c:150 #, c-format msgid "unable to open %s" msgstr "обектът „%s“ не може да бъде отворен" -#: builtin/index-pack.c:191 +#: builtin/index-pack.c:200 #, c-format msgid "object type mismatch at %s" msgstr "неправилен вид на обекта „%s“" -#: builtin/index-pack.c:211 +#: builtin/index-pack.c:220 #, c-format msgid "did not receive expected object %s" msgstr "очакваният обект „%s“ не бе получен" -#: builtin/index-pack.c:214 +#: builtin/index-pack.c:223 #, c-format msgid "object %s: expected type %s, found %s" msgstr "неправилен вид на обекта „%s“: очакваше се „%s“, а бе получен „%s“" -#: builtin/index-pack.c:256 +#: builtin/index-pack.c:265 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "не може да се запълни %d байт" msgstr[1] "не може да се запълнят %d байта" -#: builtin/index-pack.c:266 +#: builtin/index-pack.c:275 msgid "early EOF" msgstr "неочакван край на файл" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:276 msgid "read error on input" msgstr "грешка при четене на входните данни" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:288 msgid "used more bytes than were available" msgstr "използвани са повече от наличните байтове" -#: builtin/index-pack.c:286 +#: builtin/index-pack.c:295 msgid "pack too large for current definition of off_t" msgstr "пакетният файл е прекалено голям за текущата стойност на типа „off_t“" -#: builtin/index-pack.c:302 +#: builtin/index-pack.c:311 #, c-format msgid "unable to create '%s'" msgstr "пакетният файл „%s“ не може да бъде създаден" -#: builtin/index-pack.c:307 +#: builtin/index-pack.c:316 #, c-format msgid "cannot open packfile '%s'" msgstr "пакетният файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:321 +#: builtin/index-pack.c:330 msgid "pack signature mismatch" msgstr "несъответствие в подписа към пакетния файл" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:332 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "не се поддържа пакетиране вeрсия „%<PRIu32>“" -#: builtin/index-pack.c:341 +#: builtin/index-pack.c:350 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "повреден обект в пакетния файл при отместване %lu: %s" -#: builtin/index-pack.c:462 +#: builtin/index-pack.c:471 #, c-format msgid "inflate returned %d" msgstr "декомпресирането с „inflate“ върна %d" -#: builtin/index-pack.c:511 +#: builtin/index-pack.c:520 msgid "offset value overflow for delta base object" msgstr "стойността на отместването за обекта-разлика води до препълване" -#: builtin/index-pack.c:519 +#: builtin/index-pack.c:528 msgid "delta base offset is out of bound" msgstr "стойността на отместването за обекта-разлика е извън диапазона" -#: builtin/index-pack.c:527 +#: builtin/index-pack.c:536 #, c-format msgid "unknown object type %d" msgstr "непознат вид обект %d" -#: builtin/index-pack.c:558 +#: builtin/index-pack.c:567 msgid "cannot pread pack file" msgstr "пакетният файл не може да бъде прочетен" -#: builtin/index-pack.c:560 +#: builtin/index-pack.c:569 #, 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:586 +#: builtin/index-pack.c:595 msgid "serious inflate inconsistency" msgstr "сериозна грешка при декомпресиране с „inflate“" -#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706 -#: builtin/index-pack.c:740 builtin/index-pack.c:749 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" "СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!" # FIXME merge with next? -#: builtin/index-pack.c:680 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:689 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "обектът „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:746 +#: builtin/index-pack.c:755 #, c-format msgid "cannot read existing object %s" msgstr "съществуващият обект „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:760 +#: builtin/index-pack.c:769 #, c-format msgid "invalid blob object %s" msgstr "неправилен обект BLOB „%s“" # FIXME perhaps invalid object -#: builtin/index-pack.c:774 +#: builtin/index-pack.c:783 #, c-format msgid "invalid %s" msgstr "неправилен обект „%s“" -#: builtin/index-pack.c:777 +#: builtin/index-pack.c:787 msgid "Error in object" msgstr "Грешка в обекта" -#: builtin/index-pack.c:779 +#: builtin/index-pack.c:789 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Някои обекти, наследници на „%s“, не могат да бъдат достигнати" -#: builtin/index-pack.c:851 builtin/index-pack.c:881 +#: builtin/index-pack.c:861 builtin/index-pack.c:890 msgid "failed to apply delta" msgstr "разликата не може да бъде приложена" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Receiving objects" msgstr "Получаване на обекти" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Indexing objects" msgstr "Индексиране на обекти" -#: builtin/index-pack.c:1048 +#: builtin/index-pack.c:1081 msgid "pack is corrupted (SHA1 mismatch)" msgstr "пакетният файл е повреден (нееднакви суми по SHA1)" -#: builtin/index-pack.c:1053 +#: builtin/index-pack.c:1086 msgid "cannot fstat packfile" msgstr "не може да се получи информация за пакетния файл с „fstat“" -#: builtin/index-pack.c:1056 +#: builtin/index-pack.c:1089 msgid "pack has junk at the end" msgstr "в края на пакетния файл има повредени данни" # FIXME WTF message -#: builtin/index-pack.c:1067 +#: builtin/index-pack.c:1100 msgid "confusion beyond insanity in parse_pack_objects()" -msgstr "катастрофална грешка във функцията „parse_pack_objects“" +msgstr "" +"фатална грешка във функцията „parse_pack_objects“. Това е грешка в Git, " +"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger." +"kernel.org“." -#: builtin/index-pack.c:1090 +#: builtin/index-pack.c:1123 msgid "Resolving deltas" msgstr "Откриване на съответните разлики" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1133 #, c-format msgid "unable to create thread: %s" msgstr "не може да се създаде нишка: %s" # FIXME WTF message -#: builtin/index-pack.c:1142 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity" -msgstr "катастрофална грешка" +msgstr "" +"фатална грешка във функцията „conclude_pack“. Това е грешка в Git, " +"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger." +"kernel.org“." -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1181 #, c-format msgid "completed with %d local objects" msgstr "действието завърши с %d локални обекта" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1191 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в " "диска)" -#: builtin/index-pack.c:1164 +#: builtin/index-pack.c:1195 #, 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:1189 +#: builtin/index-pack.c:1220 #, c-format msgid "unable to deflate appended object (%d)" msgstr "добавеният обект не може да се компресира с „deflate“: %d" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1299 #, c-format msgid "local object %s is corrupt" msgstr "локалният обект „%s“ е повреден" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1323 msgid "error while closing pack file" msgstr "грешка при затварянето на пакетния файл" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1336 #, c-format msgid "cannot write keep file '%s'" msgstr "" "грешка при записването на файла „%s“, осигуряващ запазване на директория" -#: builtin/index-pack.c:1313 +#: builtin/index-pack.c:1344 #, c-format msgid "cannot close written keep file '%s'" msgstr "" "грешка при затварянето на записания файл „%s“, осигуряващ запазване на " "директория" -#: builtin/index-pack.c:1326 +#: builtin/index-pack.c:1357 msgid "cannot store pack file" msgstr "пакетният файл не може да бъде запазен" -#: builtin/index-pack.c:1337 +#: builtin/index-pack.c:1368 msgid "cannot store index file" msgstr "файлът за индекса не може да бъде съхранен" -#: builtin/index-pack.c:1370 +#: builtin/index-pack.c:1401 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“" -#: builtin/index-pack.c:1376 +#: builtin/index-pack.c:1407 #, c-format msgid "invalid number of threads specified (%d)" msgstr "зададен е неправилен брой нишки: %d" -#: builtin/index-pack.c:1380 builtin/index-pack.c:1559 +#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 #, c-format msgid "no threads support, ignoring %s" msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1469 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1471 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1487 +#: builtin/index-pack.c:1518 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "%d обект не е разлика" msgstr[1] "%d обекта не са разлика" -#: builtin/index-pack.c:1494 +#: builtin/index-pack.c:1525 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" @@ -6375,26 +6562,26 @@ msgstr[0] "дължината на веригата е %d: %lu обект" msgstr[1] "дължината на веригата е %d: %lu обекта" # FIXME it is not the cwd it is the previous cwd -#: builtin/index-pack.c:1523 +#: builtin/index-pack.c:1554 msgid "Cannot come back to cwd" msgstr "Процесът не може да се върне към предишната работна директория" -#: builtin/index-pack.c:1571 builtin/index-pack.c:1574 -#: builtin/index-pack.c:1586 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 +#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 #, c-format msgid "bad %s" msgstr "неправилна стойност „%s“" -#: builtin/index-pack.c:1604 +#: builtin/index-pack.c:1635 msgid "--fix-thin cannot be used without --stdin" msgstr "опцията „--fix-thin“ изисква „--stdin“" -#: builtin/index-pack.c:1608 builtin/index-pack.c:1617 +#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "името на пакетния файл „%s“ не завършва на „.pack“" -#: builtin/index-pack.c:1625 +#: builtin/index-pack.c:1656 msgid "--verify with no packfile name given" msgstr "опцията „--verify“ изисква име на пакетен файл" @@ -6507,11 +6694,7 @@ msgstr "Инициализирано празно" msgid " shared" msgstr ", споделено" -#: builtin/init-db.c:439 -msgid "cannot tell cwd" -msgstr "текущата директория не може да бъде определена" - -#: builtin/init-db.c:465 +#: builtin/init-db.c:467 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [directory]" @@ -6519,31 +6702,31 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШАБЛОНИ] [--" "shared[=ПРАВА]] [ДИРЕКТОРИЯ]" -#: builtin/init-db.c:488 +#: builtin/init-db.c:490 msgid "permissions" msgstr "права" -#: builtin/init-db.c:489 +#: builtin/init-db.c:491 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "указване, че хранилището на Git ще бъде споделено от повече от един " "потребител" -#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172 +#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172 msgid "be quiet" msgstr "без извеждане на информация" -#: builtin/init-db.c:523 builtin/init-db.c:528 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/init-db.c:532 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "не може да се влезе в директорията „%s“" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6552,15 +6735,31 @@ msgstr "" "%s (или --work-tree=ДИРЕКТОРИЯ) изисква указването на %s (или --git-" "dir=ДИРЕКТОРИЯ)" -#: builtin/init-db.c:578 -msgid "Cannot access current working directory" -msgstr "Текущата работна директория е недостъпна" - -#: builtin/init-db.c:585 +#: builtin/init-db.c:583 #, c-format msgid "Cannot access work tree '%s'" msgstr "Работното дърво в „%s“ е недостъпно" +#: builtin/interpret-trailers.c:15 +msgid "" +"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " +"[<file>...]" +msgstr "" +"git interpret-trailers [--trim-empty] [(--trailer ЛЕКСЕМА[(=|:)СТОЙНОСТ])…] " +"[ФАЙЛ…]" + +#: builtin/interpret-trailers.c:25 +msgid "trim empty trailers" +msgstr "изчистване на празните епилози" + +#: builtin/interpret-trailers.c:26 +msgid "trailer" +msgstr "епилог" + +#: builtin/interpret-trailers.c:27 +msgid "trailer(s) to add" +msgstr "епилог(зи) за добавяне" + #: builtin/log.c:41 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]\n" @@ -6569,6 +6768,11 @@ msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] msgid " or: git show [options] <object>..." msgstr " или: git show [ОПЦИЯ…] ОБЕКТ…" +#: builtin/log.c:81 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "неправилна опция „--decorate“: %s" + #: builtin/log.c:127 msgid "suppress diff output" msgstr "без извеждане на разликите" @@ -6587,250 +6791,260 @@ msgstr "" msgid "decorate options" msgstr "настройки на форма̀та на извежданата информация" +#: builtin/log.c:133 +msgid "Process line range n,m in file, counting from 1" +msgstr "" +"Обработване само на редовете във файла в интервала от n до m включително. " +"Броенето започва от 1" + #: builtin/log.c:229 #, c-format msgid "Final output: %d %s\n" msgstr "Резултат: %d %s\n" -#: builtin/log.c:470 builtin/log.c:562 +#: builtin/log.c:458 +#, c-format +msgid "git show %s: bad file" +msgstr "git show %s: повреден файл" + +#: builtin/log.c:472 builtin/log.c:564 #, c-format msgid "Could not read object %s" msgstr "Обектът не може да бъде прочетен: %s" -#: builtin/log.c:586 +#: builtin/log.c:588 #, c-format msgid "Unknown type: %d" msgstr "Неизвестен вид: %d" -#: builtin/log.c:687 +#: builtin/log.c:689 msgid "format.headers without value" msgstr "не е зададена стойност на „format.headers“" -#: builtin/log.c:771 +#: builtin/log.c:773 msgid "name of output directory is too long" msgstr "прекалено дълго име на директорията за изходната информация" -#: builtin/log.c:787 +#: builtin/log.c:789 #, c-format msgid "Cannot open patch file %s" msgstr "Файлът-кръпка „%s“ не може да бъде отворен" -#: builtin/log.c:801 +#: builtin/log.c:803 msgid "Need exactly one range." msgstr "Трябва да зададете точно един диапазон." -#: builtin/log.c:809 +#: builtin/log.c:811 msgid "Not a range." msgstr "Не е диапазон." -#: builtin/log.c:916 +#: builtin/log.c:919 msgid "Cover letter needs email format" msgstr "Придружаващото писмо трябва да е форматирано като е-писмо" # FIXME bad wording insanely -#: builtin/log.c:995 +#: builtin/log.c:998 #, c-format msgid "insane in-reply-to: %s" -msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s" +msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s" -#: builtin/log.c:1023 +#: builtin/log.c:1026 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]" # FIXME message WTF why ask it -#: builtin/log.c:1068 +#: builtin/log.c:1071 msgid "Two output directories?" -msgstr "" -"Можете да укажете максимум една директория за изход, а сте задали поне две." +msgstr "Можете да укажете максимум една директория за изход." -#: builtin/log.c:1183 +#: builtin/log.c:1186 msgid "use [PATCH n/m] even with a single patch" msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка" -#: builtin/log.c:1186 +#: builtin/log.c:1189 msgid "use [PATCH] even with multiple patches" msgstr "номерация „[PATCH]“ дори и при множество кръпки" -#: builtin/log.c:1190 +#: builtin/log.c:1193 msgid "print patches to standard out" msgstr "извеждане на кръпките на стандартния изход" -#: builtin/log.c:1192 +#: builtin/log.c:1195 msgid "generate a cover letter" msgstr "създаване на придружаващо писмо" -#: builtin/log.c:1194 +#: builtin/log.c:1197 msgid "use simple number sequence for output file names" msgstr "проста числова последователност за имената на файловете-кръпки" -#: builtin/log.c:1195 +#: builtin/log.c:1198 msgid "sfx" msgstr "ЗНАЦИ" -#: builtin/log.c:1196 +#: builtin/log.c:1199 msgid "use <sfx> instead of '.patch'" msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“" -#: builtin/log.c:1198 +#: builtin/log.c:1201 msgid "start numbering patches at <n> instead of 1" msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1" -#: builtin/log.c:1200 +#: builtin/log.c:1203 msgid "mark the series as Nth re-roll" msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки" -#: builtin/log.c:1202 +#: builtin/log.c:1205 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“" -#: builtin/log.c:1205 +#: builtin/log.c:1208 msgid "store resulting files in <dir>" msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ" -#: builtin/log.c:1208 +#: builtin/log.c:1211 msgid "don't strip/add [PATCH]" msgstr "без добавяне/махане на префикса „[PATCH]“" -#: builtin/log.c:1211 +#: builtin/log.c:1214 msgid "don't output binary diffs" msgstr "без извеждане на разлики между двоични файлове" -#: builtin/log.c:1213 +#: builtin/log.c:1216 msgid "don't include a patch matching a commit upstream" msgstr "да не се включват кръпки, които присъстват в следения клон" -#: builtin/log.c:1215 +#: builtin/log.c:1218 msgid "show patch format instead of default (patch + stat)" msgstr "" "извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)" -#: builtin/log.c:1217 +#: builtin/log.c:1220 msgid "Messaging" msgstr "Опции при изпращане" -#: builtin/log.c:1218 +#: builtin/log.c:1221 msgid "header" msgstr "ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1219 +#: builtin/log.c:1222 msgid "add email header" msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1220 builtin/log.c:1222 +#: builtin/log.c:1223 builtin/log.c:1225 msgid "email" msgstr "Е-ПОЩА" -#: builtin/log.c:1220 +#: builtin/log.c:1223 msgid "add To: header" msgstr "добавяне на заглавна част „To:“ (до)" -#: builtin/log.c:1222 +#: builtin/log.c:1225 msgid "add Cc: header" msgstr "добавяне на заглавна част „Cc:“ (и до)" -#: builtin/log.c:1224 +#: builtin/log.c:1227 msgid "ident" msgstr "ИДЕНТИЧНОСТ" -#: builtin/log.c:1225 +#: builtin/log.c:1228 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "задаване на адреса в заглавната част „From“ да е тази ИДЕНТИЧНОСТ. Ако не е " "зададена такава, се взима адреса на подаващия" -#: builtin/log.c:1227 +#: builtin/log.c:1230 msgid "message-id" msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1228 +#: builtin/log.c:1231 msgid "make first mail a reply to <message-id>" msgstr "" "първото съобщение да е в отговор на е-писмото с този " "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1229 builtin/log.c:1232 +#: builtin/log.c:1232 builtin/log.c:1235 msgid "boundary" msgstr "граница" -#: builtin/log.c:1230 +#: builtin/log.c:1233 msgid "attach the patch" msgstr "прикрепяне на кръпката" -#: builtin/log.c:1233 +#: builtin/log.c:1236 msgid "inline the patch" msgstr "включване на кръпката в текста на писмата" -#: builtin/log.c:1237 +#: builtin/log.c:1240 msgid "enable message threading, styles: shallow, deep" msgstr "" "използване на нишки за съобщенията. Стилът е „shallow“ (плитък) или " "„deep“ (дълбок)" -#: builtin/log.c:1239 +#: builtin/log.c:1242 msgid "signature" msgstr "подпис" -#: builtin/log.c:1240 +#: builtin/log.c:1243 msgid "add a signature" msgstr "добавяне на поле за подпис" -#: builtin/log.c:1242 +#: builtin/log.c:1245 msgid "add a signature from a file" msgstr "добавяне на подпис от файл" -#: builtin/log.c:1243 +#: builtin/log.c:1246 msgid "don't print the patch filenames" msgstr "без извеждане на имената на кръпките" -#: builtin/log.c:1317 +#: builtin/log.c:1320 #, c-format msgid "invalid ident line: %s" msgstr "грешна идентичност: %s" -#: builtin/log.c:1332 +#: builtin/log.c:1335 msgid "-n and -k are mutually exclusive." msgstr "опциите „-n“ и „-k“ са несъвместими." -#: builtin/log.c:1334 +#: builtin/log.c:1337 msgid "--subject-prefix and -k are mutually exclusive." msgstr "опциите „--subject-prefix“ и „-k“ са несъвместими." -#: builtin/log.c:1342 +#: builtin/log.c:1345 msgid "--name-only does not make sense" msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1344 +#: builtin/log.c:1347 msgid "--name-status does not make sense" msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1346 +#: builtin/log.c:1349 msgid "--check does not make sense" msgstr "опцията „--check“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1369 +#: builtin/log.c:1372 msgid "standard output, or directory, which one?" msgstr "" "изходът може да или стандартният, или да е в директория, но не и двете." -#: builtin/log.c:1371 +#: builtin/log.c:1374 #, c-format msgid "Could not create directory '%s'" msgstr "Директорията „%s“ не може да бъде създадена" -#: builtin/log.c:1468 +#: builtin/log.c:1472 #, c-format msgid "unable to read signature file '%s'" msgstr "файлът „%s“ с подпис не може да бъде прочетен" -#: builtin/log.c:1531 +#: builtin/log.c:1535 msgid "Failed to create output files" msgstr "Изходните файлове не могат да бъдат създадени" -#: builtin/log.c:1579 +#: builtin/log.c:1583 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]" -#: builtin/log.c:1634 +#: builtin/log.c:1638 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -6838,7 +7052,7 @@ msgstr "" "Следеният отдалечен клон не бе открит, затова изрично задайте " "ОТДАЛЕЧЕН_КЛОН.\n" -#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661 +#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 #, c-format msgid "Unknown commit %s" msgstr "Непознато подаване „%s“" @@ -6884,8 +7098,8 @@ msgid "show files on the filesystem that need to be removed" msgstr "извеждане на файловете, които трябва да бъдат изтрити" #: builtin/ls-files.c:477 -msgid "show 'other' directories' name only" -msgstr "извеждане само на името на другите директории" +msgid "show 'other' directories' names only" +msgstr "извеждане само на името на другите (неследените) директории" #: builtin/ls-files.c:480 msgid "don't show empty directories" @@ -6976,101 +7190,101 @@ msgstr "" "извеждане на цялото дърво, не само на текущата директория (включва опцията " "„--full-name“)" -#: builtin/merge.c:43 +#: builtin/merge.c:44 msgid "git merge [options] [<commit>...]" msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]" -#: builtin/merge.c:44 +#: builtin/merge.c:45 msgid "git merge [options] <msg> HEAD <commit>" msgstr "git merge [ОПЦИЯ…] СЪОБЩЕНИЕ HEAD ПОДАВАНЕ" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge --abort" msgstr "git merge --abort" # FIXME -m rather than just m -#: builtin/merge.c:98 +#: builtin/merge.c:99 msgid "switch `m' requires a value" msgstr "опцията „-m“ изисква стойност" -#: builtin/merge.c:135 +#: builtin/merge.c:136 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Няма такава стратегия за сливане: „%s“.\n" -#: builtin/merge.c:136 +#: builtin/merge.c:137 #, c-format msgid "Available strategies are:" msgstr "Наличните стратегии са:" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "Available custom strategies are:" msgstr "Допълнителните стратегии са:" -#: builtin/merge.c:191 +#: builtin/merge.c:192 msgid "do not show a diffstat at the end of the merge" msgstr "без извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:194 +#: builtin/merge.c:195 msgid "show a diffstat at the end of the merge" msgstr "извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:195 +#: builtin/merge.c:196 msgid "(synonym to --stat)" msgstr "(синоним на „--stat“)" -#: builtin/merge.c:197 +#: builtin/merge.c:198 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението " "за подаване" -#: builtin/merge.c:200 +#: builtin/merge.c:201 msgid "create a single commit instead of doing a merge" msgstr "създаване на едно подаване вместо извършване на сливане" -#: builtin/merge.c:202 +#: builtin/merge.c:203 msgid "perform a commit if the merge succeeds (default)" msgstr "извършване на подаване при успешно сливане (стандартно действие)" -#: builtin/merge.c:204 +#: builtin/merge.c:205 msgid "edit message before committing" msgstr "редактиране на съобщението преди подаване" -#: builtin/merge.c:205 +#: builtin/merge.c:206 msgid "allow fast-forward (default)" msgstr "позволяване на тривиално сливане (стандартно действие)" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "abort if fast-forward is not possible" msgstr "преустановяване, ако сливането не е тривиално" -#: builtin/merge.c:211 +#: builtin/merge.c:212 msgid "Verify that the named commit has a valid GPG signature" msgstr "Проверка, че именуваното подаване е с правилен подпис на GPG" -#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89 +#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89 msgid "strategy" msgstr "стратегия" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "merge strategy to use" msgstr "стратегия за сливане, която да се ползва" -#: builtin/merge.c:214 +#: builtin/merge.c:215 msgid "option=value" msgstr "опция=стойност" -#: builtin/merge.c:215 +#: builtin/merge.c:216 msgid "option for selected merge strategy" msgstr "опция за избраната стратегия за сливане" -#: builtin/merge.c:217 +#: builtin/merge.c:218 msgid "merge commit message (for a non-fast-forward merge)" msgstr "съобщение при подаването със сливане (при нетривиални сливания)" -#: builtin/merge.c:221 +#: builtin/merge.c:222 msgid "abort the current in-progress merge" msgstr "преустановяване на текущото сливане" @@ -7128,33 +7342,33 @@ msgstr "Неправилен низ за настройката „branch.%s.mer msgid "git write-tree failed to write a tree" msgstr "Командата „git write-tree“ не успя да запише обект-дърво" -#: builtin/merge.c:678 +#: builtin/merge.c:677 msgid "Not handling anything other than two heads merge." msgstr "Поддържа се само сливане на точно две истории." -#: builtin/merge.c:692 +#: builtin/merge.c:691 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“" -#: builtin/merge.c:705 +#: builtin/merge.c:704 #, c-format msgid "unable to write %s" msgstr "„%s“ не може да бъде записан" -#: builtin/merge.c:794 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "От „%s“ не може да се чете" -#: builtin/merge.c:803 +#: builtin/merge.c:802 #, 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:808 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7169,174 +7383,174 @@ msgstr "" "Редовете, които започват с „%c“ ще бъдат пропуснати, а празно съобщение\n" "преустановява подаването.\n" -#: builtin/merge.c:833 +#: builtin/merge.c:832 msgid "Empty commit message." msgstr "Празно съобщение при подаване." # FIXME - WTF is wonderful. -#: builtin/merge.c:845 +#: builtin/merge.c:844 #, c-format msgid "Wonderful.\n" -msgstr "Чудесно.\n" +msgstr "Първият етап на тривиалното сливане завърши.\n" -#: builtin/merge.c:908 +#: builtin/merge.c:907 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "Неуспешно сливане — коригирайте конфликтите и подайте резултата.\n" -#: builtin/merge.c:924 +#: builtin/merge.c:923 #, c-format msgid "'%s' is not a commit" msgstr "„%s“ не е подаване" -#: builtin/merge.c:965 +#: builtin/merge.c:964 msgid "No current branch." msgstr "Няма текущ клон." -#: builtin/merge.c:967 +#: builtin/merge.c:966 msgid "No remote for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/merge.c:969 +#: builtin/merge.c:968 msgid "No default upstream defined for the current branch." msgstr "Текущият клон не следи никой клон." -#: builtin/merge.c:974 +#: builtin/merge.c:973 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Никой клон не следи клона „%s“ от хранилището „%s“" -#: builtin/merge.c:1130 +#: builtin/merge.c:1129 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Не може да преустановите сливане, защото в момента не се извършва такова " "(липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1146 git-pull.sh:31 +#: builtin/merge.c:1145 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n" "Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1149 git-pull.sh:34 +#: builtin/merge.c:1148 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)." -#: builtin/merge.c:1153 +#: builtin/merge.c:1152 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува). Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1156 +#: builtin/merge.c:1155 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува)." -#: builtin/merge.c:1165 +#: builtin/merge.c:1164 msgid "You cannot combine --squash with --no-ff." msgstr "Опцията „--squash“ е несъвместима с „--no-ff“." -#: builtin/merge.c:1174 +#: builtin/merge.c:1173 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена." -#: builtin/merge.c:1206 +#: builtin/merge.c:1205 msgid "Can merge only exactly one commit into empty head" msgstr "Можете да слеете точно едно подаване във връх без история" -#: builtin/merge.c:1209 +#: builtin/merge.c:1208 msgid "Squash commit into empty head not supported yet" msgstr "Подаване със смачкване във връх без история все още не се поддържа" -#: builtin/merge.c:1211 +#: builtin/merge.c:1210 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Понеже върхът е без история, всички сливания са тривиални, не може да се " "извърши нетривиално сливане изисквано от опцията „--no-ff“" -#: builtin/merge.c:1216 +#: builtin/merge.c:1215 #, c-format msgid "%s - not something we can merge" msgstr "„%s“ — не е нещо, което може да се слее" -#: builtin/merge.c:1267 +#: builtin/merge.c:1266 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1270 +#: builtin/merge.c:1269 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“." -#: builtin/merge.c:1273 +#: builtin/merge.c:1272 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Подаването „%s“ е без подпис от GPG." -#: builtin/merge.c:1276 +#: builtin/merge.c:1275 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n" -#: builtin/merge.c:1357 +#: builtin/merge.c:1356 #, c-format msgid "Updating %s..%s\n" msgstr "Обновяване „%s..%s“\n" -#: builtin/merge.c:1396 +#: builtin/merge.c:1395 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Проба с най-тривиалното сливане в рамките на индекса…\n" # FIXME WTF message -#: builtin/merge.c:1403 +#: builtin/merge.c:1402 #, c-format msgid "Nope.\n" -msgstr "Неуспех.\n" +msgstr "Неуспешно сливане.\n" -#: builtin/merge.c:1435 +#: builtin/merge.c:1434 msgid "Not possible to fast-forward, aborting." msgstr "" "Не може да се извърши тривиално сливане, преустановяване на действието." -#: builtin/merge.c:1458 builtin/merge.c:1537 +#: builtin/merge.c:1457 builtin/merge.c:1536 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Привеждане на дървото към първоначалното…\n" -#: builtin/merge.c:1462 +#: builtin/merge.c:1461 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Пробване със стратегията за сливане „%s“…\n" -#: builtin/merge.c:1528 +#: builtin/merge.c:1527 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Никоя стратегия за сливане не може да извърши сливането.\n" -#: builtin/merge.c:1530 +#: builtin/merge.c:1529 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Неуспешно сливане със стратегия „%s“.\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1538 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" "Ползва се стратегията „%s“, която ще подготви дървото за коригиране на " "ръка.\n" -#: builtin/merge.c:1551 +#: builtin/merge.c:1550 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7444,89 +7658,94 @@ msgstr "разрешаване на създаването на повече о msgid "git mv [options] <source>... <destination>" msgstr "git mv [ОПЦИЯ…] ОБЕКТ… ЦЕЛ" +# FIXME message< +#: builtin/mv.c:69 +#, c-format +msgid "Directory %s is in index and no submodule?" +msgstr "Директорията „%s“ е в индекса, но не е подмодул" + #: builtin/mv.c:71 +msgid "Please stage your changes to .gitmodules or stash them to proceed" +msgstr "" +"За да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n" +"или ги скатайте" + +# FIXME message +#: builtin/mv.c:89 +#, c-format +msgid "%.*s is in index" +msgstr "„%.*s“ вече е в индекса" + +#: builtin/mv.c:111 msgid "force move/rename even if target exists" msgstr "принудително преместване/преименуване дори целта да съществува" -#: builtin/mv.c:72 +#: builtin/mv.c:112 msgid "skip move/rename errors" msgstr "прескачане на грешките при преместване/преименуване" -#: builtin/mv.c:122 +#: builtin/mv.c:151 +#, c-format +msgid "destination '%s' is not a directory" +msgstr "целта „%s“ съществува и не е директория" + +#: builtin/mv.c:162 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n" -#: builtin/mv.c:126 +#: builtin/mv.c:166 msgid "bad source" msgstr "неправилен обект" -#: builtin/mv.c:129 +#: builtin/mv.c:169 msgid "can not move directory into itself" msgstr "директория не може да се премести в себе си" -#: builtin/mv.c:132 +#: builtin/mv.c:172 msgid "cannot move directory over file" msgstr "директория не може да се премести върху файл" -# FIXME message< -#: builtin/mv.c:138 -#, c-format -msgid "Huh? Directory %s is in index and no submodule?" -msgstr "Директорията „%s“ е в индекса, но не е подмодул" - -#: builtin/mv.c:140 builtin/rm.c:318 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"За да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n" -"или ги скатайте" - -# FIXME message -#: builtin/mv.c:156 -#, c-format -msgid "Huh? %.*s is in index?" -msgstr "„%.*s“ вече е в индекса" - -#: builtin/mv.c:169 +#: builtin/mv.c:181 msgid "source directory is empty" msgstr "първоначалната директория е празна" -#: builtin/mv.c:205 +#: builtin/mv.c:206 msgid "not under version control" msgstr "не е под контрола на Git" -#: builtin/mv.c:208 +#: builtin/mv.c:209 msgid "destination exists" msgstr "целта съществува" -#: builtin/mv.c:216 +#: builtin/mv.c:217 #, c-format msgid "overwriting '%s'" msgstr "презаписване на „%s“" -#: builtin/mv.c:219 +#: builtin/mv.c:220 msgid "Cannot overwrite" msgstr "Презаписването е невъзможно" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "multiple sources for the same target" msgstr "множество източници за една цел" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "destination directory does not exist" msgstr "целевата директория не съществува" -#: builtin/mv.c:244 +#: builtin/mv.c:232 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, обект: „%s“, цел: „%s“" -#: builtin/mv.c:254 +#: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" msgstr "Преименуване на „%s“ на „%s“\n" -#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358 #, c-format msgid "renaming '%s' failed" msgstr "неуспешно преименуване на „%s“" @@ -7686,119 +7905,119 @@ msgstr "git notes prune [ОПЦИЯ…]" msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:137 +#: builtin/notes.c:136 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "действието „show“ не може да се изпълни за обект „%s“" -#: builtin/notes.c:141 +#: builtin/notes.c:140 msgid "could not read 'show' output" msgstr "изведената информация от действието „show“ не може да се прочете" -#: builtin/notes.c:149 +#: builtin/notes.c:148 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "действието „show“ не може да се завърши за обект „%s“" -#: builtin/notes.c:167 builtin/tag.c:477 +#: builtin/notes.c:166 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "файлът „%s“ не може да бъде създаден" -#: builtin/notes.c:186 +#: builtin/notes.c:185 msgid "Please supply the note contents using either -m or -F option" msgstr "Задайте съдържанието на бележката с някоя от опциите „-m“ или „-F“" -#: builtin/notes.c:207 builtin/notes.c:848 +#: builtin/notes.c:206 builtin/notes.c:847 #, c-format msgid "Removing note for object %s\n" msgstr "Изтриване на бележката за обекта „%s“\n" -#: builtin/notes.c:212 +#: builtin/notes.c:211 msgid "unable to write note object" msgstr "обектът-бележка не може да бъде записан" -#: builtin/notes.c:214 +#: builtin/notes.c:213 #, c-format -msgid "The note contents has been left in %s" +msgid "The note contents have been left in %s" msgstr "Съдържанието на бележката е във файла „%s“" -#: builtin/notes.c:248 builtin/tag.c:692 +#: builtin/notes.c:247 builtin/tag.c:693 #, c-format msgid "cannot read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: builtin/notes.c:250 builtin/tag.c:695 +#: builtin/notes.c:249 builtin/tag.c:696 #, c-format msgid "could not open or read '%s'" msgstr "файлът „%s“ не може да бъде отворен или прочетен" -#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322 -#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519 -#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641 -#: builtin/notes.c:843 builtin/tag.c:708 +#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321 +#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518 +#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640 +#: builtin/notes.c:842 builtin/tag.c:709 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Не може да се открие към какво сочи „%s“." -#: builtin/notes.c:272 +#: builtin/notes.c:271 #, c-format msgid "Failed to read object '%s'." msgstr "Обектът „%s“ не може да бъде прочетен." -#: builtin/notes.c:276 +#: builtin/notes.c:275 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "" "Съдържанието на бележка не може да се вземе от обект, който не е BLOB: „%s“." -#: builtin/notes.c:316 +#: builtin/notes.c:315 #, c-format msgid "Malformed input line: '%s'." msgstr "Даденият входен ред е с неправилен формат: „%s“." -#: builtin/notes.c:331 +#: builtin/notes.c:330 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Бележката не може да се копира от „%s“ към „%s“" -#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502 -#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634 -#: builtin/notes.c:908 +#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501 +#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633 +#: builtin/notes.c:907 msgid "too many parameters" msgstr "прекалено много параметри" -#: builtin/notes.c:388 builtin/notes.c:647 +#: builtin/notes.c:387 builtin/notes.c:646 #, c-format msgid "No note found for object %s." msgstr "Няма бележки за обекта „%s“." -#: builtin/notes.c:410 builtin/notes.c:567 +#: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents as a string" msgstr "низ, който е съдържанието на бележката" -#: builtin/notes.c:413 builtin/notes.c:570 +#: builtin/notes.c:412 builtin/notes.c:569 msgid "note contents in a file" msgstr "файл със съдържанието на бележката" -#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572 -#: builtin/notes.c:575 builtin/tag.c:627 +#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571 +#: builtin/notes.c:574 builtin/tag.c:628 msgid "object" msgstr "обект" -#: builtin/notes.c:416 builtin/notes.c:573 +#: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "преизползване и редактиране на указания обект-бележка" -#: builtin/notes.c:419 builtin/notes.c:576 +#: builtin/notes.c:418 builtin/notes.c:575 msgid "reuse specified note object" msgstr "преизползване на указания обект-бележка" -#: builtin/notes.c:421 builtin/notes.c:489 +#: builtin/notes.c:420 builtin/notes.c:488 msgid "replace existing notes" msgstr "замяна на съществуващите бележки" -#: builtin/notes.c:455 +#: builtin/notes.c:454 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7807,27 +8026,27 @@ msgstr "" "Не може да се добави бележка, защото такава вече съществува за обекта „%s“. " "Използвайте опцията „-f“, за да презапишете съществуващи бележки." -#: builtin/notes.c:460 builtin/notes.c:537 +#: builtin/notes.c:459 builtin/notes.c:536 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Презаписване на съществуващите бележки за обекта „%s“\n" -#: builtin/notes.c:490 +#: builtin/notes.c:489 msgid "read objects from stdin" msgstr "изчитане на обектите от стандартния вход" # FIXME imporve message -#: builtin/notes.c:492 +#: builtin/notes.c:491 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "зареждане на настройките за КОМАНДАта, която презаписва подавания (включва " "опцията „--stdin“)" -#: builtin/notes.c:510 +#: builtin/notes.c:509 msgid "too few parameters" msgstr "прекалено малко параметри" -#: builtin/notes.c:531 +#: builtin/notes.c:530 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7836,14 +8055,14 @@ msgstr "" "Не може да се копира бележка, защото такава вече съществува за обекта „%s“. " "Използвайте опцията „-f“, за да презапишете съществуващи бележки." -#: builtin/notes.c:543 +#: builtin/notes.c:542 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" "Не може да се копира бележка, която не съществува — няма бележки за обекта-" "източник „%s“." -#: builtin/notes.c:592 +#: builtin/notes.c:591 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -7854,15 +8073,15 @@ msgstr "" "Вместо това ги използвайте с командата „add“: „git notes add -f -m/-F/-c/-" "C“.\n" -#: builtin/notes.c:739 +#: builtin/notes.c:738 msgid "General options" msgstr "Общи опции" -#: builtin/notes.c:741 +#: builtin/notes.c:740 msgid "Merge options" msgstr "Опции при сливане" -#: builtin/notes.c:743 +#: builtin/notes.c:742 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -7872,242 +8091,246 @@ msgstr "" "„union“ (обединяване), „cat_sort_uniq“ (обединяване, подреждане, уникални " "резултати)" -#: builtin/notes.c:745 +#: builtin/notes.c:744 msgid "Committing unmerged notes" msgstr "Подаване на неслети бележки" -#: builtin/notes.c:747 +#: builtin/notes.c:746 msgid "finalize notes merge by committing unmerged notes" msgstr "завършване на сливането чрез подаване на неслети бележки" -#: builtin/notes.c:749 +#: builtin/notes.c:748 msgid "Aborting notes merge resolution" msgstr "Преустановяване на корекцията при сливането на бележки" -#: builtin/notes.c:751 +#: builtin/notes.c:750 msgid "abort notes merge" msgstr "преустановяване на сливането на бележки" -#: builtin/notes.c:846 +#: builtin/notes.c:845 #, c-format msgid "Object %s has no note\n" msgstr "Няма бележки за обекта „%s“\n" -#: builtin/notes.c:858 +#: builtin/notes.c:857 msgid "attempt to remove non-existent note is not an error" msgstr "опитът за изтриването на несъществуваща бележка не се счита за грешка" -#: builtin/notes.c:861 +#: builtin/notes.c:860 msgid "read object names from the standard input" msgstr "изчитане на имената на обектите от стандартния вход" -#: builtin/notes.c:942 +#: builtin/notes.c:941 msgid "notes-ref" msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" -#: builtin/notes.c:943 +#: builtin/notes.c:942 msgid "use notes from <notes_ref>" msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" -#: builtin/notes.c:978 builtin/remote.c:1616 +#: builtin/notes.c:977 builtin/remote.c:1624 #, c-format msgid "Unknown subcommand: %s" msgstr "Непозната подкоманда: %s" -#: builtin/pack-objects.c:25 +#: builtin/pack-objects.c:28 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "" "git pack-objects --stdout [ОПЦИЯ…] [< СПИСЪК_С_ВЕРСИИ | < СПИСЪК_С_ОБЕКТИ]" # FIXME [options] vs [options...] -#: builtin/pack-objects.c:26 +#: builtin/pack-objects.c:29 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" "git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_ВЕРСИИ | < " "СПИСЪК_С_ОБЕКТИ]" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "грешка при декомпресиране с „deflate“ (%d)" -#: builtin/pack-objects.c:771 +#: builtin/pack-objects.c:773 msgid "Writing objects" msgstr "Записване на обектите" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1015 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "изключване на записването на битовата маска, защото някои обекти няма да се " "пакетират" -#: builtin/pack-objects.c:2174 +#: builtin/pack-objects.c:2175 msgid "Compressing objects" msgstr "Компресиране на обектите" -#: builtin/pack-objects.c:2526 +#: builtin/pack-objects.c:2572 #, c-format msgid "unsupported index version %s" msgstr "неподдържана версия на индекса „%s“" -#: builtin/pack-objects.c:2530 +#: builtin/pack-objects.c:2576 #, c-format msgid "bad index version '%s'" msgstr "неправилна версия на индекса „%s“" -#: builtin/pack-objects.c:2553 +#: builtin/pack-objects.c:2599 #, c-format msgid "option %s does not accept negative form" msgstr "опцията „%s“ не притежава отрицателна версия" -#: builtin/pack-objects.c:2557 +#: builtin/pack-objects.c:2603 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "неразпозната стойност „%s“ за опцията „%s“" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2622 msgid "do not show progress meter" msgstr "без извеждане на напредъка" -#: builtin/pack-objects.c:2578 +#: builtin/pack-objects.c:2624 msgid "show progress meter" msgstr "извеждане на напредъка" -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c:2626 msgid "show progress meter during object writing phase" msgstr "извеждане на напредъка във фазата на запазване на обектите" -#: builtin/pack-objects.c:2583 +#: builtin/pack-objects.c:2629 msgid "similar to --all-progress when progress meter is shown" msgstr "" "същото действие като опцията „--all-progress“ при извеждането на напредъка" -#: builtin/pack-objects.c:2584 +#: builtin/pack-objects.c:2630 msgid "version[,offset]" msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]" -#: builtin/pack-objects.c:2585 +#: builtin/pack-objects.c:2631 msgid "write the pack index file in the specified idx format version" msgstr "" "запазване на индекса на пакетните файлове във форма̀та с указаната версия" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2634 msgid "maximum size of each output pack file" msgstr "максимален размер на всеки пакетен файл" -#: builtin/pack-objects.c:2590 +#: builtin/pack-objects.c:2636 msgid "ignore borrowed objects from alternate object store" msgstr "игнориране на обектите заети от други хранилища на обекти" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2638 msgid "ignore packed objects" msgstr "игнориране на пакетираните обекти" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2640 msgid "limit pack window by objects" msgstr "ограничаване на прозореца за пакетиране по брой обекти" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2642 msgid "limit pack window by memory in addition to object limit" msgstr "" "ограничаване на прозореца за пакетиране и по памет освен по брой обекти" -#: builtin/pack-objects.c:2598 +#: builtin/pack-objects.c:2644 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "максимална дължина на веригата от разлики, която е позволена в пакетния файл" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2646 msgid "reuse existing deltas" msgstr "преизползване на съществуващите разлики" -#: builtin/pack-objects.c:2602 +#: builtin/pack-objects.c:2648 msgid "reuse existing objects" msgstr "преизползване на съществуващите обекти" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2650 msgid "use OFS_DELTA objects" msgstr "използване на обекти „OFS_DELTA“" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2652 msgid "use threads when searching for best delta matches" msgstr "" "стартиране на нишки за претърсване на най-добрите съвпадения на разликите" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2654 msgid "do not create an empty pack output" msgstr "без създаване на празен пакетен файл" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2656 msgid "read revision arguments from standard input" msgstr "изчитане на версиите от стандартния вход" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2658 msgid "limit the objects to those that are not yet packed" msgstr "ограничаване до все още непакетираните обекти" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2661 msgid "include objects reachable from any reference" msgstr "" "включване на всички обекти, които могат да се достигнат от произволен " "указател" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2664 msgid "include objects referred by reflog entries" msgstr "включване и на обектите сочени от записите в журнала на указателите" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2667 +msgid "include objects referred to by the index" +msgstr "включване и на обектите сочени от индекса" + +#: builtin/pack-objects.c:2670 msgid "output pack to stdout" msgstr "извеждане на пакета на стандартния изход" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2672 msgid "include tag objects that refer to objects to be packed" msgstr "" "включване и на обектите-етикети, които сочат към обектите, които ще бъдат " "пакетирани" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2674 msgid "keep unreachable objects" msgstr "запазване на недостижимите обекти" -#: builtin/pack-objects.c:2626 parse-options.h:140 +#: builtin/pack-objects.c:2675 parse-options.h:140 msgid "time" msgstr "ВРЕМЕ" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2676 msgid "unpack unreachable objects newer than <time>" msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2679 msgid "create thin packs" msgstr "създаване на съкратени пакети" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2681 msgid "ignore packs that have companion .keep file" msgstr "игнориране на пакетите, които са придружени от файл „.keep“" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2683 msgid "pack compression level" msgstr "ниво на компресиране при пакетиране" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2685 msgid "do not hide commits by grafts" msgstr "" "извеждане на всички родители — дори и тези, които нормално са скрити при " "присажданията" -#: builtin/pack-objects.c:2638 +#: builtin/pack-objects.c:2687 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "използване на съществуващи индекси на база битови маски за ускоряване на " "преброяването на обектите" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2689 msgid "write a bitmap index together with the pack index" msgstr "" "запазване и на индекс на база побитова маска, заедно с индекса за пакета" -#: builtin/pack-objects.c:2719 +#: builtin/pack-objects.c:2778 msgid "Counting objects" msgstr "Преброяване на обектите" @@ -8127,7 +8350,7 @@ msgstr "окастряне на недостижимите указатели ( msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" -#: builtin/prune-packed.c:49 +#: builtin/prune-packed.c:40 msgid "Removing duplicate objects" msgstr "Изтриване на повтарящите се обекти" @@ -8135,15 +8358,15 @@ msgstr "Изтриване на повтарящите се обекти" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire ВРЕМЕ] [--] [ВРЪХ…]" -#: builtin/prune.c:142 +#: builtin/prune.c:106 msgid "do not remove, show only" msgstr "само извеждане без действително окастряне" -#: builtin/prune.c:143 +#: builtin/prune.c:107 msgid "report pruned objects" msgstr "информация за окастрените обекти" -#: builtin/prune.c:146 +#: builtin/prune.c:110 msgid "expire objects older than <time>" msgstr "окастряне на обектите по-стари от това ВРЕМЕ" @@ -8420,83 +8643,83 @@ msgstr "опцията „--mirror“ е несъвместима с указв msgid "--all and --mirror are incompatible" msgstr "опциите „--all“ и „--mirror“ са несъвместими" -#: builtin/push.c:482 +#: builtin/push.c:493 msgid "repository" msgstr "хранилище" -#: builtin/push.c:483 +#: builtin/push.c:494 msgid "push all refs" msgstr "изтласкване на всички указатели" -#: builtin/push.c:484 +#: builtin/push.c:495 msgid "mirror all refs" msgstr "огледално копие на всички указатели" -#: builtin/push.c:486 +#: builtin/push.c:497 msgid "delete refs" msgstr "изтриване на указателите" -#: builtin/push.c:487 +#: builtin/push.c:498 msgid "push tags (can't be used with --all or --mirror)" msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)" -#: builtin/push.c:490 +#: builtin/push.c:501 msgid "force updates" msgstr "принудително обновяване" # FIXME double check this -#: builtin/push.c:492 +#: builtin/push.c:503 msgid "refname>:<expect" msgstr "УКАЗАТЕЛ>:<ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:493 +#: builtin/push.c:504 msgid "require old value of ref to be at this value" msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:495 -msgid "check" -msgstr "проверка" - -#: builtin/push.c:496 +#: builtin/push.c:507 msgid "control recursive pushing of submodules" msgstr "управление на рекурсивното изтласкване на подмодулите" -#: builtin/push.c:498 +#: builtin/push.c:509 msgid "use thin pack" msgstr "използване на съкратени пакети" -#: builtin/push.c:499 builtin/push.c:500 +#: builtin/push.c:510 builtin/push.c:511 msgid "receive pack program" msgstr "програма за получаването на пакети" -#: builtin/push.c:501 +#: builtin/push.c:512 msgid "set upstream for git pull/status" msgstr "задаване на отдалеченото хранилище за командите „git pull/status“" -#: builtin/push.c:504 +#: builtin/push.c:515 msgid "prune locally removed refs" msgstr "окастряне на указателите, които са премахнати от локалното хранилище" -#: builtin/push.c:506 +#: builtin/push.c:517 msgid "bypass pre-push hook" msgstr "без изпълнение на куката преди изтласкване (pre-push)" -#: builtin/push.c:507 +#: builtin/push.c:518 msgid "push missing but relevant tags" msgstr "" "изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото " "изтласкване, етикети" -#: builtin/push.c:517 +#: builtin/push.c:520 +msgid "GPG sign the push" +msgstr "подписване на изтласкването с GPG" + +#: builtin/push.c:529 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" "опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“" -#: builtin/push.c:519 +#: builtin/push.c:531 msgid "--delete doesn't make sense without any refs" msgstr "опцията „--delete“ изисква поне един указател на версия" -#: builtin/read-tree.c:36 +#: builtin/read-tree.c:37 msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -8507,67 +8730,67 @@ msgstr "" "checkout] [--index-output=ФАЙЛ] (--empty | УКАЗАТЕЛ_КЪМ_ДЪРВО_1 " "[УКАЗАТЕЛ_КЪМ_ДЪРВО_2 [УКАЗАТЕЛ_КЪМ_ДЪРВО_3]])" -#: builtin/read-tree.c:109 +#: builtin/read-tree.c:110 msgid "write resulting index to <file>" msgstr "запазване на индекса в този ФАЙЛ" -#: builtin/read-tree.c:112 +#: builtin/read-tree.c:113 msgid "only empty the index" msgstr "само зануляване на индекса" -#: builtin/read-tree.c:114 +#: builtin/read-tree.c:115 msgid "Merging" msgstr "Сливане" -#: builtin/read-tree.c:116 +#: builtin/read-tree.c:117 msgid "perform a merge in addition to a read" msgstr "да се извърши и сливане след освен изчитането" -#: builtin/read-tree.c:118 +#: builtin/read-tree.c:119 msgid "3-way merge if no file level merging required" msgstr "тройно сливане, ако не се налага пофайлово сливане" -#: builtin/read-tree.c:120 +#: builtin/read-tree.c:121 msgid "3-way merge in presence of adds and removes" msgstr "тройно сливане при добавяне на добавяне и изтриване на файлове" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:123 msgid "same as -m, but discard unmerged entries" msgstr "същото като опцията „-m“, но неслетите обекти се пренебрегват" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "<subdirectory>/" msgstr "ПОДДИРЕКТОРИЯ/" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:125 msgid "read the tree into the index under <subdirectory>/" msgstr "изчитане на дървото към индекса като да е в тази ПОДДИРЕКТОРИЯ/" -#: builtin/read-tree.c:127 +#: builtin/read-tree.c:128 msgid "update working tree with merge result" msgstr "обновяване на работното дърво с резултата от сливането" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "gitignore" msgstr "ФАЙЛ_С_ИЗКЛЮЧЕНИЯ" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:131 msgid "allow explicitly ignored files to be overwritten" msgstr "позволяване на презаписването на изрично пренебрегваните файлове" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't check the working tree after merging" msgstr "без проверка на работното дърво след сливането" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:135 msgid "don't update the index or the work tree" msgstr "без обновяване и на индекса, и на работното дърво" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" msgstr "без прилагане на филтъра за частично изтегляне" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "изчистване на грешки в командата „unpack-trees“" @@ -8724,12 +8947,12 @@ msgstr "" "указването на следени клони е смислено само за отдалечени хранилища, от " "които се доставя" -#: builtin/remote.c:185 builtin/remote.c:640 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "вече съществува отдалечено хранилище с име „%s“." -#: builtin/remote.c:189 builtin/remote.c:644 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "„%s“ е неправилно име за отдалечено хранилище" @@ -8739,11 +8962,6 @@ msgstr "„%s“ е неправилно име за отдалечено хра msgid "Could not setup master '%s'" msgstr "Основният клон „%s“ не може да бъде настроен" -#: builtin/remote.c:288 -#, c-format -msgid "more than one %s" -msgstr "повече от едно отдалечено хранилище на име „%s“" - #: builtin/remote.c:333 #, c-format msgid "Could not get fetch map for refspec %s" @@ -8757,28 +8975,28 @@ msgstr "(съвпадащи)" msgid "(delete)" msgstr "(за изтриване)" -#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "„%s“ не може да се добави към „%s“" -#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894 +#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898 #, c-format msgid "No such remote: %s" msgstr "Такова отдалечено хранилище няма: %s" -#: builtin/remote.c:650 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Разделът „%s“ в настройките не може да бъде преименуван на „%s“" -#: builtin/remote.c:656 builtin/remote.c:846 +#: builtin/remote.c:657 builtin/remote.c:850 #, c-format msgid "Could not remove config section '%s'" msgstr "Разделът „%s“ в настройките не може да бъде изтрит" # FIXME tabulator -#: builtin/remote.c:671 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8789,32 +9007,32 @@ msgstr "" " %s\n" " Променете настройките ръчно, ако е необходимо." -#: builtin/remote.c:677 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "Разделът „%s“ не може да бъде добавен в настройките" -#: builtin/remote.c:688 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "Разделът „%s“ не може да бъде зададен в настройките" -#: builtin/remote.c:710 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "неуспешно изтриване на „%s“" -#: builtin/remote.c:744 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "неуспешно създаване на „%s“" -#: builtin/remote.c:765 +#: builtin/remote.c:769 #, c-format msgid "Could not remove branch %s" msgstr "Клонът „%s“ не може да бъде изтрит" -#: builtin/remote.c:832 +#: builtin/remote.c:836 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8828,125 +9046,125 @@ msgstr[1] "" "Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n" "Изтрийте ги чрез командата:" -#: builtin/remote.c:947 +#: builtin/remote.c:951 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)" -#: builtin/remote.c:950 +#: builtin/remote.c:954 msgid " tracked" msgstr " следен" -#: builtin/remote.c:952 +#: builtin/remote.c:956 msgid " stale (use 'git remote prune' to remove)" msgstr " стар (изтрийте чрез „git remote prune“)" # FIXME -#: builtin/remote.c:954 +#: builtin/remote.c:958 msgid " ???" -msgstr " неясно" +msgstr " неясно състояние" # CHECK -#: builtin/remote.c:995 +#: builtin/remote.c:999 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" "неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече от " "1 клон" -#: builtin/remote.c:1002 +#: builtin/remote.c:1006 #, c-format msgid "rebases onto remote %s" msgstr "пребазиране върху отдалечения клон „%s“" -#: builtin/remote.c:1005 +#: builtin/remote.c:1009 #, c-format msgid " merges with remote %s" msgstr " сливане с отдалечения клон „%s“" -#: builtin/remote.c:1006 +#: builtin/remote.c:1010 msgid " and with remote" msgstr " и с отдалечения клон" -#: builtin/remote.c:1008 +#: builtin/remote.c:1012 #, c-format msgid "merges with remote %s" msgstr "сливане с отдалечения клон „%s“" -#: builtin/remote.c:1009 +#: builtin/remote.c:1013 msgid " and with remote" msgstr " и с отдалечения клон" -#: builtin/remote.c:1055 +#: builtin/remote.c:1059 msgid "create" msgstr "създаден" -#: builtin/remote.c:1058 +#: builtin/remote.c:1062 msgid "delete" msgstr "изтрит" -#: builtin/remote.c:1062 +#: builtin/remote.c:1066 msgid "up to date" msgstr "актуален" -#: builtin/remote.c:1065 +#: builtin/remote.c:1069 msgid "fast-forwardable" msgstr "може да се слее тривиално" -#: builtin/remote.c:1068 +#: builtin/remote.c:1072 msgid "local out of date" msgstr "локалният е изостанал" -#: builtin/remote.c:1075 +#: builtin/remote.c:1079 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s принудително изтласква към %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1082 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s изтласква към %-*s (%s)" -#: builtin/remote.c:1082 +#: builtin/remote.c:1086 #, c-format msgid " %-*s forces to %s" msgstr " %-*s принудително изтласква към %s" -#: builtin/remote.c:1085 +#: builtin/remote.c:1089 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s изтласква към %s" -#: builtin/remote.c:1153 +#: builtin/remote.c:1157 msgid "do not query remotes" msgstr "без заявки към отдалечените хранилища" -#: builtin/remote.c:1180 +#: builtin/remote.c:1184 #, c-format msgid "* remote %s" msgstr "● отдалечено хранилище „%s“" -#: builtin/remote.c:1181 +#: builtin/remote.c:1185 #, c-format msgid " Fetch URL: %s" msgstr " Адрес за доставяне: %s" -#: builtin/remote.c:1182 builtin/remote.c:1329 +#: builtin/remote.c:1186 builtin/remote.c:1333 msgid "(no URL)" msgstr "(без адрес)" # FIXME spaces betwen Push and URL -#: builtin/remote.c:1191 builtin/remote.c:1193 +#: builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " Push URL: %s" msgstr " Адрес за изтласкване: %s" -#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199 +#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203 #, c-format msgid " HEAD branch: %s" msgstr " клон сочен от HEAD: %s" -#: builtin/remote.c:1201 +#: builtin/remote.c:1205 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -8955,146 +9173,146 @@ msgstr "" "хранилище е\n" " нееднозначен и е някой от следните):\n" -#: builtin/remote.c:1213 +#: builtin/remote.c:1217 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Отдалечен клон:%s" msgstr[1] " Отдалечени клони:%s" -#: builtin/remote.c:1216 builtin/remote.c:1243 +#: builtin/remote.c:1220 builtin/remote.c:1247 msgid " (status not queried)" msgstr " (състоянието не бе проверено)" -#: builtin/remote.c:1225 +#: builtin/remote.c:1229 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:1233 +#: builtin/remote.c:1237 msgid " Local refs will be mirrored by 'git push'" msgstr " Локалните указатели ще бъдат пренесени чрез „ push“" -#: builtin/remote.c:1240 +#: builtin/remote.c:1244 #, 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:1261 +#: builtin/remote.c:1265 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище" -#: builtin/remote.c:1263 +#: builtin/remote.c:1267 msgid "delete refs/remotes/<name>/HEAD" msgstr "изтриване на refs/remotes/ИМЕ/HEAD" -#: builtin/remote.c:1278 +#: builtin/remote.c:1282 msgid "Cannot determine remote HEAD" msgstr "Не може да се установи отдалеченият връх" -#: builtin/remote.c:1280 +#: builtin/remote.c:1284 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Множество клони с върхове. Изберете изрично някой от тях чрез командата:" -#: builtin/remote.c:1290 +#: builtin/remote.c:1294 #, c-format msgid "Could not delete %s" msgstr "„%s“ не може да бъде изтрит" -#: builtin/remote.c:1298 +#: builtin/remote.c:1302 #, c-format msgid "Not a valid ref: %s" msgstr "Неправилен указател: %s" -#: builtin/remote.c:1300 +#: builtin/remote.c:1304 #, c-format msgid "Could not setup %s" msgstr "„%s“ не може да се настрои" -#: builtin/remote.c:1318 +#: builtin/remote.c:1322 #, c-format msgid " %s will become dangling!" msgstr "„%s“ ще се превърне в обект извън клоните!" -#: builtin/remote.c:1319 +#: builtin/remote.c:1323 #, c-format msgid " %s has become dangling!" msgstr "„%s“ се превърна в обект извън клоните!" -#: builtin/remote.c:1325 +#: builtin/remote.c:1329 #, c-format msgid "Pruning %s" msgstr "Окастряне на „%s“" -#: builtin/remote.c:1326 +#: builtin/remote.c:1330 #, c-format msgid "URL: %s" msgstr "адрес: %s" -#: builtin/remote.c:1349 +#: builtin/remote.c:1357 #, c-format msgid " * [would prune] %s" msgstr " ● [ще бъде окастрено] %s" -#: builtin/remote.c:1352 +#: builtin/remote.c:1360 #, c-format msgid " * [pruned] %s" msgstr " ● [окастрено] %s" -#: builtin/remote.c:1397 +#: builtin/remote.c:1405 msgid "prune remotes after fetching" msgstr "окастряне на огледалата на отдалечените хранилища след доставяне" -#: builtin/remote.c:1463 builtin/remote.c:1537 +#: builtin/remote.c:1471 builtin/remote.c:1545 #, c-format msgid "No such remote '%s'" msgstr "Няма отдалечено хранилище на име „%s“" -#: builtin/remote.c:1483 +#: builtin/remote.c:1491 msgid "add branch" msgstr "добавяне на клон" -#: builtin/remote.c:1490 +#: builtin/remote.c:1498 msgid "no remote specified" msgstr "не е указано отдалечено хранилище" -#: builtin/remote.c:1512 +#: builtin/remote.c:1520 msgid "manipulate push URLs" msgstr "промяна на адресите за изтласкване" -#: builtin/remote.c:1514 +#: builtin/remote.c:1522 msgid "add URL" msgstr "добавяне на адреси" -#: builtin/remote.c:1516 +#: builtin/remote.c:1524 msgid "delete URLs" msgstr "изтриване на адреси" # FIXME message - incompatible -#: builtin/remote.c:1523 +#: builtin/remote.c:1531 msgid "--add --delete doesn't make sense" msgstr "опциите „--add“ и „--delete“ са несъвместими" -#: builtin/remote.c:1563 +#: builtin/remote.c:1571 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Неправилен (стар) формат за адрес: %s" -#: builtin/remote.c:1571 +#: builtin/remote.c:1579 #, c-format msgid "No such URL found: %s" msgstr "Такъв адрес не е открит: %s" # FIXME CHECK MEANING -#: builtin/remote.c:1573 +#: builtin/remote.c:1581 msgid "Will not delete all non-push URLs" msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие" -#: builtin/remote.c:1587 +#: builtin/remote.c:1595 msgid "be verbose; must be placed before a subcommand" msgstr "повече подробности. Поставя се пред подкоманда" @@ -9200,22 +9418,22 @@ msgstr "git replace -d ОБЕКТ…" msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=ФОРМАТ] [-l [ШАБЛОН]]" -#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388 +#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 #, c-format msgid "Not a valid object name: '%s'" msgstr "Неправилно име на обект: „%s“" -#: builtin/replace.c:352 +#: builtin/replace.c:355 #, c-format msgid "bad mergetag in commit '%s'" msgstr "етикетът при сливане в подаването „%s“ e неправилен" -#: builtin/replace.c:354 +#: builtin/replace.c:357 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "етикетът при сливане в подаването „%s“ e неправилен" -#: builtin/replace.c:365 +#: builtin/replace.c:368 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -9224,45 +9442,45 @@ msgstr "" "Първоначалното подаване „%s“ съдържа етикета при сливане „%s“, който е " "изхвърлен, затова използвайте опцията „--edit“, а не „--graft“." -#: builtin/replace.c:398 +#: builtin/replace.c:401 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "Първоначалното подаване „%s“ е с подпис на GPG." -#: builtin/replace.c:399 +#: builtin/replace.c:402 msgid "the signature will be removed in the replacement commit!" msgstr "Подписът ще бъде премахнат в заменящото подаване!" -#: builtin/replace.c:405 +#: builtin/replace.c:408 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "заменящото подаване за „%s“ не може да бъде записано" -#: builtin/replace.c:429 +#: builtin/replace.c:432 msgid "list replace refs" msgstr "извеждане на списъка с указателите за замяна" -#: builtin/replace.c:430 +#: builtin/replace.c:433 msgid "delete replace refs" msgstr "изтриване на указателите за замяна" -#: builtin/replace.c:431 +#: builtin/replace.c:434 msgid "edit existing object" msgstr "редактиране на съществуващ обект" -#: builtin/replace.c:432 +#: builtin/replace.c:435 msgid "change a commit's parents" msgstr "смяна на родителите на подаване" -#: builtin/replace.c:433 +#: builtin/replace.c:436 msgid "replace the ref if it exists" msgstr "замяна на указателя, ако съществува" -#: builtin/replace.c:434 +#: builtin/replace.c:437 msgid "do not pretty-print contents for --edit" msgstr "без форматирано извеждане на съдържанието — за опцията „--edit“" -#: builtin/replace.c:435 +#: builtin/replace.c:438 msgid "use this format" msgstr "използване на този ФОРМАТ" @@ -9274,160 +9492,160 @@ msgstr "git rerere [clear | forget ПЪТ… | status | remaining | diff | gc]" msgid "register clean resolutions in index" msgstr "регистриране на чисти корекции на конфликти в индекса" -#: builtin/reset.c:25 +#: builtin/reset.c:26 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [ПОДАВАНЕ]" -#: builtin/reset.c:26 +#: builtin/reset.c:27 msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "git reset [-q] УКАЗАТЕЛ_КЪМ_ДЪРВО [--] ПЪТИЩА…" -#: builtin/reset.c:27 +#: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] [ПЪТИЩА…]" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "mixed" msgstr "смесено (mixed)" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "soft" msgstr "меко (soft)" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "hard" msgstr "пълно (hard)" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "merge" msgstr "слято (merge)" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "keep" msgstr "запазващо (keep)" -#: builtin/reset.c:73 +#: builtin/reset.c:74 msgid "You do not have a valid HEAD." msgstr "Указателят „HEAD“ е повреден." -#: builtin/reset.c:75 +#: builtin/reset.c:76 msgid "Failed to find tree of HEAD." msgstr "Дървото, сочено от указателя „HEAD“, не може да бъде открито." -#: builtin/reset.c:81 +#: builtin/reset.c:82 #, c-format msgid "Failed to find tree of %s." msgstr "Дървото, сочено от „%s“, не може да бъде открито." -#: builtin/reset.c:99 +#: builtin/reset.c:100 #, c-format msgid "HEAD is now at %s" msgstr "Указателят „HEAD“ сочи към „%s“" -#: builtin/reset.c:182 +#: builtin/reset.c:183 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Не може да се извърши %s зануляване по време на сливане." -#: builtin/reset.c:275 +#: builtin/reset.c:276 msgid "be quiet, only report errors" msgstr "по-малко подробности, да се извеждат само грешките" -#: builtin/reset.c:277 +#: builtin/reset.c:278 msgid "reset HEAD and index" msgstr "индекса и указателя „HEAD“, без работното дърво" -#: builtin/reset.c:278 +#: builtin/reset.c:279 msgid "reset only HEAD" msgstr "само указателя „HEAD“, без индекса и работното дърво" # FIXME vs man page -#: builtin/reset.c:280 builtin/reset.c:282 +#: builtin/reset.c:281 builtin/reset.c:283 msgid "reset HEAD, index and working tree" msgstr "указателя „HEAD“, индекса и работното дърво" # FIXME vs man page -#: builtin/reset.c:284 +#: builtin/reset.c:285 msgid "reset HEAD but keep local changes" msgstr "зануляване на указателя „HEAD“, но запазване на локалните промени" -#: builtin/reset.c:287 +#: builtin/reset.c:288 msgid "record only the fact that removed paths will be added later" msgstr "" "отбелязване само на факта, че изтритите пътища ще бъдат добавени по-късно" -#: builtin/reset.c:304 +#: builtin/reset.c:305 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Стойността „%s“ не е разпозната като съществуваща версия." -#: builtin/reset.c:307 builtin/reset.c:315 +#: builtin/reset.c:308 builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "„%s“ не е разпознат като обект." -#: builtin/reset.c:312 +#: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "„%s“ не е разпознат като дърво." -#: builtin/reset.c:321 +#: builtin/reset.c:322 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" "опцията „--patch“ е несъвместима с всяка от опциите „--hard/--mixed/--soft“" -#: builtin/reset.c:330 +#: builtin/reset.c:331 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "опцията „--mixed“ не бива да се използва заедно с пътища. Вместо това " "изпълнете „git reset -- ПЪТ…“." -#: builtin/reset.c:332 +#: builtin/reset.c:333 #, c-format msgid "Cannot do %s reset with paths." msgstr "Не може да извършите %s зануляване, когато сте задали ПЪТ." -#: builtin/reset.c:342 +#: builtin/reset.c:343 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "В голо хранилище не може да извършите %s зануляване" -#: builtin/reset.c:346 +#: builtin/reset.c:347 msgid "-N can only be used with --mixed" msgstr "Опцията „-N“ е съвместима само с „--mixed“" -#: builtin/reset.c:363 +#: builtin/reset.c:364 msgid "Unstaged changes after reset:" msgstr "Промени извън индекса след зануляването:" -#: builtin/reset.c:369 +#: builtin/reset.c:370 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Индексът не може да бъде занулен към версия „%s“." -#: builtin/reset.c:373 +#: builtin/reset.c:374 msgid "Could not write new index file." msgstr "Новият индекс не може да бъде записан." -#: builtin/rev-parse.c:360 +#: builtin/rev-parse.c:361 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [ОПЦИЯ…] -- [АРГУМЕНТИ…]" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" msgstr "зададеният низ „--“ да се тълкува като аргумент" -#: builtin/rev-parse.c:367 +#: builtin/rev-parse.c:368 msgid "stop parsing after the first non-option argument" msgstr "спиране на анализа след първия аргумент, който не е опция" -#: builtin/rev-parse.c:370 +#: builtin/rev-parse.c:371 msgid "output in stuck long form" msgstr "изход в дългия формат" -#: builtin/rev-parse.c:498 +#: builtin/rev-parse.c:499 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -9540,7 +9758,7 @@ msgid "" "the following submodule (or one of its nested submodules)\n" "uses a .git directory:" msgid_plural "" -"the following submodules (or one of its nested submodules)\n" +"the following submodules (or one of their nested submodules)\n" "use a .git directory:" msgstr[0] "" "следният подмодул или някой от неговите подмодули използват директория на " @@ -9626,6 +9844,12 @@ msgstr "" "изходният код да е 0, дори ако никой файл нe e напаснал с шаблона за " "изтриване" +#: builtin/rm.c:318 +msgid "Please, stage your changes to .gitmodules or stash them to proceed" +msgstr "" +"За да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n" +"или ги скатайте" + #: builtin/rm.c:336 #, c-format msgid "not removing '%s' recursively without -r" @@ -9820,11 +10044,11 @@ msgstr "изтриване на символен указател" msgid "shorten ref output" msgstr "кратка информация за указателя" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "причина" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "причина за обновяването" @@ -9951,246 +10175,236 @@ msgstr "опцията „--points-at“ изисква аргумент-обе msgid "malformed object name '%s'" msgstr "неправилно име на обект „%s“" -#: builtin/tag.c:588 +#: builtin/tag.c:589 msgid "list tag names" msgstr "извеждане на имената на етикетите" -#: builtin/tag.c:590 +#: builtin/tag.c:591 msgid "print <n> lines of each tag message" msgstr "извеждане на този БРОЙ редове от всяко съобщение за етикет" -#: builtin/tag.c:592 +#: builtin/tag.c:593 msgid "delete tags" msgstr "изтриване на етикети" -#: builtin/tag.c:593 +#: builtin/tag.c:594 msgid "verify tags" msgstr "проверка на етикети" -#: builtin/tag.c:595 +#: builtin/tag.c:596 msgid "Tag creation options" msgstr "Опции при създаването на етикети" -#: builtin/tag.c:597 +#: builtin/tag.c:598 msgid "annotated tag, needs a message" msgstr "анотирането на етикети изисква съобщение" -#: builtin/tag.c:599 +#: builtin/tag.c:600 msgid "tag message" msgstr "съобщение за етикет" -#: builtin/tag.c:601 +#: builtin/tag.c:602 msgid "annotated and GPG-signed tag" msgstr "анотиран етикет с подпис по GPG" -#: builtin/tag.c:605 +#: builtin/tag.c:606 msgid "use another key to sign the tag" msgstr "използване на друг ключ за подписването на етикет" -#: builtin/tag.c:606 +#: builtin/tag.c:607 msgid "replace the tag if exists" msgstr "замяна на етикета, ако съществува" -#: builtin/tag.c:607 +#: builtin/tag.c:608 msgid "show tag list in columns" msgstr "извеждане на списъка на етикетите по колони" -#: builtin/tag.c:609 +#: builtin/tag.c:610 msgid "sort tags" msgstr "подреждане на етикетите" -#: builtin/tag.c:613 +#: builtin/tag.c:614 msgid "Tag listing options" msgstr "Опции за извеждането на етикети" -#: builtin/tag.c:616 builtin/tag.c:622 +#: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "извеждане само на етикетите, които съдържат подаването" -#: builtin/tag.c:628 +#: builtin/tag.c:629 msgid "print only tags of the object" msgstr "извеждане само на етикетите на обекта" -#: builtin/tag.c:654 +#: builtin/tag.c:655 msgid "--column and -n are incompatible" msgstr "Опциите „--column“ и „-n“ са несъвместими" -#: builtin/tag.c:666 +#: builtin/tag.c:667 msgid "--sort and -n are incompatible" msgstr "Опциите „--long“ и „-n“ са несъвместими" -#: builtin/tag.c:673 +#: builtin/tag.c:674 msgid "-n option is only allowed with -l." msgstr "Опцията „-n“ изисква опцията „-l“." -#: builtin/tag.c:675 +#: builtin/tag.c:676 msgid "--contains option is only allowed with -l." msgstr "Опцията „-contains“ изисква опцията „-l“." -#: builtin/tag.c:677 +#: builtin/tag.c:678 msgid "--points-at option is only allowed with -l." msgstr "Опцията „-points-at“ изисква опцията „-l“." # FIXME message pattern -#: builtin/tag.c:685 +#: builtin/tag.c:686 msgid "only one -F or -m option is allowed." msgstr "Опциите „-F“ и „-m“ са несъвместими." -#: builtin/tag.c:705 +#: builtin/tag.c:706 msgid "too many params" msgstr "Прекалено много аргументи" -#: builtin/tag.c:711 +#: builtin/tag.c:712 #, c-format msgid "'%s' is not a valid tag name." msgstr "„%s“ е неправилно име за етикет." -#: builtin/tag.c:716 +#: builtin/tag.c:717 #, c-format msgid "tag '%s' already exists" msgstr "етикетът „%s“ вече съществува" -#: builtin/tag.c:734 -#, c-format -msgid "%s: cannot lock the ref" -msgstr "указателят „%s“ не може да бъде заключен" - -#: builtin/tag.c:736 -#, c-format -msgid "%s: cannot update the ref" -msgstr "указателят „%s“ не може да бъде обновен" - -#: builtin/tag.c:738 +#: builtin/tag.c:741 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Обновен етикет „%s“ (бе „%s“)\n" -#: builtin/unpack-objects.c:483 +#: builtin/unpack-objects.c:489 msgid "Unpacking objects" msgstr "Разпакетиране на обектите" -#: builtin/update-index.c:402 +#: builtin/update-index.c:403 msgid "git update-index [options] [--] [<file>...]" msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]" -#: builtin/update-index.c:755 +#: builtin/update-index.c:756 msgid "continue refresh even when index needs update" msgstr "" "продължаване с обновяването, дори когато индексът трябва да бъде обновен" -#: builtin/update-index.c:758 +#: builtin/update-index.c:759 msgid "refresh: ignore submodules" msgstr "подмодулите да се игнорират при обновяването" -#: builtin/update-index.c:761 +#: builtin/update-index.c:762 msgid "do not ignore new files" msgstr "новите файлове да не се игнорират" -#: builtin/update-index.c:763 +#: builtin/update-index.c:764 msgid "let files replace directories and vice-versa" msgstr "файлове да могат да заменят директории и обратно" -#: builtin/update-index.c:765 +#: builtin/update-index.c:766 msgid "notice files missing from worktree" msgstr "предупреждаване при липсващи в работното дърво файлове" -#: builtin/update-index.c:767 +#: builtin/update-index.c:768 msgid "refresh even if index contains unmerged entries" msgstr "обновяване дори и индексът да съдържа неслети обекти" -#: builtin/update-index.c:770 +#: builtin/update-index.c:771 msgid "refresh stat information" msgstr "обновяване на информацията от функцията „stat“" -#: builtin/update-index.c:774 +#: builtin/update-index.c:775 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" "като опцията „--refresh“, но да се проверят и обектите, които са били приети " "за непроменени" -#: builtin/update-index.c:778 +#: builtin/update-index.c:779 msgid "<mode>,<object>,<path>" msgstr "РЕЖИМ,ОБЕКТ,ПЪТ" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "add the specified entry to the index" msgstr "добавяне на изброените обекти към индекса" -#: builtin/update-index.c:783 +#: builtin/update-index.c:784 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "override the executable bit of the listed files" msgstr "изрично задаване на стойността на флага дали файлът е изпълним" -#: builtin/update-index.c:788 +#: builtin/update-index.c:789 msgid "mark files as \"not changing\"" msgstr "задаване на флаг, че файлът не се променя" -#: builtin/update-index.c:791 +#: builtin/update-index.c:792 msgid "clear assumed-unchanged bit" msgstr "изчистване на флага, че файлът не се променя" -#: builtin/update-index.c:794 +#: builtin/update-index.c:795 msgid "mark files as \"index-only\"" msgstr "задаване на флаг, че файловете са само за индекса" -#: builtin/update-index.c:797 +#: builtin/update-index.c:798 msgid "clear skip-worktree bit" msgstr "изчистване на флага, че файловете са само за индекса" -#: builtin/update-index.c:800 +#: builtin/update-index.c:801 msgid "add to index only; do not add content to object database" msgstr "добавяне само към индекса без добавяне към базата от данни за обектите" -#: builtin/update-index.c:802 +#: builtin/update-index.c:803 msgid "remove named paths even if present in worktree" msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво" -#: builtin/update-index.c:804 +#: builtin/update-index.c:805 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" "при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия " "байт" -#: builtin/update-index.c:806 +#: builtin/update-index.c:807 msgid "read list of paths to be updated from standard input" msgstr "изчитане на списъка с пътища за обновяване от стандартния вход" -#: builtin/update-index.c:810 +#: builtin/update-index.c:811 msgid "add entries from standard input to the index" msgstr "добавяне на елементите от стандартния вход към индекса" -#: builtin/update-index.c:814 +#: builtin/update-index.c:815 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "възстановяване на състоянието преди сливане или нужда от обновяване за " "изброените пътища" -#: builtin/update-index.c:818 +#: builtin/update-index.c:819 msgid "only update entries that differ from HEAD" msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“" -#: builtin/update-index.c:822 +#: builtin/update-index.c:823 msgid "ignore files missing from worktree" msgstr "игнориране на файловете, които липсват в работното дърво" -#: builtin/update-index.c:825 +#: builtin/update-index.c:826 msgid "report actions to standard output" msgstr "извеждане на действията на стандартния изход" -#: builtin/update-index.c:827 +#: builtin/update-index.c:828 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "забравяне на записаната информация за неразрешени конфликти — за командите " "от потребителско ниво" -#: builtin/update-index.c:831 +#: builtin/update-index.c:832 msgid "write index in this format" msgstr "записване на индекса в този формат" -#: builtin/update-index.c:833 +#: builtin/update-index.c:834 msgid "enable or disable split index" msgstr "включване или изключване на разделянето на индекса" @@ -10207,21 +10421,21 @@ msgstr "git update-ref [ОПЦИЯ…] ИМЕ_НА_УКАЗАТЕЛ НОВА_С msgid "git update-ref [options] --stdin [-z]" msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]" -#: builtin/update-ref.c:350 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "изтриване на указателя" -#: builtin/update-ref.c:352 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "обновяване на ИМЕто_НА_УКАЗАТЕЛя, а не това, към което сочи" -#: builtin/update-ref.c:353 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "" "някои от елементите подадени на стандартния вход завършват с нулевия знак " "„NUL“" -#: builtin/update-ref.c:354 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "изчитане на указателите от стандартния вход" @@ -10241,15 +10455,15 @@ msgstr "git verify-tag [-v|--verbose] ПОДАВАНЕ…" msgid "print commit contents" msgstr "извеждане на съдържанието на подаването" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:54 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] ПАКЕТ…" -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:64 msgid "verbose" msgstr "извеждане на подробна информация" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:66 msgid "show statistics only" msgstr "извеждане само на статистиката" @@ -10277,9 +10491,13 @@ msgstr "запис на обект-дърво за поддиректорият msgid "only useful for debugging" msgstr "само за изчистване на грешки" +#: credential-cache--daemon.c:267 +msgid "print debugging messages to stderr" +msgstr "извеждане на съобщенията за трасиране на стандартната грешка" + #: git.c:17 msgid "" -"'git help -a' and 'git help -g' lists available subcommands and some\n" +"'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" @@ -10289,27 +10507,6 @@ msgstr "" "за\n" "някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“." -#: parse-options.h:143 -msgid "expiry-date" -msgstr "период на валидност/запазване" - -#: parse-options.h:158 -msgid "no-op (backward compatibility)" -msgstr "нулева операция (за съвместимост с предишни версии)" - -#: parse-options.h:232 -msgid "be more verbose" -msgstr "повече подробности" - -#: parse-options.h:234 -msgid "be more quiet" -msgstr "по-малко подробности" - -# FIXME SHA-1 -> SHA1 -#: parse-options.h:240 -msgid "use <n> digits to display SHA-1s" -msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1" - #: common-cmds.h:8 msgid "Add file contents to the index" msgstr "Добавяне на съдържанието на файла към индекса" @@ -10396,6 +10593,33 @@ msgstr "Извеждане на състоянието на работното msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG" +#: parse-options.h:143 +msgid "expiry-date" +msgstr "период на валидност/запазване" + +#: parse-options.h:158 +msgid "no-op (backward compatibility)" +msgstr "нулева операция (за съвместимост с предишни версии)" + +#: parse-options.h:232 +msgid "be more verbose" +msgstr "повече подробности" + +#: parse-options.h:234 +msgid "be more quiet" +msgstr "по-малко подробности" + +# FIXME SHA-1 -> SHA1 +#: parse-options.h:240 +msgid "use <n> digits to display SHA-1s" +msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1" + +#: rerere.h:27 +msgid "update the index with reused conflict resolution if possible" +msgstr "" +"при възможност преизползване на решението на конфликта за обновяване на " +"индекса" + #: git-am.sh:52 msgid "You need to set your committer info first" msgstr "Първо трябва да зададете информация за себе си" @@ -10672,22 +10896,22 @@ msgstr "Да се продължи ли? „Y“ — ДА, „n“ — не" # FIXME me? #: git-bisect.sh:289 msgid "" -"You need to give me at least one good and one bad revisions.\n" +"You need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" -"Трябва да зададете поне една добра и една лоша версия. Това може да се\n" -"направи съответно и чрез командите „git bisect bad“ и „git bisect good“." +"Трябва да зададете поне една добра и една лоша версия. (Това може да се\n" +"направи съответно и чрез командите „git bisect bad“ и „git bisect good“.)" # FIXME me #: git-bisect.sh:292 msgid "" "You need to start by \"git bisect start\".\n" -"You then need to give me at least one good and one bad revisions.\n" +"You then need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Трябва да започнете двоичното търсене чрез командата „git bisect start“.\n" -"трябва да зададете поне една добра и една лоша версия. Това може да се\n" -"направи съответно и чрез командите „git bisect bad“ и „git bisect good“." +"трябва да зададете поне една добра и една лоша версия. (Това може да се\n" +"направи съответно и чрез командите „git bisect bad“ и „git bisect good“.)" #: git-bisect.sh:363 git-bisect.sh:490 msgid "We are not bisecting." @@ -10761,21 +10985,28 @@ msgstr "успешно двоично търсене" 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, or use 'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" "Невъзможно е да издърпвате в момента, защото някои файлове не са слети. " "Трябва\n" "да ги прегледате, коригирате, ако е необходимо и да ги добавите или извадите " "от\n" -"индекса с командата „git add/rm ФАЙЛ“. Ако всичко е наред, можете да " -"ползвате и\n" -"командата „git commit -a“." +"индекса с командата „git add/rm ФАЙЛ“, след което трябва да подадете " +"промените." #: git-pull.sh:25 msgid "Pull is not possible because you have unmerged files." msgstr "" "Невъзможно е да издърпвате в момента, защото някои файлове не са слети." +#: git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n" +"Подайте промените си, преди да започнете ново сливане." + #: git-pull.sh:245 msgid "updating an unborn branch with changes added to the index" msgstr "обновяване на все още несъздаден клон с промените от индекса" @@ -11041,7 +11272,7 @@ msgstr "Указани са прекалено много версии: „$REV #: git-stash.sh:397 #, sh-format -msgid "$reference is not valid reference" +msgid "$reference is not a valid reference" msgstr "Указателят „$reference“ е грешен" #: git-stash.sh:425 @@ -11090,11 +11321,11 @@ msgstr "Изтрито е скатаното „${REV}“ ($s)" msgid "${REV}: Could not drop stash entry" msgstr "Скатаното „${REV}“ не може да бъде изтрито" -#: git-stash.sh:538 +#: git-stash.sh:539 msgid "No branch name specified" msgstr "Не е указано име на клон" -#: git-stash.sh:610 +#: git-stash.sh:611 msgid "(To restore them type \"git stash apply\")" msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)" @@ -11417,3 +11648,33 @@ msgstr "Неуспешна обработка на поддиректориит #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Синхронизиране на адреса за пътя към подмодул „$displaypath“" + +#~ msgid "Failed to lock ref for update" +#~ msgstr "Указателят не може да бъде заключен, за да бъде обновен" + +#~ msgid "Failed to write ref" +#~ msgstr "Указателят не може да бъде записан" + +#~ msgid "Failed to lock HEAD during fast_forward_to" +#~ msgstr "Указателят „HEAD“ не може да бъде заключен при тривиално сливане" + +#~ msgid "invalid commit: %s" +#~ msgstr "неправилно подаване: %s" + +#~ msgid "cannot lock HEAD ref" +#~ msgstr "указателят към върха „HEAD“ не може да бъде заключен" + +#~ msgid "cannot update HEAD ref" +#~ msgstr "указателят към върха „HEAD“ не може да бъде обновен" + +#~ msgid "Invalid %s: '%s'" +#~ msgstr "Неправилна стойност за „%s“: „%s“" + +#~ msgid "cannot tell cwd" +#~ msgstr "текущата директория не може да бъде определена" + +#~ msgid "%s: cannot lock the ref" +#~ msgstr "указателят „%s“ не може да бъде заключен" + +#~ msgid "%s: cannot update the ref" +#~ msgstr "указателят „%s“ не може да бъде обновен" @@ -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: 2014-08-04 14:48+0800\n" -"PO-Revision-Date: 2014-08-22 20:10-0700\n" +"POT-Creation-Date: 2014-11-20 09:42+0800\n" +"PO-Revision-Date: 2014-11-20 16:10+0800\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.5.4\n" +"X-Generator: Poedit 1.6.10\n" #: advice.c:55 #, c-format @@ -26,193 +26,191 @@ msgstr "indirecta: %.*s\n" #: advice.c:88 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, or use\n" -"'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" -"Arregleu-los en l'arbre de treball, i després utilitzeu\n" -"'git add/rm <fitxer>' segons sigui apropiat per marcar la\n" -"resolució i feu una comissió, o utilitzeu 'git commit -a'." +"Arregleu-los en l'arbre de treball, i després useu\n" +"'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n" +"resolució i feu una comissió." -#: archive.c:10 +#: archive.c:11 msgid "git archive [options] <tree-ish> [<path>...]" msgstr "git archive [opcions] <arbre> [<ruta>...]" -#: archive.c:11 +#: archive.c:12 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:12 +#: archive.c:13 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <repositori> [--exec <ordre>] [opcions] <arbre> " -"[<ruta>...]" +"git archive --remote <dipòsit> [--exec <ordre>] [opcions] <arbre> [<ruta>...]" -#: archive.c:13 +#: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" -msgstr "git archive --remote <repositori> [--exec <ordre>] --list" +msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list" -#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "L'especificació de ruta '%s' no ha concordat amb cap fitxer" -#: archive.c:328 +#: archive.c:419 msgid "fmt" msgstr "format" -#: archive.c:328 +#: archive.c:419 msgid "archive format" msgstr "format d'arxiu" -#: archive.c:329 builtin/log.c:1201 +#: archive.c:420 builtin/log.c:1204 msgid "prefix" msgstr "prefix" -#: archive.c:330 +#: archive.c:421 msgid "prepend prefix to each pathname in the archive" msgstr "anteposa el prefix a cada nom de ruta en l'arxiu" -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709 -#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412 -#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151 +#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411 +#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "fitxer" -#: archive.c:332 builtin/archive.c:89 +#: archive.c:423 builtin/archive.c:89 msgid "write the archive to this file" msgstr "escriu l'arxiu a aquest fitxer" -#: archive.c:334 +#: archive.c:425 msgid "read .gitattributes in working directory" msgstr "llegeix .gitattributes en el directori de treball" -#: archive.c:335 +#: archive.c:426 msgid "report archived files on stderr" msgstr "informa de fitxers arxivats en stderr" -#: archive.c:336 +#: archive.c:427 msgid "store only" msgstr "només emmagatzemar" -#: archive.c:337 +#: archive.c:428 msgid "compress faster" msgstr "comprimeix més ràpid" -#: archive.c:345 +#: archive.c:436 msgid "compress better" msgstr "comprimeix millor" -#: archive.c:348 +#: archive.c:439 msgid "list supported archive formats" msgstr "allista els formats d'arxiu suportats" -#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 +#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85 msgid "repo" -msgstr "repositori" +msgstr "dipòsit" -#: archive.c:351 builtin/archive.c:91 +#: archive.c:442 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" -msgstr "recupera l'arxiu del repositori remot <repositori>" +msgstr "recupera l'arxiu del dipòsit remot <dipòsit>" -#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 +#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490 msgid "command" msgstr "ordre" -#: archive.c:353 builtin/archive.c:93 +#: archive.c:444 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "ruta a l'ordre git-upload-archive remot" -#: attr.c:259 +#: attr.c:258 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" "Els patrons negatius s'ignoren en els atributes de git\n" -"Utilitzeu '\\!' per exclamació capdavantera literal." +"Useu '\\!' per exclamació capdavantera literal." #: branch.c:60 #, c-format msgid "Not setting branch %s as its own upstream." -msgstr "No establint la rama %s com la seva pròpia font." +msgstr "No establint la rama %s com a la seva pròpia font." #: branch.c:83 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." msgstr "" -"La rama %s està configurada per seguir la rama remota %s de %s per rebasar." +"La rama %s està configurada per a seguir la rama remota %s de %s per rebasar." #: branch.c:84 #, c-format msgid "Branch %s set up to track remote branch %s from %s." -msgstr "La rama %s està configurada per seguir la rama remota %s de %s." +msgstr "La rama %s està configurada per a seguir la rama remota %s de %s." #: branch.c:88 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." -msgstr "La rama %s està configurada per seguir la rama local %s per rebasar." +msgstr "La rama %s està configurada per a seguir la rama local %s per rebasar." #: branch.c:89 #, c-format msgid "Branch %s set up to track local branch %s." -msgstr "La rama %s està configurada per seguir la rama local %s." +msgstr "La rama %s està configurada per a seguir la rama local %s." #: branch.c:94 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "" -"La rama %s està configurada per seguir la referència remota %s per rebasar." +"La rama %s està configurada per a seguir la referència remota %s per rebasar." #: branch.c:95 #, c-format msgid "Branch %s set up to track remote ref %s." -msgstr "La rama %s està configurada per seguir la referència remota %s." +msgstr "La rama %s està configurada per a seguir la referència remota %s." #: branch.c:99 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "" -"La rama %s està configurada per seguir la referència local %s per rebasar." +"La rama %s està configurada per a seguir la referència local %s per rebasar." #: branch.c:100 #, c-format msgid "Branch %s set up to track local ref %s." -msgstr "La rama %s està configurada per seguir la referència local %s." +msgstr "La rama %s està configurada per a seguir la referència local %s." #: branch.c:133 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "No seguint: informació ambigua per a la referència %s" -#: branch.c:178 +#: branch.c:162 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' no és un nom de rama vàlid." -#: branch.c:183 +#: branch.c:167 #, c-format msgid "A branch named '%s' already exists." msgstr "Una rama amb nom '%s' ja existeix." -#: branch.c:191 +#: branch.c:175 msgid "Cannot force update the current branch." msgstr "No es pot actualitzar la rama actual a la força." -#: branch.c:211 +#: branch.c:195 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -"No es pot configurar la informació de seguimiento; el punt inicial '%s' no " -"és una rama." +"No es pot configurar la informació de seguiment; el punt inicial '%s' no és " +"una rama." -#: branch.c:213 +#: branch.c:197 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la rama font demanada '%s' no existeix" -#: branch.c:215 +#: branch.c:199 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -226,114 +224,112 @@ msgstr "" "\n" "Si planeu basar el teu treball en una rama font que ja\n" "existeix al remot, pot que necessiteu executar\n" -"\"git fetch\" per obtenir-la.\n" +"\"git fetch\" per a obtenir-la.\n" "\n" "Si planeu pujar una rama local nova que seguirà la seva\n" -"contrapart remota, pot que voleu utilitzar\n" +"contrapart remota, pot que voleu usar\n" "\"git push -u\" per establir la configuració font mentre\n" "pugeu." -#: branch.c:260 +#: branch.c:243 #, c-format msgid "Not a valid object name: '%s'." msgstr "No és un nom d'objecte vàlid: '%s'." -#: branch.c:280 +#: branch.c:263 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nom d'objecte ambigu: '%s'." -#: branch.c:285 +#: branch.c:268 #, c-format msgid "Not a valid branch point: '%s'." msgstr "No és un punt de ramificació vàlid: '%s'." -#: branch.c:291 -msgid "Failed to lock ref for update" -msgstr "S'ha fallat al bloquejar la referència per actualització" - -#: branch.c:309 -msgid "Failed to write ref" -msgstr "S'ha fallat al escriure la referència" - -#: bundle.c:33 +#: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' no sembla a un fitxer d'embolic v2" -#: bundle.c:60 +#: bundle.c:61 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "capçalera no reconeguda: %s%s (%d)" -#: bundle.c:86 builtin/commit.c:755 +#: bundle.c:87 builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "no s'ha pogut obrir '%s'" -#: bundle.c:138 +#: bundle.c:139 msgid "Repository lacks these prerequisite commits:" -msgstr "Al repositori manquen aquestes comissions prerequisits:" +msgstr "Al dipòsit li manquen aquestes comissions prerequisits:" -#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330 -#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357 +#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706 +#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "la configuració del passeig per revisions ha fallat" -#: bundle.c:184 +#: bundle.c:185 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "L'embolic conté aquesta referència:" msgstr[1] "L'embolic conté aquestes %d referències:" -#: bundle.c:191 +#: bundle.c:192 msgid "The bundle records a complete history." msgstr "L'embolic registra una història completa." -#: bundle.c:193 +#: bundle.c:194 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "L'embolic requereix aquesta referència:" msgstr[1] "L'embolic requereix aquestes %d referències:" -#: bundle.c:289 +#: bundle.c:251 +msgid "Could not spawn pack-objects" +msgstr "No s'ha pogut executar el pack-objects" + +#: bundle.c:269 +msgid "pack-objects died" +msgstr "El pack-objects s'ha mort" + +#: bundle.c:309 msgid "rev-list died" msgstr "El rev-list s'ha mort" -#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261 +#: bundle.c:358 #, c-format -msgid "unrecognized argument: %s" -msgstr "paràmetre no reconegut: %s" +msgid "ref '%s' is excluded by the rev-list options" +msgstr "les opcions de la llista de revisions exclouen la referència '%s'" -#: bundle.c:330 +#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format -msgid "ref '%s' is excluded by the rev-list options" -msgstr "la referència '%s' s'exclou per les opcions de rev-list" +msgid "unrecognized argument: %s" +msgstr "paràmetre no reconegut: %s" -#: bundle.c:375 +#: bundle.c:444 msgid "Refusing to create empty bundle." msgstr "Refusant crear un embolic buit." -#: bundle.c:390 -msgid "Could not spawn pack-objects" -msgstr "No s'ha pogut executar el pack-objects" - -#: bundle.c:408 -msgid "pack-objects died" -msgstr "El pack-objects s'ha mort" - -#: bundle.c:411 +#: bundle.c:454 #, c-format msgid "cannot create '%s'" msgstr "no es pot crear '%s'" -#: bundle.c:433 +#: bundle.c:475 msgid "index-pack died" msgstr "L'index-pack s'ha mort" +#: color.c:157 +#, c-format +msgid "invalid color value: %.*s" +msgstr "valor de color invàlid: %.*s" + #: commit.c:40 #, c-format msgid "could not parse %s" @@ -348,19 +344,73 @@ msgstr "%s %s no és una comissió!" msgid "memory exhausted" msgstr "memòria esgotada" -#: connected.c:70 +#: config.c:469 config.c:471 +#, c-format +msgid "bad config file line %d in %s" +msgstr "línia de fitxer de configuració dolenta %d en %s" + +#: config.c:587 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "valor de configuració numèrica dolent '%s' per '%s' en %s: %s" + +#: config.c:589 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "valor de configuració numèrica dolent '%s' per '%s': %s" + +#: config.c:674 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "s'ha fallat en expandir el directori d'usuari en '%s'" + +#: config.c:752 config.c:763 +#, c-format +msgid "bad zlib compression level %d" +msgstr "nivell de compressió de zlib dolent %d" + +#: config.c:885 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "mode de creació d'objecte invàlid: %s" + +#: config.c:1201 +msgid "unable to parse command-line config" +msgstr "incapaç de analitzar la configuració de la línia d'ordres" + +#: config.c:1262 +msgid "unknown error occured while reading the configuration files" +msgstr "" +"s'ha ocorregut un error desconegut en llegir els fitxers de configuració" + +#: config.c:1586 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "incapaç d'analitzar '%s' de la configuració de la línia d'ordres" + +#: config.c:1588 +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "variable de configuració dolent '%s' en el fitxer '%s' a la línia %d" + +#: config.c:1647 +#, c-format +msgid "%s has multiple values" +msgstr "%s té múltiples valors" + +#: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "No s'ha pogut executar 'git rev-list'" -#: connected.c:90 +#: connected.c:89 #, c-format msgid "failed write to rev-list: %s" msgstr "escriptura fallada al rev-list: %s" -#: connected.c:98 +#: connected.c:97 #, c-format msgid "failed to close rev-list's stdin: %s" -msgstr "s'ha fallat al tancar el stdin del rev-list: %s" +msgstr "s'ha fallat en tancar l'stdin del rev-list: %s" #: date.c:95 msgid "in the future" @@ -433,16 +483,16 @@ msgstr[1] "fa %lu anys" #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" -msgstr "s'ha fallat al llegir el fitxer d'ordres '%s'" +msgstr "s'ha fallat en llegir el fitxer d'ordres '%s'" -#: diffcore-rename.c:514 +#: diffcore-rename.c:516 msgid "Performing inexact rename detection" -msgstr "Realitzant detecció inexacte de canvi de nom" +msgstr "Realitzant detecció inexacte de canvis de nom" #: diff.c:114 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr " S'ha fallat al analitzar el percentatge limitant de dirstat '%s'\n" +msgstr " S'ha fallat en analitzar el percentatge limitant de dirstat '%s'\n" #: diff.c:119 #, c-format @@ -455,7 +505,7 @@ msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valor desconegut del variable de configuració de 'diff.submodule': '%s'" -#: diff.c:267 +#: diff.c:266 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -464,65 +514,65 @@ msgstr "" "Errors trobat en el variable de configuració 'diff.dirstat':\n" "%s" -#: diff.c:2934 +#: diff.c:2957 #, c-format msgid "external diff died, stopping at %s" msgstr "El diff external s'ha mort, aturant a %s" -#: diff.c:3329 +#: diff.c:3352 msgid "--follow requires exactly one pathspec" msgstr "--follow requereix exactament una especificació de ruta" -#: diff.c:3492 +#: diff.c:3515 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -"S'ha fallat al analitzar el paràmetre d'opció de --dirstat/-X:\n" +"S'ha fallat en analitzar el paràmetre d'opció de --dirstat/-X:\n" "%s" -#: diff.c:3506 +#: diff.c:3529 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" -msgstr "S'ha fallat al analitzar el paràmetre d'opció de --submodule: %s" +msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: %s" -#: gpg-interface.c:73 gpg-interface.c:145 +#: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "no s'ha pogut executar el gpg." -#: gpg-interface.c:85 +#: gpg-interface.c:141 msgid "gpg did not accept the data" msgstr "El gpg no ha acceptat les dades" -#: gpg-interface.c:96 +#: gpg-interface.c:152 msgid "gpg failed to sign the data" -msgstr "gpg ha fallat al firmar les dades" +msgstr "gpg ha fallat en firmar les dades" -#: gpg-interface.c:129 +#: gpg-interface.c:185 #, c-format msgid "could not create temporary file '%s': %s" msgstr "no s'ha pogut crear el fitxer temporal '%s': %s" -#: gpg-interface.c:132 +#: gpg-interface.c:188 #, c-format msgid "failed writing detached signature to '%s': %s" -msgstr "s'ha fallat al escriure la firma separada a '%s': %s" +msgstr "s'ha fallat en escriure la firma separada a '%s': %s" -#: grep.c:1703 +#: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': incapaç de llegir %s" -#: grep.c:1720 +#: grep.c:1735 #, c-format msgid "'%s': %s" msgstr "'%s': %s" -#: grep.c:1731 +#: grep.c:1746 #, c-format msgid "'%s': short read %s" -msgstr "'%s': lectura corta %s" +msgstr "'%s': lectura curta %s" #: help.c:207 #, c-format @@ -535,7 +585,7 @@ msgstr "ordres de git disponibles d'altres llocs en la vostra $PATH" #: help.c:230 msgid "The most commonly used git commands are:" -msgstr "Els ordres de git més freqüentment utilitzats són:" +msgstr "Els ordres de git més freqüentment usats són:" #: help.c:289 #, c-format @@ -588,87 +638,95 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: merge.c:40 +#: lockfile.c:275 +msgid "BUG: reopen a lockfile that is still open" +msgstr "BUG: reobrir un fitxer de bloqueig que encara està obert" + +#: lockfile.c:277 +msgid "BUG: reopen a lockfile that has been committed" +msgstr "BUG: reobrir un fitxer de bloqueig que s'ha comès" + +#: merge.c:41 msgid "failed to read the cache" -msgstr "s'ha fallat al llegir la memòria cau" +msgstr "s'ha fallat en llegir la memòria cau" -#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556 -#: builtin/clone.c:661 +#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562 +#: builtin/clone.c:659 msgid "unable to write new index file" -msgstr "incapaç d'escriure un nou fitxer d'índex" +msgstr "incapaç d'escriure un fitxer d'índex nou" -#: merge-recursive.c:190 +#: merge-recursive.c:189 #, c-format msgid "(bad commit)\n" msgstr "(comissió dolenta)\n" -#: merge-recursive.c:210 +#: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache ha fallat per a la ruta '%s'" -#: merge-recursive.c:271 +#: merge-recursive.c:270 msgid "error building trees" -msgstr "error al construir arbres" +msgstr "error en construir arbres" -#: merge-recursive.c:692 +#: merge-recursive.c:691 #, c-format msgid "failed to create path '%s'%s" -msgstr "s'ha fallat al crear la ruta '%s' %s" +msgstr "s'ha fallat en crear la ruta '%s' %s" -#: merge-recursive.c:703 +#: merge-recursive.c:702 #, c-format msgid "Removing %s to make room for subdirectory\n" -msgstr "Traient %s per fer espai per al subdirectori\n" +msgstr "Traient %s per a fer espai per al subdirectori\n" -#: merge-recursive.c:717 merge-recursive.c:738 +#: merge-recursive.c:716 merge-recursive.c:737 msgid ": perhaps a D/F conflict?" msgstr ": potser un conflicte D/F?" -#: merge-recursive.c:728 +#: merge-recursive.c:727 #, c-format msgid "refusing to lose untracked file at '%s'" -msgstr "refusant perdre el fitxer seguit a '%s'" +msgstr "refusant perdre el fitxer no seguit a '%s'" -#: merge-recursive.c:768 +#: merge-recursive.c:767 #, c-format msgid "cannot read object %s '%s'" msgstr "no es pot llegir l'objecte %s '%s'" -#: merge-recursive.c:770 +#: merge-recursive.c:769 #, c-format msgid "blob expected for %s '%s'" msgstr "blob esperat per a %s '%s'" -#: merge-recursive.c:793 builtin/clone.c:317 +#: merge-recursive.c:792 builtin/clone.c:318 #, c-format msgid "failed to open '%s'" -msgstr "s'ha fallat al obrir '%s'" +msgstr "s'ha fallat en obrir '%s'" -#: merge-recursive.c:801 +#: merge-recursive.c:800 #, c-format msgid "failed to symlink '%s'" -msgstr "s'ha fallat al fer l'enllaç simbòlic '%s'" +msgstr "s'ha fallat en fer l'enllaç simbòlic '%s'" -#: merge-recursive.c:804 +#: merge-recursive.c:803 #, 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:942 +#: merge-recursive.c:941 msgid "Failed to execute internal merge" -msgstr "S'ha fallat al executar la fusió interna" +msgstr "S'ha fallat en executar la fusió interna" -#: merge-recursive.c:946 +#: merge-recursive.c:945 #, c-format msgid "Unable to add %s to database" -msgstr "Incapaç d'afegir %s al base de dades" +msgstr "Incapaç d'afegir %s a la base de dades" -#: merge-recursive.c:962 +#: merge-recursive.c:961 msgid "unsupported object type in the tree" msgstr "tipus d'objecte no suportat en l'arbre" -#: merge-recursive.c:1037 merge-recursive.c:1051 +#: merge-recursive.c:1036 merge-recursive.c:1050 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -677,7 +735,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:1043 merge-recursive.c:1056 +#: merge-recursive.c:1042 merge-recursive.c:1055 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -686,20 +744,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:1097 +#: merge-recursive.c:1096 msgid "rename" msgstr "canvia de nom" -#: merge-recursive.c:1097 +#: merge-recursive.c:1096 msgid "renamed" msgstr "canviat de nom" -#: merge-recursive.c:1153 +#: merge-recursive.c:1152 #, c-format msgid "%s is a directory in %s adding as %s instead" -msgstr "%s és un directori en %s; afegint com %s en lloc" +msgstr "%s és un directori en %s; afegint com a %s en lloc" -#: merge-recursive.c:1175 +#: merge-recursive.c:1174 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -708,151 +766,152 @@ msgstr "" "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la " "rama \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s" -#: merge-recursive.c:1180 +#: merge-recursive.c:1179 msgid " (left unresolved)" msgstr " (deixat sense resolució)" -#: merge-recursive.c:1234 +#: merge-recursive.c:1233 #, 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:1264 +#: merge-recursive.c:1263 #, 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" -#: merge-recursive.c:1463 +#: merge-recursive.c:1462 #, 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:1473 +#: merge-recursive.c:1472 #, c-format msgid "Adding merged %s" msgstr "Afegint %s fusionat" -#: merge-recursive.c:1478 merge-recursive.c:1676 +#: merge-recursive.c:1477 merge-recursive.c:1675 #, c-format msgid "Adding as %s instead" -msgstr "Afegint com %s en lloc" +msgstr "Afegint com a %s en lloc" -#: merge-recursive.c:1529 +#: merge-recursive.c:1528 #, c-format msgid "cannot read object %s" msgstr "no es pot llegir l'objecte %s" -#: merge-recursive.c:1532 +#: merge-recursive.c:1531 #, c-format msgid "object %s is not a blob" msgstr "L'objecte %s no és un blob" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modify" msgstr "modifica" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modified" msgstr "modificat" -#: merge-recursive.c:1590 +#: merge-recursive.c:1589 msgid "content" msgstr "contingut" -#: merge-recursive.c:1597 +#: merge-recursive.c:1596 msgid "add/add" -msgstr "afegeix/afegeix" +msgstr "afegiment/afegiment" -#: merge-recursive.c:1631 +#: merge-recursive.c:1630 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s saltat (el fusionat és igual a l'existent)" -#: merge-recursive.c:1645 +#: merge-recursive.c:1644 #, c-format msgid "Auto-merging %s" msgstr "Autofusionant %s" -#: merge-recursive.c:1649 git-submodule.sh:1150 +#: merge-recursive.c:1648 git-submodule.sh:1150 msgid "submodule" msgstr "submòdul" -#: merge-recursive.c:1650 +#: merge-recursive.c:1649 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTE (%s): Conflicte de fusió en %s" -#: merge-recursive.c:1740 +#: merge-recursive.c:1735 #, c-format msgid "Removing %s" msgstr "Traient %s" -#: merge-recursive.c:1765 +#: merge-recursive.c:1760 msgid "file/directory" msgstr "fitxer/directori" -#: merge-recursive.c:1771 +#: merge-recursive.c:1766 msgid "directory/file" msgstr "directori/fitxer" -#: merge-recursive.c:1776 +#: merge-recursive.c:1771 #, 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 %s" +msgstr "" +"CONFLICTE (%s=: Hi ha un directori amb nom %s en %s. Afegint %s com a %s" -#: merge-recursive.c:1786 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Afegint %s" -#: merge-recursive.c:1803 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Fallat de fusió fatal; això no ha de passar." -#: merge-recursive.c:1822 +#: merge-recursive.c:1817 msgid "Already up-to-date!" -msgstr "Ja actualitzat!" +msgstr "Ja al dia!" -#: merge-recursive.c:1831 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "la fusió dels arbres %s i %s ha fallat" -#: merge-recursive.c:1861 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "Ruta no processat??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "Fusionant:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" -msgstr[0] "%u avantpassat trobat:" -msgstr[1] "%u avantpassats trobats:" +msgstr[0] "s'ha trobat %u avantpassat:" +msgstr[1] "s'han trobat %u avantpassats:" -#: merge-recursive.c:1956 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "la fusió no ha retornat cap comissió" -#: merge-recursive.c:2013 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "No s'ha pogut analitzar l'objecte '%s'" -#: merge-recursive.c:2024 builtin/merge.c:666 +#: merge-recursive.c:2019 builtin/merge.c:666 msgid "Unable to write index." msgstr "Incapaç d'escriure l'índex." #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "No es pot cometre un arbre de notes no inicialitzat/no referenciat" +msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat" #: notes-utils.c:83 #, c-format @@ -871,33 +930,33 @@ msgstr "Refusant reescriure les notes en %s (fora de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Valor dolent de %s: '%s'" -#: object.c:234 +#: object.c:241 #, c-format msgid "unable to parse object: %s" msgstr "incapaç d'analitzar l'objecte: %s" -#: parse-options.c:534 +#: parse-options.c:546 msgid "..." msgstr "..." -#: parse-options.c:552 +#: parse-options.c:564 #, c-format msgid "usage: %s" msgstr "ús: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:556 +#: parse-options.c:568 #, c-format msgid " or: %s" msgstr " o: %s" -#: parse-options.c:559 +#: parse-options.c:571 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:593 +#: parse-options.c:605 msgid "-NUM" msgstr "-NUM" @@ -942,12 +1001,12 @@ msgstr "%s: 'literal' i 'glob' són incompatibles" #: pathspec.c:241 #, c-format msgid "%s: '%s' is outside repository" -msgstr "%s: '%s' està fora del repositori" +msgstr "%s: '%s' és fora del dipòsit" #: pathspec.c:291 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "L'especificació '%s' està en el submòdul '%.*s'" +msgstr "L'especificació '%s' és en el submòdul '%.*s'" #: pathspec.c:353 #, c-format @@ -957,84 +1016,87 @@ msgstr "%s: aquest ordre no suporta la màgica d'especificació de ruta: %s" #: pathspec.c:432 #, c-format msgid "pathspec '%s' is beyond a symbolic link" -msgstr "l'especificació de ruta '%s' està més allà d'un enllaç simbòlic" +msgstr "l'especificació de ruta '%s' és més allà d'un enllaç simbòlic" #: pathspec.c:441 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "" -"No hi ha res que excloure per patrons :(exclusió).\n" +"No hi ha res a excloure per patrons :(exclusió).\n" "Potser heu oblidat afegir o ':/' o '.' ?" +#: pretty.c:968 +msgid "unable to parse --pretty format" +msgstr "incapaç d'analitzar el format --pretty" + #: progress.c:225 msgid "done" msgstr "fet" -#: read-cache.c:1260 +#: read-cache.c:1261 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" "index.version establert, però el valor és invàlid.\n" -"Utilitzant la versió %i" +"Usant la versió %i" -#: read-cache.c:1270 +#: read-cache.c:1271 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" "GIT_INDEX_VERSION establert, però el valor és invàlid.\n" -"Utilitzant la versió %i" +"Usant la versió %i" -#: remote.c:753 +#: remote.c:782 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No és pot obtenir ambdós %s i %s a %s" -#: remote.c:757 +#: remote.c:786 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s generalment segueix %s, no %s" -#: remote.c:761 +#: remote.c:790 #, c-format msgid "%s tracks both %s and %s" msgstr "%s segueix ambdós %s i %s" -#: remote.c:769 +#: remote.c:798 msgid "Internal error" msgstr "Error intern" -#: remote.c:1943 +#: remote.c:1968 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" -msgstr "La teva rama està basada en '%s', però la font no està.\n" +msgstr "La teva rama està basada en '%s', però la font no és.\n" -#: remote.c:1947 +#: remote.c:1972 msgid " (use \"git branch --unset-upstream\" to fixup)\n" -msgstr " (utilitzeu \"git branch --unset-upstream\" per arreglar)\n" +msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n" -#: remote.c:1950 +#: remote.c:1975 #, c-format msgid "Your branch is up-to-date with '%s'.\n" -msgstr "La vostra rama està actualitzada amb '%s'.\n" +msgstr "La vostra rama està al dia amb '%s'.\n" -#: remote.c:1954 +#: remote.c:1979 #, 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 rama està davant de '%s' per %d comissions.\n" msgstr[1] "La vostra rama està davant de '%s' per %d comissions.\n" -#: remote.c:1960 +#: remote.c:1985 msgid " (use \"git push\" to publish your local commits)\n" -msgstr "" -" (utilitzeu \"git push\" per publicar els vostres comissions locals)\n" +msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n" -#: remote.c:1963 +#: remote.c:1988 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1046,11 +1108,11 @@ msgstr[1] "" "La vostra rama està darrere de '%s' per %d comissions, i pot avançar-se " "ràpidament.\n" -#: remote.c:1971 +#: remote.c:1996 msgid " (use \"git pull\" to update your local branch)\n" -msgstr " (utilitzeu \"git pull\" per actualitzar la vostra rama local)\n" +msgstr " (useu \"git pull\" per a actualitzar la vostra rama local)\n" -#: remote.c:1974 +#: remote.c:1999 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1065,114 +1127,118 @@ msgstr[1] "" "La vostra rama i '%s' s'han divergit,\n" "i tenen %d i %d comissions distintes cada una, respectivament.\n" -#: remote.c:1984 +#: remote.c:2009 msgid " (use \"git pull\" to merge the remote branch into yours)\n" -msgstr " (utilitzeu \"git pull\" per fusionar la rama remota a la vostra)\n" +msgstr " (useu \"git pull\" per a fusionar la rama remota a la vostra)\n" -#: run-command.c:80 +#: run-command.c:87 msgid "open /dev/null failed" -msgstr "s'ha fallat al obrir /dev/null" +msgstr "s'ha fallat en obrir /dev/null" -#: run-command.c:82 +#: run-command.c:89 #, c-format msgid "dup2(%d,%d) failed" -msgstr "dup2(%d,%d) s'ha fallat" +msgstr "dup2(%d,%d) ha fallat" -#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893 -#: builtin/merge.c:1003 builtin/merge.c:1013 +#: send-pack.c:265 +msgid "failed to sign the push certificate" +msgstr "s'ha fallat en firmar el certificat de pujada" + +#: send-pack.c:322 +msgid "the receiving end does not support --signed push" +msgstr "el destí rebent no suporta el pujar --signed" + +#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892 +#: builtin/merge.c:1002 builtin/merge.c:1012 #, c-format msgid "Could not open '%s' for writing" msgstr "No s'ha pogut obrir '%s' per a escriptura" -#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785 -#: builtin/merge.c:1005 builtin/merge.c:1018 +#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784 +#: builtin/merge.c:1004 builtin/merge.c:1017 #, c-format msgid "Could not write to '%s'" msgstr "No s'ha pogut escriure al '%s'" -#: sequencer.c:194 +#: sequencer.c:195 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" "després de resoldre els conflictes, marqueu les rutes\n" -"corregides amb 'git add <paths>' o 'git rm <paths>'" +"corregides amb 'git add <rutes>' o 'git rm <rutes>'" -#: sequencer.c:197 +#: sequencer.c:198 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" "després de resoldre els conflictes, marqueu les rutes\n" -"corregides amb 'git add <paths>' o 'git rm <paths>'\n" +"corregides amb 'git add <rutes>' o 'git rm <rutes>'\n" "i cometeu el resultat amb 'git commit'" -#: sequencer.c:210 sequencer.c:841 sequencer.c:924 +#: sequencer.c:211 sequencer.c:852 sequencer.c:935 #, c-format msgid "Could not write to %s" msgstr "No s'ha pogut escriure a %s" -#: sequencer.c:213 +#: sequencer.c:214 #, c-format msgid "Error wrapping up %s" -msgstr "Error terminant %s" +msgstr "Error en terminar %s" -#: sequencer.c:228 +#: sequencer.c:229 msgid "Your local changes would be overwritten by cherry-pick." msgstr "Els vostres canvis locals es sobreescriurien pel recull de cireres." -#: sequencer.c:230 +#: sequencer.c:231 msgid "Your local changes would be overwritten by revert." msgstr "Els vostres canvis locals es sobreescriurien per la reversió." -#: sequencer.c:233 +#: sequencer.c:234 msgid "Commit your changes or stash them to proceed." -msgstr "Cometeu els vostres canvis o emmagatzemeu-los per procedir." - -#: sequencer.c:250 -msgid "Failed to lock HEAD during fast_forward_to" -msgstr "S'ha fallat al bloquejar HEAD durant fast_forward_to" +msgstr "Cometeu els vostres canvis o emmagatzemeu-los per a procedir." #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:293 +#: sequencer.c:304 #, c-format msgid "%s: Unable to write new index file" -msgstr "%s: Incapaç d'escriure un nou fitxer d'índex" +msgstr "%s: Incapaç d'escriure un fitxer d'índex nou" -#: sequencer.c:324 +#: sequencer.c:335 msgid "Could not resolve HEAD commit\n" msgstr "No s'ha pogut resoldre la comissió HEAD\n" -#: sequencer.c:344 +#: sequencer.c:355 msgid "Unable to update cache tree\n" msgstr "Incapaç d'actualitzar l'arbre cau\n" -#: sequencer.c:391 +#: sequencer.c:402 #, c-format msgid "Could not parse commit %s\n" msgstr "No s'ha pogut analitzar la comissió %s\n" -#: sequencer.c:396 +#: sequencer.c:407 #, c-format msgid "Could not parse parent commit %s\n" msgstr "No s'ha pogut analitzar la comissió pare %s\n" -#: sequencer.c:462 +#: sequencer.c:473 msgid "Your index file is unmerged." msgstr "El vostre fitxer d'índex està sense fusionar." -#: sequencer.c:481 +#: sequencer.c:492 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "La comissió %s és una fusió però cap opció -m s'ha donat." -#: sequencer.c:489 +#: sequencer.c:500 #, c-format msgid "Commit %s does not have parent %d" msgstr "La comissió %s no té pare %d" -#: sequencer.c:493 +#: sequencer.c:504 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -1180,158 +1246,158 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:506 +#: sequencer.c:517 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no es pot analitzar la comissió pare %s" -#: sequencer.c:510 +#: sequencer.c:521 #, c-format msgid "Cannot get commit message for %s" msgstr "No es pot obtenir el missatge de comissió de %s" -#: sequencer.c:596 +#: sequencer.c:607 #, c-format msgid "could not revert %s... %s" -msgstr "no s'ha pogut revertir %s... %s" +msgstr "no s'ha pogut revertir %s...%s" -#: sequencer.c:597 +#: sequencer.c:608 #, c-format msgid "could not apply %s... %s" -msgstr "no s'ha pogut aplicar %s... %s" +msgstr "no s'ha pogut aplicar %s...%s" -#: sequencer.c:633 +#: sequencer.c:644 msgid "empty commit set passed" msgstr "conjunt de comissions buit passat" -#: sequencer.c:641 +#: sequencer.c:652 #, c-format msgid "git %s: failed to read the index" -msgstr "git %s: s'ha fallat al llegir l'índex" +msgstr "git %s: s'ha fallat en llegir l'índex" -#: sequencer.c:645 +#: sequencer.c:656 #, c-format msgid "git %s: failed to refresh the index" -msgstr "git %s: s'ha fallat al actualitzar l'índex" +msgstr "git %s: s'ha fallat en actualitzar l'índex" -#: sequencer.c:705 +#: sequencer.c:716 #, c-format msgid "Cannot %s during a %s" msgstr "No es pot %s durant un %s" -#: sequencer.c:727 +#: sequencer.c:738 #, c-format msgid "Could not parse line %d." msgstr "No s'ha pogut analitzar la línia %d." -#: sequencer.c:732 +#: sequencer.c:743 msgid "No commits parsed." msgstr "Cap comissió analitzada." -#: sequencer.c:745 +#: sequencer.c:756 #, c-format msgid "Could not open %s" msgstr "No s'ha pogut obrir %s" -#: sequencer.c:749 +#: sequencer.c:760 #, c-format msgid "Could not read %s." msgstr "No s'ha pogut llegir %s." -#: sequencer.c:756 +#: sequencer.c:767 #, c-format msgid "Unusable instruction sheet: %s" -msgstr "Full d'instruccions inutilitzable: %s" +msgstr "Full d'instruccions inusable: %s" -#: sequencer.c:786 +#: sequencer.c:797 #, c-format msgid "Invalid key: %s" msgstr "Clau invàlid: %s" -#: sequencer.c:789 +#: sequencer.c:800 #, c-format msgid "Invalid value for %s: %s" msgstr "Valor invàlid per a %s: %s" -#: sequencer.c:801 +#: sequencer.c:812 #, c-format msgid "Malformed options sheet: %s" msgstr "Full d'opcions malformat: %s" -#: sequencer.c:822 +#: sequencer.c:833 msgid "a cherry-pick or revert is already in progress" msgstr "un recull de cireres o una reversió ja està en curs" -#: sequencer.c:823 +#: sequencer.c:834 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:827 +#: sequencer.c:838 #, c-format msgid "Could not create sequencer directory %s" msgstr "No s'ha pogut crear el directori de seqüenciador %s" -#: sequencer.c:843 sequencer.c:928 +#: sequencer.c:854 sequencer.c:939 #, c-format msgid "Error wrapping up %s." -msgstr "Error al terminar %s." +msgstr "Error en terminar %s." -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:873 sequencer.c:1009 msgid "no cherry-pick or revert in progress" -msgstr "cap recull de cireres o reversió en curs" +msgstr "ni recull de cireres ni una reversió està en curs" -#: sequencer.c:864 +#: sequencer.c:875 msgid "cannot resolve HEAD" msgstr "no es pot resoldre HEAD" -#: sequencer.c:866 +#: sequencer.c:877 msgid "cannot abort from a branch yet to be born" msgstr "no es pot avortar des d'una rama que encara ha de nàixer" -#: sequencer.c:888 builtin/apply.c:4062 +#: sequencer.c:899 builtin/apply.c:4128 #, c-format msgid "cannot open %s: %s" msgstr "no es pot obrir %s: %s" -#: sequencer.c:891 +#: sequencer.c:902 #, c-format msgid "cannot read %s: %s" msgstr "no es pot llegir %s: %s" -#: sequencer.c:892 +#: sequencer.c:903 msgid "unexpected end of file" msgstr "fin de fitxer inesperat" -#: sequencer.c:898 +#: sequencer.c:909 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "el fitxer HEAD emmagatzemat abans del recull de cirers '%s' és corrupte" -#: sequencer.c:921 +#: sequencer.c:932 #, c-format msgid "Could not format %s." msgstr "No s'ha pogut formatar %s." -#: sequencer.c:1066 +#: sequencer.c:1077 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no es pot recollir com cirera un %s" -#: sequencer.c:1069 +#: sequencer.c:1080 #, c-format msgid "%s: bad revision" msgstr "%s: revisió dolenta" -#: sequencer.c:1103 +#: sequencer.c:1114 msgid "Can't revert as initial commit" -msgstr "No es pot revertir com comissió inicial" +msgstr "No es pot revertir com a comissió inicial" -#: sequencer.c:1104 +#: sequencer.c:1115 msgid "Can't cherry-pick into empty head" msgstr "No es pot recollir cireres en un cap buit" -#: sha1_name.c:439 +#: sha1_name.c:440 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" @@ -1355,24 +1421,24 @@ msgstr "" "suprimiu-les. Desactiva aquest missatge per executar\n" "\"git config advice.objectNameWarning false\"" -#: sha1_name.c:1060 +#: sha1_name.c:1068 msgid "HEAD does not point to a branch" msgstr "HEAD no assenyala cap rama" -#: sha1_name.c:1063 +#: sha1_name.c:1071 #, c-format msgid "No such branch: '%s'" -msgstr "Cap rama així: '%s'" +msgstr "No hi ha tal rama: '%s'" -#: sha1_name.c:1065 +#: sha1_name.c:1073 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Cap font configurada per a la rama '%s'" -#: sha1_name.c:1069 +#: sha1_name.c:1077 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" -msgstr "La rama font '%s' no s'emmagatzema com rama que segueixi al remot" +msgstr "La rama font '%s' no s'emmagatzema com a rama que segueixi al remot" #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" @@ -1399,23 +1465,48 @@ msgstr "No s'ha pogut treure l'entrada de .gitmodules per a %s" msgid "staging updated .gitmodules failed" msgstr "L'allistament del .gitmodules actualitzat ha fallat" -#: submodule.c:1118 builtin/init-db.c:363 +#: submodule.c:1111 builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "No s'ha pogut crear l'enllaç de git %s" -#: submodule.c:1129 +#: submodule.c:1122 #, c-format msgid "Could not set core.worktree in %s" msgstr "No s'ha pogut establir core.worktree en %s" +#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565 +#: trailer.c:569 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "valor desconegut '%s' per a la clau '%s'" + +#: trailer.c:551 trailer.c:556 builtin/remote.c:288 +#, c-format +msgid "more than one %s" +msgstr "més d'un %s" + +#: trailer.c:589 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "fitxa de remolc buida en el remolc '%.*s'" + +#: trailer.c:709 +#, c-format +msgid "could not read input file '%s'" +msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'" + +#: trailer.c:712 +msgid "could not read from stdin" +msgstr "No s'ha pogut llegir des d'stdin" + #: unpack-trees.c:202 msgid "Checking out files" msgstr "Agafant fitxers" #: urlmatch.c:120 msgid "invalid URL scheme name or missing '://' suffix" -msgstr "esquema d'URL invàlida o manca el sufix '://'" +msgstr "l'esquema d'URL és invàlida o li manca el sufix '://'" #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 #, c-format @@ -1428,11 +1519,11 @@ msgstr "manca l'host i l'esquema no és 'file:'" #: urlmatch.c:189 msgid "a 'file:' URL may not have a port number" -msgstr "un URL 'file:' no pot tenir un número de port" +msgstr "un URL 'file:' no pot tenir número de port" #: urlmatch.c:199 msgid "invalid characters in host name" -msgstr "caràcters invàlids en nom de host" +msgstr "hi ha caràcters invàlids en el nom de host" #: urlmatch.c:244 urlmatch.c:255 msgid "invalid port number" @@ -1442,24 +1533,28 @@ msgstr "número de port invàlid" msgid "invalid '..' path segment" msgstr "segment de ruta '..' invàlid" -#: wrapper.c:460 +#: wrapper.c:509 #, c-format msgid "unable to access '%s': %s" msgstr "incapaç d'accedir a '%s': %s" -#: wrapper.c:481 +#: wrapper.c:530 #, c-format msgid "unable to access '%s'" msgstr "incapaç d'accedir a '%s'" -#: wrapper.c:492 +#: wrapper.c:541 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "incapaç de trobar l'usuari actual en el fitxer passwd: %s" -#: wrapper.c:493 +#: wrapper.c:542 msgid "no such user" -msgstr "cap usuari així" +msgstr "no hi ha tal usuari" + +#: wrapper.c:550 +msgid "unable to get current working directory" +msgstr "incapaç d'obtenir el directori de treball actual" #: wt-status.c:150 msgid "Unmerged paths:" @@ -1468,29 +1563,29 @@ msgstr "Rutes sense fusionar:" #: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr " (utilitzeu \"git reset %s <fitxer>...\" per desallistar)" +msgstr " (useu \"git reset %s <fitxer>...\" per a desallistar)" #: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr " (utilitzeu \"git rm --cached <fitxer>...\" per desallistar)" +msgstr " (useu \"git rm --cached <fitxer>...\" per a desallistar)" #: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" -msgstr " (utilitzeu \"git add <file>...\" per senyalar resolució)" +msgstr " (useu \"git add <fitxer>...\" per a senyalar resolució)" #: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -" (utilitzeu \"git add/rm <file>...\" segons sigui apropiat per senyalar " +" (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar " "resolució)" #: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" -msgstr " (utilitzeu \"git rm <file>...\" per senyalar resolució)" +msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)" #: wt-status.c:198 msgid "Changes to be committed:" -msgstr "Canvis que cometre:" +msgstr "Canvis a cometre:" #: wt-status.c:216 msgid "Changes not staged for commit:" @@ -1498,17 +1593,17 @@ msgstr "Canvis no allistats per a cometre:" #: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr " (utilitzeu \"git add <file>...\" per actualitzar què es cometrà)" +msgstr " (useu \"git add <fitxer>...\" per a actualitzar què es cometrà)" #: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" -msgstr " (utilitzeu \"git add/rm <file>...\" per actualitzar què es cometrà)" +msgstr " (useu \"git add/rm <fitxer>...\" per a actualitzar què es cometrà)" #: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -" (utilitzeu \"git checkout -- <file>...\" per descartar els canvis en el " +" (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el " "directori de treball)" #: wt-status.c:225 @@ -1519,7 +1614,7 @@ msgstr "" #: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" -msgstr " (utilitzeu \"git %s <file>...\" per incloure en què es cometrà)" +msgstr " (useu \"git %s <fitxer>...\" per a incloure-ho en què es cometrà)" #: wt-status.c:252 msgid "both deleted:" @@ -1531,11 +1626,11 @@ msgstr "afegit per nosaltres:" #: wt-status.c:256 msgid "deleted by them:" -msgstr "suprimit per ells:" +msgstr "suprimit pels:" #: wt-status.c:258 msgid "added by them:" -msgstr "afegit per ells:" +msgstr "afegit pels:" #: wt-status.c:260 msgid "deleted by us:" @@ -1603,206 +1698,207 @@ msgstr "contingut no seguit, " msgid "bug: unhandled diff status %c" msgstr "bug: estat de diferència no manejat %c" -#: wt-status.c:764 +#: wt-status.c:761 msgid "Submodules changed but not updated:" msgstr "Submòduls canviats però no actualitzats:" -#: wt-status.c:766 +#: wt-status.c:763 msgid "Submodule changes to be committed:" -msgstr "Canvis de submòdul que cometre:" +msgstr "Canvis de submòdul a cometre:" -#: wt-status.c:845 +#: wt-status.c:842 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" -"No toquis la línia amunt.\n" +"No toqueu la línia amunt.\n" "Tot a baix es traurà." -#: wt-status.c:936 +#: wt-status.c:933 msgid "You have unmerged paths." msgstr "Teniu rutes sense fusionar." -#: wt-status.c:939 +#: wt-status.c:936 msgid " (fix conflicts and run \"git commit\")" msgstr " (arregleu els conflictes i executeu \"git commit\")" -#: wt-status.c:942 +#: wt-status.c:939 msgid "All conflicts fixed but you are still merging." -msgstr "Tots els conflictes arreglats però encara esteu fusionant." +msgstr "Tots els conflictes estan arreglats però encara esteu fusionant." -#: wt-status.c:945 +#: wt-status.c:942 msgid " (use \"git commit\" to conclude merge)" -msgstr " (utilitzeu \"git commit\" per concloure la fusió)" +msgstr " (useu \"git commit\" per a concloure la fusió)" -#: wt-status.c:955 +#: wt-status.c:952 msgid "You are in the middle of an am session." msgstr "Esteu en el medi d'una sessió am." -#: wt-status.c:958 +#: wt-status.c:955 msgid "The current patch is empty." msgstr "El pedaç actual està buit." -#: wt-status.c:962 +#: wt-status.c:959 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (arregleu els conflictes i després executeu \"git am --continue\")" -#: wt-status.c:964 +#: wt-status.c:961 msgid " (use \"git am --skip\" to skip this patch)" -msgstr " (utilitzeu \"git am --skip\" per saltar aquest pedaç)" +msgstr " (useu \"git am --skip\" per a saltar aquest pedaç)" -#: wt-status.c:966 +#: wt-status.c:963 msgid " (use \"git am --abort\" to restore the original branch)" -msgstr " (utilitzeu \"git am --abort\" per restaurar la rama original)" +msgstr " (useu \"git am --abort\" per a restaurar la rama original)" -#: wt-status.c:1026 wt-status.c:1043 +#: wt-status.c:1023 wt-status.c:1040 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Actualment esteu rebasant la rama '%s' en '%s'." -#: wt-status.c:1031 wt-status.c:1048 +#: wt-status.c:1028 wt-status.c:1045 msgid "You are currently rebasing." msgstr "Actualment esteu rebasant." -#: wt-status.c:1034 +#: wt-status.c:1031 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (arregleu els conflictes i després executeu \"git rebase --continue\")" -#: wt-status.c:1036 +#: wt-status.c:1033 msgid " (use \"git rebase --skip\" to skip this patch)" -msgstr " (utlitizeu \"git rebase --skip\" per saltar aquest pedaç)" +msgstr " (useu \"git rebase --skip\" per a saltar aquest pedaç)" -#: wt-status.c:1038 +#: wt-status.c:1035 msgid " (use \"git rebase --abort\" to check out the original branch)" -msgstr " (utilitzeu \"git rebase --abort\" per agafar la rama original)" +msgstr " (useu \"git rebase --abort\" per a agafar la rama original)" -#: wt-status.c:1051 +#: wt-status.c:1048 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tots els conflictes arreglats: executeu \"git rebase --continue\")" -#: wt-status.c:1055 +#: wt-status.c:1052 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" "Actualment esteu dividint una comissió mentre rebasant la rama '%s' en '%s'." -#: wt-status.c:1060 +#: wt-status.c:1057 msgid "You are currently splitting a commit during a rebase." -msgstr "Actualment esteu dividint una comissió durant un rebase." +msgstr "Actualment esteu dividint una comissió durant una rebase." -#: wt-status.c:1063 +#: wt-status.c:1060 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:1067 +#: wt-status.c:1064 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Actualment esteu editant una comissió mentre rebasant la rama '%s' en '%s'." -#: wt-status.c:1072 +#: wt-status.c:1069 msgid "You are currently editing a commit during a rebase." -msgstr "Actualment esteu editant una comissió durant un rebase." +msgstr "Actualment esteu editant una comissió durant una rebase." -#: wt-status.c:1075 +#: wt-status.c:1072 msgid " (use \"git commit --amend\" to amend the current commit)" -msgstr " (utilitzeu \"git commit --amend\" per esmenar la comissió actual)" +msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)" -#: wt-status.c:1077 +#: wt-status.c:1074 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -" (utilitzeu \"git rebase --continue\" una vegada que sigueu satisfet amb " -"els vostres canvis)" +" (useu \"git rebase --continue\" una vegada que esteu satisfet amb els " +"vostres canvis)" -#: wt-status.c:1087 +#: wt-status.c:1084 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Actualment esteu recollint com cirera la comissió %s." -#: wt-status.c:1092 +#: wt-status.c:1089 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" -#: wt-status.c:1095 +#: wt-status.c:1092 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tots els conflictes arreglats: executeu \"git cherry-pick --continue\")" -#: wt-status.c:1097 +#: wt-status.c:1094 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -" (utilitzeu \"git cherry-pick --abort\" per cancel·lar l'operació de recull " -"de cireres)" +" (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de recull de " +"cireres)" -#: wt-status.c:1106 +#: wt-status.c:1103 #, c-format msgid "You are currently reverting commit %s." msgstr "Actualment esteu revertint la comissió %s." -#: wt-status.c:1111 +#: wt-status.c:1108 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" -#: wt-status.c:1114 +#: wt-status.c:1111 msgid " (all conflicts fixed: run \"git revert --continue\")" -msgstr " (tots els conflictes arreglats: executeu \"git revert --continue\")" +msgstr "" +" (tots els conflictes estan arreglats: executeu \"git revert --continue\")" -#: wt-status.c:1116 +#: wt-status.c:1113 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -" (utilitzeu \"git revert --abort\" per cancel·lar l'operació de reversió)" +" (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" -#: wt-status.c:1127 +#: wt-status.c:1124 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Actualment esteu bisecant, heu començat des de la rama '%s'." -#: wt-status.c:1131 +#: wt-status.c:1128 msgid "You are currently bisecting." msgstr "Actualment esteu bisecant." -#: wt-status.c:1134 +#: wt-status.c:1131 msgid " (use \"git bisect reset\" to get back to the original branch)" -msgstr " (utilitzeu \"git bisect reset\" per tornar a la rama original)" +msgstr " (useu \"git bisect reset\" per a tornar a la rama original)" -#: wt-status.c:1309 +#: wt-status.c:1306 msgid "On branch " msgstr "En la rama " -#: wt-status.c:1316 +#: wt-status.c:1313 msgid "rebase in progress; onto " msgstr "rebase en progrés; en " -#: wt-status.c:1323 +#: wt-status.c:1320 msgid "HEAD detached at " msgstr "HEAD separat a" -#: wt-status.c:1325 +#: wt-status.c:1322 msgid "HEAD detached from " msgstr "HEAD separat de" -#: wt-status.c:1328 +#: wt-status.c:1325 msgid "Not currently on any branch." msgstr "Actualment no en cap rama." -#: wt-status.c:1345 +#: wt-status.c:1342 msgid "Initial commit" msgstr "Comissió inicial" -#: wt-status.c:1359 +#: wt-status.c:1356 msgid "Untracked files" msgstr "Fitxers no seguits" -#: wt-status.c:1361 +#: wt-status.c:1358 msgid "Ignored files" msgstr "Fitxers ignorats" -#: wt-status.c:1365 +#: wt-status.c:1362 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1814,130 +1910,131 @@ msgstr "" "oblidar afegir fitxers nous per vós mateix (veu\n" "'git help status')." -#: wt-status.c:1371 +#: wt-status.c:1368 #, c-format msgid "Untracked files not listed%s" -msgstr "Fitxers no seguits no llistats%s" +msgstr "Els fitxers no seguits no estan llistats%s" -#: wt-status.c:1373 +#: wt-status.c:1370 msgid " (use -u option to show untracked files)" -msgstr " (utilitzeu l'opció -u per mostrar fitxers no seguits)" +msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)" -#: wt-status.c:1379 +#: wt-status.c:1376 msgid "No changes" msgstr "Sense canvis" -#: wt-status.c:1384 +#: wt-status.c:1381 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -"cap canvi afegit que cometre (afegeix \"git add\" o \"git commit -a\")\n" +"no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" -#: wt-status.c:1387 +#: wt-status.c:1384 #, c-format msgid "no changes added to commit\n" -msgstr "cap canvi afegit que cometre\n" +msgstr "no hi ha canvis afegits a cometre\n" -#: wt-status.c:1390 +#: wt-status.c:1387 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -"res afegit que cometre però fitxers no seguits estan presents (utilitzeu " -"\"git add\" per seguir-los)\n" +"no hi ha res afegit a cometre però fitxers no seguits estan presents (useu " +"\"git add\" per a seguir-los)\n" -#: wt-status.c:1393 +#: wt-status.c:1390 #, c-format msgid "nothing added to commit but untracked files present\n" -msgstr "res afegit que cometre però fitxers no seguits estan presents\n" +msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n" -#: wt-status.c:1396 +#: wt-status.c:1393 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -"res que cometre (creeu/copieu fitxers i utilitzeu \"git add\" per seguir-" +"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-" "los)\n" -#: wt-status.c:1399 wt-status.c:1404 +#: wt-status.c:1396 wt-status.c:1401 #, c-format msgid "nothing to commit\n" -msgstr "res que cometre\n" +msgstr "no hi ha res a cometre\n" -#: wt-status.c:1402 +#: wt-status.c:1399 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" -msgstr "res que cometre (utilitzeu -u per mostrar fitxers no seguits)\n" +msgstr "" +"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" -#: wt-status.c:1406 +#: wt-status.c:1403 #, c-format msgid "nothing to commit, working directory clean\n" -msgstr "res que cometre, directori de treball net\n" +msgstr "no hi ha res a cometre, directori de treball net\n" -#: wt-status.c:1515 +#: wt-status.c:1512 msgid "HEAD (no branch)" msgstr "HEAD (sense rama)" -#: wt-status.c:1521 +#: wt-status.c:1518 msgid "Initial commit on " msgstr "Comissió inicial en " -#: wt-status.c:1553 +#: wt-status.c:1550 msgid "gone" -msgstr "no està" +msgstr "no és" -#: wt-status.c:1555 wt-status.c:1563 +#: wt-status.c:1552 wt-status.c:1560 msgid "behind " msgstr "darrere " -#: compat/precompose_utf8.c:55 builtin/clone.c:356 +#: compat/precompose_utf8.c:55 builtin/clone.c:357 #, c-format msgid "failed to unlink '%s'" -msgstr "s'ha fallat al desenllaçar '%s'" +msgstr "s'ha fallat en desenllaçar '%s'" -#: builtin/add.c:21 +#: builtin/add.c:22 msgid "git add [options] [--] <pathspec>..." msgstr "git add [opcions] [--] <especificació-de-ruta>..." -#: builtin/add.c:64 +#: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "estat de diff inesperat %c" -#: builtin/add.c:69 builtin/commit.c:261 +#: builtin/add.c:70 builtin/commit.c:275 msgid "updating files failed" -msgstr "s'ha fallat al actualitzar els fitxers" +msgstr "s'ha fallat en actualitzar els fitxers" -#: builtin/add.c:79 +#: builtin/add.c:80 #, c-format msgid "remove '%s'\n" msgstr "treu '%s'\n" -#: builtin/add.c:133 +#: builtin/add.c:134 msgid "Unstaged changes after refreshing the index:" msgstr "Canvis no allistats després d'actualitzar l'índex:" -#: builtin/add.c:193 builtin/rev-parse.c:781 +#: builtin/add.c:194 builtin/rev-parse.c:785 msgid "Could not read the index" msgstr "No s'ha pogut llegir l'índex" -#: builtin/add.c:204 +#: builtin/add.c:205 #, c-format msgid "Could not open '%s' for writing." msgstr "No s'ha pogut obrir '%s' per a escriptura." -#: builtin/add.c:208 +#: builtin/add.c:209 msgid "Could not write patch" msgstr "No s'ha pogut escriure el pedaç" -#: builtin/add.c:213 +#: builtin/add.c:214 #, c-format msgid "Could not stat '%s'" msgstr "No s'ha pogut fer stat a '%s'" -#: builtin/add.c:215 +#: builtin/add.c:216 msgid "Empty patch. Aborted." -msgstr "Pedaç buit. Avortat." +msgstr "El pedaç és buit. Avortat." #: builtin/add.c:221 #, c-format @@ -1948,15 +2045,15 @@ msgstr "No s'ha pogut aplicar '%s'" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Les rutes següents s'ignoren per un dels vostres fitxers .gitignore:\n" -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70 -#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375 #: builtin/rm.c:269 msgid "dry run" msgstr "marxa en sec" -#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19 -#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606 -#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113 +#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 +#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "sigues verbós" @@ -1964,13 +2061,13 @@ msgstr "sigues verbós" msgid "interactive picking" msgstr "recull interactiu" -#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286 msgid "select hunks interactively" msgstr "selecciona els trossos interactivament" #: builtin/add.c:253 msgid "edit current diff and apply" -msgstr "edita la diferència actual i aplica" +msgstr "edita la diferència actual i aplica'l" #: builtin/add.c:254 msgid "allow adding otherwise ignored files" @@ -2003,12 +2100,12 @@ msgstr "només salta els fitxers que no es poden afegir a causa d'errors" #: builtin/add.c:264 msgid "check if - even missing - files are ignored in dry run" msgstr "" -"comproveu si els fitxers - encara els mancants - s'ignoran en marxa en sec" +"comproveu si els fitxers - encara els mancants - s'ignoren en marxa en sec" #: builtin/add.c:286 #, c-format msgid "Use -f if you really want to add them.\n" -msgstr "Utilitzeu -f si realment els voleu afegir.\n" +msgstr "Useu -f si realment els voleu afegir.\n" #: builtin/add.c:287 msgid "no files added" @@ -2024,7 +2121,7 @@ msgstr "-A i -u són mutualment incompatibles" #: builtin/add.c:336 msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "L'opció --ignore-missing només es pot utilitzar junt amb --dry-run" +msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run" #: builtin/add.c:357 #, c-format @@ -2037,77 +2134,77 @@ 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:919 -#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "fitxer d'índex malmès" -#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" -msgstr "Incapaç d'escriure un nou fitxer d'índex" +msgstr "Incapaç d'escriure un fitxer d'índex nou" -#: builtin/apply.c:57 +#: builtin/apply.c:58 msgid "git apply [options] [<patch>...]" msgstr "git apply [opcions] [<pedaç>...]" -#: builtin/apply.c:110 +#: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "opció d'espai en blanc '%s' no reconeguda" -#: builtin/apply.c:125 +#: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda" -#: builtin/apply.c:825 +#: builtin/apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "No es pot preparar l'expressió regular de marca de temps %s" -#: builtin/apply.c:834 +#: builtin/apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec ha retornat %d per l'entrada: %s" -#: builtin/apply.c:915 +#: builtin/apply.c:916 #, c-format msgid "unable to find filename in patch at line %d" msgstr "incapaç de trobar el nom de fitxer en el pedaç a la línia %d" -#: builtin/apply.c:947 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d" -#: builtin/apply.c:951 +#: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d" -#: builtin/apply.c:952 +#: builtin/apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d" -#: builtin/apply.c:959 +#: builtin/apply.c:960 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d" -#: builtin/apply.c:1422 +#: builtin/apply.c:1423 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recompte: línia inesperada: %.*s" -#: builtin/apply.c:1479 +#: builtin/apply.c:1480 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s" -#: builtin/apply.c:1496 +#: builtin/apply.c:1497 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2116,83 +2213,83 @@ msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " "components (line %d)" msgstr[0] "" -"a la capçalera de git diff li manca informació de nom de fitxer al treure %d " +"a la capçalera de git diff li manca informació de nom de fitxer en treure %d " "component de nom de ruta inicial (línia %d)" msgstr[1] "" -"a la capçalera de git diff li manca informació de nom de fitxer al treure %d " +"a la capçalera de git diff li manca informació de nom de fitxer en treure %d " "components de nom de ruta inicial (línia %d)" -#: builtin/apply.c:1656 +#: builtin/apply.c:1657 msgid "new file depends on old contents" msgstr "el fitxer nou depèn dels continguts antics" -#: builtin/apply.c:1658 +#: builtin/apply.c:1659 msgid "deleted file still has contents" msgstr "el fitxer suprimit encara té continguts" -#: builtin/apply.c:1684 +#: builtin/apply.c:1685 #, c-format msgid "corrupt patch at line %d" -msgstr "pedaç malmès a la línia %d" +msgstr "el pedaç és malmès a la línia %d" -#: builtin/apply.c:1720 +#: builtin/apply.c:1721 #, 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:1723 #, c-format msgid "deleted file %s still has contents" msgstr "el fitxer suprimit %s encara té continguts" -#: builtin/apply.c:1725 +#: builtin/apply.c:1726 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** avís: el fitxer %s es buida però no es suprimeix" -#: builtin/apply.c:1871 +#: builtin/apply.c:1872 #, 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:1901 #, c-format msgid "unrecognized binary patch at line %d" msgstr "pedaç binari no reconegut a la línia %d" -#: builtin/apply.c:1986 +#: builtin/apply.c:2052 #, c-format msgid "patch with only garbage at line %d" msgstr "pedaç amb només escombraries a la línia %d" -#: builtin/apply.c:2076 +#: builtin/apply.c:2142 #, c-format msgid "unable to read symlink %s" msgstr "incapaç de llegir l'enllaç simbòlic %s" -#: builtin/apply.c:2080 +#: builtin/apply.c:2146 #, c-format msgid "unable to open or read %s" msgstr "incapaç d'obrir o llegir %s" -#: builtin/apply.c:2688 +#: builtin/apply.c:2754 #, c-format msgid "invalid start of line: '%c'" msgstr "inici de línia no vàlid: '%c'" -#: builtin/apply.c:2806 +#: builtin/apply.c:2872 #, 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:2818 +#: builtin/apply.c:2884 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "Context reduït a (%ld/%ld) per a aplicar el fragment a %d" +msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d" -#: builtin/apply.c:2824 +#: builtin/apply.c:2890 #, c-format msgid "" "while searching for:\n" @@ -2201,322 +2298,323 @@ msgstr "" "mentre cercant:\n" "%.*s" -#: builtin/apply.c:2843 +#: builtin/apply.c:2909 #, c-format msgid "missing binary patch data for '%s'" -msgstr "manca els dades de pedaç binari de '%s'" +msgstr "manquen els dades de pedaç binari de '%s'" -#: builtin/apply.c:2944 +#: builtin/apply.c:3010 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el pedaç binari no s'aplica a '%s'" -#: builtin/apply.c:2950 +#: builtin/apply.c:3016 #, 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:2971 +#: builtin/apply.c:3037 #, c-format msgid "patch failed: %s:%ld" msgstr "el pedaç ha fallat: %s:%ld" -#: builtin/apply.c:3095 +#: builtin/apply.c:3161 #, c-format msgid "cannot checkout %s" msgstr "no es pot agafar %s" -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 +#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 #, c-format msgid "read of %s failed" msgstr "la lectura de %s ha fallat" -#: builtin/apply.c:3174 builtin/apply.c:3396 +#: builtin/apply.c:3240 builtin/apply.c:3462 #, c-format msgid "path %s has been renamed/deleted" -msgstr "la ruta %s s'ha canviat de nom/suprimit" +msgstr "la ruta %s s'ha canviat de nom / s'ha suprimit" -#: builtin/apply.c:3255 builtin/apply.c:3410 +#: builtin/apply.c:3321 builtin/apply.c:3476 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existeix en l'índex" -#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 +#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3264 builtin/apply.c:3418 +#: builtin/apply.c:3330 builtin/apply.c:3484 #, c-format msgid "%s: does not match index" msgstr "%s: no coincideix amb l'índex" -#: builtin/apply.c:3366 +#: builtin/apply.c:3432 msgid "removal patch leaves file contents" msgstr "el pedaç de treta deixa els continguts dels fitxers" -#: builtin/apply.c:3435 +#: builtin/apply.c:3501 #, c-format msgid "%s: wrong type" msgstr "%s: tipus erroni" -#: builtin/apply.c:3437 +#: builtin/apply.c:3503 #, c-format msgid "%s has type %o, expected %o" msgstr "%s és del tipus %o, %o esperat" -#: builtin/apply.c:3538 +#: builtin/apply.c:3604 #, c-format msgid "%s: already exists in index" msgstr "%s: ja existeix en l'índex" -#: builtin/apply.c:3541 +#: builtin/apply.c:3607 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ja existeix en el directori de treball" -#: builtin/apply.c:3561 +#: builtin/apply.c:3627 #, 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:3566 +#: builtin/apply.c:3632 #, 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:3574 +#: builtin/apply.c:3640 #, c-format msgid "%s: patch does not apply" msgstr "%s: el pedaç no aplica" -#: builtin/apply.c:3587 +#: builtin/apply.c:3653 #, c-format msgid "Checking patch %s..." msgstr "Comprovant el pedaç %s..." -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134 +#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry ha fallat per a la ruta '%s'" -#: builtin/apply.c:3823 +#: builtin/apply.c:3889 #, c-format msgid "unable to remove %s from index" msgstr "incapaç de treure %s de l'índex" -#: builtin/apply.c:3852 +#: builtin/apply.c:3918 #, c-format msgid "corrupt patch for submodule %s" msgstr "pedaç corrupte per al submòdul %s" -#: builtin/apply.c:3856 +#: builtin/apply.c:3922 #, c-format msgid "unable to stat newly created file '%s'" msgstr "incapaç de fer stat al fitxer novament creat '%s'" -#: builtin/apply.c:3861 +#: builtin/apply.c:3927 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "incapaç de crear un magatzem de recolzament per al fitxer novament creat %s" -#: builtin/apply.c:3864 builtin/apply.c:3972 +#: builtin/apply.c:3930 builtin/apply.c:4038 #, c-format msgid "unable to add cache entry for %s" msgstr "incapaç d'afegir una entrada de cau per a %s" -#: builtin/apply.c:3897 +#: builtin/apply.c:3963 #, c-format msgid "closing file '%s'" msgstr "tancant el fitxer '%s'" -#: builtin/apply.c:3946 +#: builtin/apply.c:4012 #, c-format msgid "unable to write file '%s' mode %o" msgstr "incapaç d'escriure el fitxer '%s' mode %o" -#: builtin/apply.c:4033 +#: builtin/apply.c:4099 #, c-format msgid "Applied patch %s cleanly." msgstr "El pedaç %s s'ha aplicat netament." -#: builtin/apply.c:4041 +#: builtin/apply.c:4107 msgid "internal error" msgstr "error intern" -#: builtin/apply.c:4044 +#: builtin/apply.c:4110 #, 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:4054 +#: builtin/apply.c:4120 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncant el nom del fitxer .rej a %.*s.rej" -#: builtin/apply.c:4075 +#: builtin/apply.c:4141 #, c-format msgid "Hunk #%d applied cleanly." msgstr "El tros #%d s'ha aplicat netament." -#: builtin/apply.c:4078 +#: builtin/apply.c:4144 #, c-format msgid "Rejected hunk #%d." msgstr "S'ha rebutjat el tros #%d." -#: builtin/apply.c:4228 +#: builtin/apply.c:4234 msgid "unrecognized input" msgstr "entrada no reconegut" -#: builtin/apply.c:4239 +#: builtin/apply.c:4245 msgid "unable to read index file" msgstr "incapaç de llegir el fitxer d'índex" -#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91 #: builtin/fetch.c:93 msgid "path" msgstr "ruta" -#: builtin/apply.c:4359 +#: builtin/apply.c:4363 msgid "don't apply changes matching the given path" -msgstr "no apliquis canvis que coincideixen amb la ruta donada" +msgstr "no apliquis els canvis que coincideixin amb la ruta donada" -#: builtin/apply.c:4362 +#: builtin/apply.c:4366 msgid "apply changes matching the given path" -msgstr "aplica els canvis que coincideixen amb la ruta donada" +msgstr "aplica els canvis que coincideixin amb la ruta donada" -#: builtin/apply.c:4364 +#: builtin/apply.c:4368 msgid "num" msgstr "número" -#: builtin/apply.c:4365 +#: builtin/apply.c:4369 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "treu <nombre> barres obliqües inicials de les rutes de diferència " "tradicionals" -#: builtin/apply.c:4368 +#: builtin/apply.c:4372 msgid "ignore additions made by the patch" msgstr "ignora afegiments fets pel pedaç" -#: builtin/apply.c:4370 +#: builtin/apply.c:4374 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:4374 +#: builtin/apply.c:4378 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:4376 +#: builtin/apply.c:4380 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:4378 +#: builtin/apply.c:4382 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:4380 +#: builtin/apply.c:4384 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:4382 +#: builtin/apply.c:4386 msgid "apply a patch without touching the working tree" msgstr "aplica un pedaç sense tocar l'arbre de treball" -#: builtin/apply.c:4384 +#: builtin/apply.c:4388 msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "aplica el pedaç també (utilitzeu amb --stat/--summary/--check)" +msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)" -#: builtin/apply.c:4386 +#: builtin/apply.c:4390 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:4388 +#: builtin/apply.c:4392 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:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 msgid "paths are separated with NUL character" msgstr "rutes es separen amb el caràcter NUL" -#: builtin/apply.c:4393 +#: builtin/apply.c:4397 msgid "ensure at least <n> lines of context match" msgstr "assegura que almenys <n> línies de context coincideixin" -#: builtin/apply.c:4394 +#: builtin/apply.c:4398 msgid "action" msgstr "acció" -#: builtin/apply.c:4395 +#: builtin/apply.c:4399 msgid "detect new or modified lines that have whitespace errors" -msgstr "detecta línies noves o modificades que tenen errors d'espai en blanc" +msgstr "" +"detecta les línies noves o modificades que tinguin errors d'espai en blanc" -#: builtin/apply.c:4398 builtin/apply.c:4401 +#: builtin/apply.c:4402 builtin/apply.c:4405 msgid "ignore changes in whitespace when finding context" msgstr "ignora els canvis d'espai en blanc al cercar context" -#: builtin/apply.c:4404 +#: builtin/apply.c:4408 msgid "apply the patch in reverse" msgstr "aplica el pedaç al revés" -#: builtin/apply.c:4406 +#: builtin/apply.c:4410 msgid "don't expect at least one line of context" msgstr "no esperis almenys una línia de context" -#: builtin/apply.c:4408 +#: builtin/apply.c:4412 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixa els trossos rebutjats en fitxers *.reg coresspondents" -#: builtin/apply.c:4410 +#: builtin/apply.c:4414 msgid "allow overlapping hunks" msgstr "permet trossos encavalcants" -#: builtin/apply.c:4413 +#: builtin/apply.c:4417 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:4416 +#: builtin/apply.c:4420 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:4418 +#: builtin/apply.c:4422 msgid "root" msgstr "arrel" -#: builtin/apply.c:4419 +#: builtin/apply.c:4423 msgid "prepend <root> to all filenames" msgstr "anteposa <arrel> a tots els noms de fitxer" -#: builtin/apply.c:4441 +#: builtin/apply.c:4445 msgid "--3way outside a repository" -msgstr "--3way fora d'un repositori" +msgstr "--3way fora d'un dipòsit" -#: builtin/apply.c:4449 +#: builtin/apply.c:4453 msgid "--index outside a repository" -msgstr "--index fora d'un repositori" +msgstr "--index fora d'un dipòsit" -#: builtin/apply.c:4452 +#: builtin/apply.c:4456 msgid "--cached outside a repository" -msgstr "--cached fora d'un repositori" +msgstr "--cached fora d'un dipòsit" -#: builtin/apply.c:4468 +#: builtin/apply.c:4472 #, c-format msgid "can't open patch '%s'" msgstr "no es pot obrir el pedaç '%s'" -#: builtin/apply.c:4482 +#: builtin/apply.c:4486 #, 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:4488 builtin/apply.c:4498 +#: builtin/apply.c:4492 builtin/apply.c:4502 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2576,7 +2674,7 @@ msgstr "git blame [opcions] [opcions-de-revisió] [revisió] [--] fitxer" #: builtin/blame.c:35 msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "les [opcions-de-revisió] estàn documentades en git-rev-list(1)" +msgstr "les [opcions-de-revisió] estan documentades en git-rev-list(1)" #: builtin/blame.c:2501 msgid "Show blame entries as we find them, incrementally" @@ -2584,11 +2682,13 @@ msgstr "Mostra les entrades de culpa mentre les trobem, incrementalment" #: builtin/blame.c:2502 msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "Mostra SHA-1 blanc en comissions de frontera (Per defecte: desactivat)" +msgstr "" +"Mostra un SHA-1 blanc peles comissions de frontera (Per defecte: desactivat)" #: builtin/blame.c:2503 msgid "Do not treat root commits as boundaries (Default: off)" -msgstr "No tractis les comissions d'arrel com límits (Per defecte: desactivat)" +msgstr "" +"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)" #: builtin/blame.c:2504 msgid "Show work cost statistics" @@ -2617,7 +2717,7 @@ msgstr "Mostra el format de porcellana amb informació de comissió per línia" #: builtin/blame.c:2510 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -"Utilitza el mateix mode de sortida que git-annotate (Per defecte: desactivat)" +"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)" #: builtin/blame.c:2511 msgid "Show raw timestamp (Default: off)" @@ -2647,11 +2747,11 @@ msgstr "Gasta cicles extres per a trobar una coincidència millora" #: builtin/blame.c:2517 msgid "Use revisions from <file> instead of calling git-rev-list" -msgstr "Utilitza les revisions de <file> en lloc d'invocar git-rev-list" +msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list" #: builtin/blame.c:2518 msgid "Use <file>'s contents as the final image" -msgstr "Utilitza els continguts de <file> com l'imatge final" +msgstr "Usa els continguts de <fitxer> com a la imatge final" #: builtin/blame.c:2519 builtin/blame.c:2520 msgid "score" @@ -2659,11 +2759,11 @@ msgstr "puntuació" #: builtin/blame.c:2519 msgid "Find line copies within and across files" -msgstr "Troba còpies de línia dins i a través de fitxers" +msgstr "Troba còpies de línia dins i a través dels fitxers" #: builtin/blame.c:2520 msgid "Find line movements within and across files" -msgstr "Troba moviments de línia dins i a través de fitxers" +msgstr "Troba moviments de línia dins i a través dels fitxers" #: builtin/blame.c:2521 msgid "n,m" @@ -2671,7 +2771,7 @@ msgstr "n,m" #: builtin/blame.c:2521 msgid "Process only line range n,m, counting from 1" -msgstr "Processa només el rang de línies n,m, contant des de 1" +msgstr "Processa només el rang de línies n,m, comptant des de 1" #. TRANSLATORS: This string is used to tell us the maximum #. display width for a relative timestamp in "git blame" @@ -2679,7 +2779,7 @@ msgstr "Processa només el rang de línies n,m, contant des de 1" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2599 +#: builtin/blame.c:2602 msgid "4 years, 11 months ago" msgstr "fa 4 anys, 11 mesos" @@ -2699,17 +2799,17 @@ msgstr "git branch [opcions] [-r] (-d | -D) <nom-de-rama>..." msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "git branch [opcions] (-m | -M) [<rama-antiga>] <rama-nova>" -#: builtin/branch.c:150 +#: builtin/branch.c:152 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" "suprimint la rama '%s' que s'ha fusionat a\n" -" '%s', però encara no fusionat a\n" -" HEAD." +" '%s', però encara no s'ha fusionat\n" +" a HEAD." -#: builtin/branch.c:154 +#: builtin/branch.c:156 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2719,12 +2819,12 @@ msgstr "" " fusionat a '%s', encara que està fusionat\n" " a HEAD." -#: builtin/branch.c:168 +#: builtin/branch.c:170 #, 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:172 +#: builtin/branch.c:174 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2733,350 +2833,351 @@ msgstr "" "La rama '%s' no està totalment fusionada.\n" "Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'." -#: builtin/branch.c:185 +#: builtin/branch.c:187 msgid "Update of config-file failed" msgstr "L'actualització del fitxer de configuració ha fallat" -#: builtin/branch.c:213 +#: builtin/branch.c:215 msgid "cannot use -a with -d" -msgstr "no es pot utilitzar -a amb -d" +msgstr "no es pot usar -a amb -d" -#: builtin/branch.c:219 +#: builtin/branch.c:221 msgid "Couldn't look up commit object for HEAD" msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD" -#: builtin/branch.c:227 +#: builtin/branch.c:229 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "No es pot suprimir la rama '%s' en que esteu actualment." -#: builtin/branch.c:240 +#: builtin/branch.c:245 #, c-format msgid "remote branch '%s' not found." -msgstr "rama remota '%s' no trobada." +msgstr "no s'ha trobat la rama remota '%s'." -#: builtin/branch.c:241 +#: builtin/branch.c:246 #, c-format msgid "branch '%s' not found." -msgstr "rama '%s' no trobada" +msgstr "no s'ha trobat la rama '%s'." -#: builtin/branch.c:255 +#: builtin/branch.c:260 #, c-format msgid "Error deleting remote branch '%s'" -msgstr "Error al suprimir la rama remota '%s'" +msgstr "Error en suprimir la rama remota '%s'" -#: builtin/branch.c:256 +#: builtin/branch.c:261 #, c-format msgid "Error deleting branch '%s'" -msgstr "Error al suprimir la rama '%s'" +msgstr "Error en suprimir la rama '%s'" -#: builtin/branch.c:263 +#: builtin/branch.c:268 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "S'ha suprimit la rama remota %s (ha estat %s).\n" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "S'ha suprimit la rama %s (ha estat %s).\n" -#: builtin/branch.c:366 +#: builtin/branch.c:370 #, c-format msgid "branch '%s' does not point at a commit" msgstr "la rama '%s' no assenyala una comissió" -#: builtin/branch.c:454 +#: builtin/branch.c:459 #, c-format msgid "[%s: gone]" -msgstr "[%s: no està]" +msgstr "[%s: no és]" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:464 +#: builtin/branch.c:469 #, c-format msgid "[%s: behind %d]" msgstr "[%s: darrere per %d]" -#: builtin/branch.c:466 +#: builtin/branch.c:471 #, c-format msgid "[behind %d]" msgstr "[darrere de %d]" -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: davant per %d]" -#: builtin/branch.c:472 +#: builtin/branch.c:477 #, c-format msgid "[ahead %d]" -msgstr "[davant per %d]" +msgstr "[davant de %d]" -#: builtin/branch.c:475 +#: builtin/branch.c:480 #, c-format msgid "[%s: ahead %d, behind %d]" -msgstr "[%s: davant %d, darrere %d]" +msgstr "[%s: davant per %d, darrere per %d]" -#: builtin/branch.c:478 +#: builtin/branch.c:483 #, c-format msgid "[ahead %d, behind %d]" msgstr "[davant %d, darrere %d]" -#: builtin/branch.c:502 +#: builtin/branch.c:496 msgid " **** invalid ref ****" msgstr " **** referència invàlida ****" -#: builtin/branch.c:594 +#: builtin/branch.c:587 #, c-format msgid "(no branch, rebasing %s)" msgstr "(cap rama, rebasant %s)" -#: builtin/branch.c:597 +#: builtin/branch.c:590 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(cap rama, bisecció començada en %s)" -#: builtin/branch.c:600 +#: builtin/branch.c:593 #, c-format msgid "(detached from %s)" msgstr "(separat de %s)" -#: builtin/branch.c:603 +#: builtin/branch.c:596 msgid "(no branch)" msgstr "(cap rama)" -#: builtin/branch.c:649 +#: builtin/branch.c:643 #, c-format msgid "object '%s' does not point to a commit" msgstr "l'objecte '%s' no assenyala cap comissió" -#: builtin/branch.c:681 +#: builtin/branch.c:691 msgid "some refs could not be read" -msgstr "algunes referències no s'han pogut llegir" +msgstr "no s'han pogut llegir algunes referències" -#: builtin/branch.c:694 +#: builtin/branch.c:704 msgid "cannot rename the current branch while not on any." -msgstr "no es pot canviar el nom de la rama actual mentre no estar en ninguna." +msgstr "" +"no es pot canviar el nom de la rama actual mentre no estant en ninguna." -#: builtin/branch.c:704 +#: builtin/branch.c:714 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de rama invàlid: '%s'" -#: builtin/branch.c:719 +#: builtin/branch.c:729 msgid "Branch rename failed" msgstr "El canvi de nom de rama ha fallat" -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "S'ha canviat el nom de la rama malanomenada '%s'" -#: builtin/branch.c:727 +#: builtin/branch.c:737 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "S'ha canviat el nom de la rama a %s, però HEAD no està actualitzat!" -#: builtin/branch.c:734 +#: builtin/branch.c:744 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La ramà està canviada de nom, però l'actualització del fitxer de " "configuració ha fallat" -#: builtin/branch.c:749 +#: builtin/branch.c:759 #, c-format msgid "malformed object name %s" msgstr "nom d'objecte %s malformat" -#: builtin/branch.c:773 +#: builtin/branch.c:783 #, c-format msgid "could not write branch description template: %s" msgstr "no s'ha pogut escriure la plantilla de descripció de rama: %s" -#: builtin/branch.c:803 +#: builtin/branch.c:813 msgid "Generic options" msgstr "Opcions genèriques" -#: builtin/branch.c:805 +#: builtin/branch.c:815 msgid "show hash and subject, give twice for upstream branch" msgstr "mostra el hash i el tema, doneu dos vegades per la rama font" -#: builtin/branch.c:806 +#: builtin/branch.c:816 msgid "suppress informational messages" msgstr "omet els missatges informatius" -#: builtin/branch.c:807 +#: builtin/branch.c:817 msgid "set up tracking mode (see git-pull(1))" msgstr "configura el mode de seguiment (veu git-pull(1))" -#: builtin/branch.c:809 +#: builtin/branch.c:819 msgid "change upstream info" msgstr "canvia la informació de font" -#: builtin/branch.c:813 +#: builtin/branch.c:823 msgid "use colored output" -msgstr "utilitza sortida colorada" +msgstr "usa sortida colorada" -#: builtin/branch.c:814 +#: builtin/branch.c:824 msgid "act on remote-tracking branches" msgstr "actua en rames amb seguiment remot" -#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 -#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574 -#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615 -#: builtin/tag.c:621 +#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 +#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623 +#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616 +#: builtin/tag.c:622 msgid "commit" msgstr "comissió" -#: builtin/branch.c:818 builtin/branch.c:824 +#: builtin/branch.c:828 builtin/branch.c:834 msgid "print only branches that contain the commit" msgstr "imprimeix només les rames que continguin la comissió" -#: builtin/branch.c:830 +#: builtin/branch.c:840 msgid "Specific git-branch actions:" msgstr "Accions de git-branch específiques:" -#: builtin/branch.c:831 +#: builtin/branch.c:841 msgid "list both remote-tracking and local branches" msgstr "llista ambdós les rames amb seguiment remot i les locals" -#: builtin/branch.c:833 +#: builtin/branch.c:843 msgid "delete fully merged branch" -msgstr "suprimeix la rama si completament fusionada" +msgstr "suprimeix la rama si és completament fusionada" -#: builtin/branch.c:834 +#: builtin/branch.c:844 msgid "delete branch (even if not merged)" msgstr "suprimeix la rama (encara que no estigui fusionada)" -#: builtin/branch.c:835 +#: builtin/branch.c:845 msgid "move/rename a branch and its reflog" msgstr "mou/canvia de nom una rama i el seu registre de referència" -#: builtin/branch.c:836 +#: builtin/branch.c:846 msgid "move/rename a branch, even if target exists" msgstr "mou/canvia de nom una rama, encara que el destí existeixi" -#: builtin/branch.c:837 +#: builtin/branch.c:847 msgid "list branch names" msgstr "llista els noms de rama" -#: builtin/branch.c:838 +#: builtin/branch.c:848 msgid "create the branch's reflog" msgstr "crea el registre de referència de la rama" -#: builtin/branch.c:840 +#: builtin/branch.c:850 msgid "edit the description for the branch" msgstr "edita la descripció de la rama" -#: builtin/branch.c:841 +#: builtin/branch.c:851 msgid "force creation (when already exists)" msgstr "força creació (quan ja existeix)" -#: builtin/branch.c:844 +#: builtin/branch.c:854 msgid "print only not merged branches" msgstr "imprimeix només les rames sense fusionar" -#: builtin/branch.c:850 +#: builtin/branch.c:860 msgid "print only merged branches" msgstr "imprimeix només les rames fusionades" -#: builtin/branch.c:854 +#: builtin/branch.c:864 msgid "list branches in columns" msgstr "llista les rames en columnes" -#: builtin/branch.c:867 +#: builtin/branch.c:877 msgid "Failed to resolve HEAD as a valid ref." -msgstr "S'ha fallat al resoldre HEAD com referència vàlida." +msgstr "S'ha fallat en resoldre HEAD com a referència vàlida." -#: builtin/branch.c:872 builtin/clone.c:636 +#: builtin/branch.c:881 builtin/clone.c:634 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat baix refs/heads!" -#: builtin/branch.c:896 +#: builtin/branch.c:903 msgid "--column and --verbose are incompatible" msgstr "--column i --verbose són incompatibles" -#: builtin/branch.c:902 builtin/branch.c:941 +#: builtin/branch.c:909 builtin/branch.c:948 msgid "branch name required" msgstr "cal el nom de rama" -#: builtin/branch.c:917 +#: builtin/branch.c:924 msgid "Cannot give description to detached HEAD" msgstr "No es pot donar descripció a un HEAD separat" -#: builtin/branch.c:922 +#: builtin/branch.c:929 msgid "cannot edit description of more than one branch" msgstr "no es pot editar la descripció de més d'una rama" -#: builtin/branch.c:929 +#: builtin/branch.c:936 #, c-format msgid "No commit on branch '%s' yet." -msgstr "Encara cap comissió en la rama '%s'." +msgstr "Encara no hi ha comissió en la rama '%s'." -#: builtin/branch.c:932 +#: builtin/branch.c:939 #, c-format msgid "No branch named '%s'." -msgstr "Cap rama amb nom '%s'." +msgstr "No hi ha rama amb nom '%s'." -#: builtin/branch.c:947 +#: builtin/branch.c:954 msgid "too many branches for a rename operation" -msgstr "massa rames per a una operació de canvi de nom" +msgstr "hi ha massa rames per a una operació de canvi de nom" -#: builtin/branch.c:952 +#: builtin/branch.c:959 msgid "too many branches to set new upstream" -msgstr "massa rames per a establir una nova font" +msgstr "hi ha massa rames per a establir una nova font" -#: builtin/branch.c:956 +#: builtin/branch.c:963 #, 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 %s quan no assenyala cap rama." +"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap rama." -#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 +#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009 #, c-format msgid "no such branch '%s'" -msgstr "cap rama així '%s'" +msgstr "no hi ha tal rama '%s'" -#: builtin/branch.c:963 +#: builtin/branch.c:970 #, c-format msgid "branch '%s' does not exist" msgstr "la rama '%s' no existeix" -#: builtin/branch.c:975 +#: builtin/branch.c:982 msgid "too many branches to unset upstream" -msgstr "massa rames per a desestablir la font" +msgstr "hi ha massa rames per a desestablir la font" -#: builtin/branch.c:979 +#: builtin/branch.c:986 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 quan no assenyala cap rama." -#: builtin/branch.c:985 +#: builtin/branch.c:992 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La rama '%s' no té informació de font" -#: builtin/branch.c:999 +#: builtin/branch.c:1006 msgid "it does not make sense to create 'HEAD' manually" msgstr "no té sentit crear 'HEAD' manualment" -#: builtin/branch.c:1005 +#: builtin/branch.c:1012 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 rama" -#: builtin/branch.c:1008 +#: builtin/branch.c:1015 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -"La bandera --set-upstream està desaprovada i es traurà. Considereu utilitzar " -"--track o --set-upstream-to\n" +"La bandera --set-upstream està desaprovada i es traurà. Considereu usar --" +"track o --set-upstream-to\n" -#: builtin/branch.c:1025 +#: builtin/branch.c:1032 #, c-format msgid "" "\n" @@ -3087,12 +3188,12 @@ msgstr "" "Si volíeu fer '%s' seguir '%s', feu això:\n" "\n" -#: builtin/branch.c:1026 +#: builtin/branch.c:1033 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1027 +#: builtin/branch.c:1034 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3104,50 +3205,50 @@ msgstr "%s està bé\n" #: builtin/bundle.c:56 msgid "Need a repository to create a bundle." -msgstr "Cal un repositori per fer un embolic." +msgstr "Cal un dipòsit per a fer un embolic." #: builtin/bundle.c:60 msgid "Need a repository to unbundle." -msgstr "Cal un repositori per desembolicar." +msgstr "Cal un dipòsit per a desembolicar." -#: builtin/cat-file.c:331 +#: builtin/cat-file.c:332 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:332 +#: builtin/cat-file.c:333 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <llista_de_objectes>" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:370 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipus> pot ser un de: blob, tree, commit, tag" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:371 msgid "show object type" msgstr "mostra el tipus de l'objecte" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:372 msgid "show object size" msgstr "mostra la mida de l'objecte" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:374 msgid "exit with zero when there's no error" msgstr "surt amb zero quan no hi ha error" -#: builtin/cat-file.c:374 +#: builtin/cat-file.c:375 msgid "pretty-print object's content" msgstr "imprimeix bellament el contingut de l'objecte " -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:377 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:378 +#: builtin/cat-file.c:379 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:381 +#: builtin/cat-file.c:382 msgid "show info about objects fed from the standard input" msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard" @@ -3166,23 +3267,23 @@ msgstr "informa de tots els atributs establerts en el fitxer" #: builtin/check-attr.c:20 msgid "use .gitattributes only from the index" -msgstr "utilitza .gitattributes només des de l'índex" +msgstr "usa .gitattributes només des de l'índex" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" -msgstr "llegeix els noms de fitxer de stdin" +msgstr "llegeix els noms de fitxer d'stdin" #: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid "terminate input and output records by a NUL character" msgstr "termina els registres d'entrada i de salida per un caràcter NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274 msgid "suppress progress reporting" msgstr "omet el reportatge de progrés" #: builtin/check-ignore.c:26 msgid "show non-matching input paths" -msgstr "mostra les rutes d'entrada que no coincideixen" +msgstr "mostra les rutes d'entrada que no coincideixin" #: builtin/check-ignore.c:28 msgid "ignore index when checking" @@ -3218,7 +3319,7 @@ msgstr "git check-mailmap [opcions] <contacte>..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" -msgstr "també llegeix els contactes des de stdin" +msgstr "també llegeix els contactes des d'stdin" #: builtin/check-mailmap.c:24 #, c-format @@ -3227,7 +3328,7 @@ msgstr "incapaç d'analitzar el contacte: %s" #: builtin/check-mailmap.c:47 msgid "no contacts specified" -msgstr "cap contacte especificat" +msgstr "no hi ha contactes especificats" #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" @@ -3315,12 +3416,12 @@ msgstr "Incapaç d'afegir el resultat de fusió per a '%s'" #: builtin/checkout.c:240 #, c-format msgid "'%s' cannot be used with updating paths" -msgstr "'%s' no es pot utilitzar al actualitzar rutes" +msgstr "'%s' no es pot usar amb actualització de rutes" #: builtin/checkout.c:243 builtin/checkout.c:246 #, c-format msgid "'%s' cannot be used with %s" -msgstr "'%s' no es pot utilitzar amb %s" +msgstr "'%s' no es pot usar amb %s" #: builtin/checkout.c:249 #, c-format @@ -3340,46 +3441,46 @@ msgstr "la ruta '%s' està sense fusionar" msgid "you need to resolve your current index first" msgstr "heu de resoldre el vostre índex actual primer" -#: builtin/checkout.c:591 +#: builtin/checkout.c:597 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "No es pot fer reflog per a '%s'\n" -#: builtin/checkout.c:629 +#: builtin/checkout.c:635 msgid "HEAD is now at" msgstr "HEAD ara està a" -#: builtin/checkout.c:636 +#: builtin/checkout.c:642 #, c-format msgid "Reset branch '%s'\n" msgstr "Restableix la rama '%s'\n" -#: builtin/checkout.c:639 +#: builtin/checkout.c:645 #, c-format msgid "Already on '%s'\n" msgstr "Ja en '%s'\n" -#: builtin/checkout.c:643 +#: builtin/checkout.c:649 #, c-format msgid "Switched to and reset branch '%s'\n" -msgstr "Rama '%s' agafat i restablit\n" +msgstr "S'ha agafat i restablert la rama '%s'\n" -#: builtin/checkout.c:645 builtin/checkout.c:1026 +#: builtin/checkout.c:651 builtin/checkout.c:1032 #, c-format msgid "Switched to a new branch '%s'\n" -msgstr "Rama nova '%s' agafada\n" +msgstr "S'ha agafat la rama nova '%s'\n" -#: builtin/checkout.c:647 +#: builtin/checkout.c:653 #, c-format msgid "Switched to branch '%s'\n" -msgstr "Rama '%s' agafada\n" +msgstr "S'ha agafat la rama '%s'\n" -#: builtin/checkout.c:699 +#: builtin/checkout.c:705 #, c-format msgid " ... and %d more.\n" msgstr " ... i %d més.\n" -#: builtin/checkout.c:705 +#: builtin/checkout.c:711 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3402,7 +3503,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:723 +#: builtin/checkout.c:729 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3411,159 +3512,159 @@ msgid "" " git branch new_branch_name %s\n" "\n" msgstr "" -"Si els voleu retenir per crear una rama nova, ara pot ser una hora bona\n" -"per fer això amb:\n" +"Si els voleu retenir per a crear una rama nova, ara pot ser una hora bona\n" +"per a fer això amb:\n" "\n" " git branch new_branch_name %s\n" "\n" -#: builtin/checkout.c:753 +#: builtin/checkout.c:759 msgid "internal error in revision walk" msgstr "error intern en el passeig per revisions" -#: builtin/checkout.c:757 +#: builtin/checkout.c:763 msgid "Previous HEAD position was" msgstr "La posició de HEAD anterior ha estat" -#: builtin/checkout.c:784 builtin/checkout.c:1021 +#: builtin/checkout.c:790 builtin/checkout.c:1027 msgid "You are on a branch yet to be born" -msgstr "Esteu en una rama que encara ha de naixer" +msgstr "Esteu en una rama que encara ha de nàixer" -#: builtin/checkout.c:928 +#: builtin/checkout.c:934 #, c-format msgid "only one reference expected, %d given." msgstr "només una referència esperada, %d donades." -#: builtin/checkout.c:967 +#: builtin/checkout.c:973 #, c-format msgid "invalid reference: %s" msgstr "referència invàlida: %s" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1002 #, c-format msgid "reference is not a tree: %s" msgstr "la referéncia no és un arbre: %s" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1041 msgid "paths cannot be used with switching branches" -msgstr "les rutes no es poden utilitzar amb canvi de rama" +msgstr "les rutes no es poden usar amb canvi de rama" -#: builtin/checkout.c:1038 builtin/checkout.c:1042 +#: builtin/checkout.c:1044 builtin/checkout.c:1048 #, c-format msgid "'%s' cannot be used with switching branches" -msgstr "'%s' no es pot utilitzar amb canvi de rama" +msgstr "'%s' no es pot usar amb canvi de rama" -#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054 -#: builtin/checkout.c:1057 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 +#: builtin/checkout.c:1063 #, c-format msgid "'%s' cannot be used with '%s'" -msgstr "'%s' no es pot utilitzar amb '%s'" +msgstr "'%s' no es pot usar amb '%s'" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1068 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No es pot canviar la rama a un no comissió '%s'" -#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "rama" -#: builtin/checkout.c:1085 +#: builtin/checkout.c:1091 msgid "create and checkout a new branch" msgstr "crea i agafa una rama nova" -#: builtin/checkout.c:1087 +#: builtin/checkout.c:1093 msgid "create/reset and checkout a branch" msgstr "crea/restableix i agafa una rama" -#: builtin/checkout.c:1088 +#: builtin/checkout.c:1094 msgid "create reflog for new branch" -msgstr "Crea un registre de referència per a la rama nova" +msgstr "crea un registre de referència per a la rama nova" -#: builtin/checkout.c:1089 +#: builtin/checkout.c:1095 msgid "detach the HEAD at named commit" msgstr "separa el HEAD a la comissió anomenada" -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1096 msgid "set upstream info for new branch" msgstr "estableix la informació de font de la rama nova" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new-branch" -msgstr "nova-rama" +msgstr "rama-nova" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new unparented branch" -msgstr "nova rama sense pares" +msgstr "rama nova sense pares" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1099 msgid "checkout our version for unmerged files" -msgstr "agafa la versió nostra de fitxers sense fusionar" +msgstr "agafa la versió nostra dels fitxers sense fusionar" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1101 msgid "checkout their version for unmerged files" -msgstr "agafa la versió seva de fitxers sense fusionar" +msgstr "agafa la versió seva dels fitxers sense fusionar" -#: builtin/checkout.c:1097 +#: builtin/checkout.c:1103 msgid "force checkout (throw away local modifications)" msgstr "agafa a la força (descarta qualsevulles modificacions locals)" -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1104 msgid "perform a 3-way merge with the new branch" msgstr "realitza una fusió de 3 vies amb la rama nova" -#: builtin/checkout.c:1099 builtin/merge.c:225 +#: builtin/checkout.c:1105 builtin/merge.c:226 msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" -#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245 +#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245 msgid "style" msgstr "estil" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1107 msgid "conflict style (merge or diff3)" msgstr "estil de conflicte (fusió o diff3)" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1110 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de ruta a entrades escasses només" -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1112 msgid "second guess 'git checkout no-such-branch'" msgstr "dubta 'git checkout cap-rama-així'" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1135 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B i --orphan són mutualment exclusius" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1152 msgid "--track needs a branch name" msgstr "--track necessita un nom de rama" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1157 msgid "Missing branch name; try -b" msgstr "Manca el nom de rama; proveu -b" -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1194 msgid "invalid path specification" msgstr "especificació de ruta invàlida" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1201 #, 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 "" "No es pot actualitzar rames i canviar a la rama '%s' a la vegada.\n" -"Volíeu agafar '%s' la qual no es pot resoldre com comissió?" +"Volíeu agafar '%s' la qual no es pot resoldre com a comissió?" -#: builtin/checkout.c:1202 +#: builtin/checkout.c:1206 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no accepta un paràmetre de ruta '%s'" -#: builtin/checkout.c:1206 +#: builtin/checkout.c:1210 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3590,17 +3691,17 @@ msgstr "Trauria %s\n" #: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" -msgstr "Saltant el repositori %s\n" +msgstr "Saltant el dipòsit %s\n" #: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" -msgstr "Saltaria el repositori %s\n" +msgstr "Saltaria el dipòsit %s\n" #: builtin/clean.c:34 #, c-format msgid "failed to remove %s" -msgstr "s'ha fallat al treure %s" +msgstr "s'ha fallat en treure %s" #: builtin/clean.c:295 msgid "" @@ -3642,16 +3743,16 @@ msgstr "Perdó (%s)?" #: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " -msgstr "Introduïu patrons que ignorar>> " +msgstr "Introduïu els patrons a ignorar>> " #: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" -msgstr "AVÍS: No es pot trobar ítems que coincideixen amb: %s" +msgstr "AVÍS: No es pot trobar ítems que coincideixin amb: %s" #: builtin/clean.c:717 msgid "Select items to delete" -msgstr "Selecciona els ítems que suprimir" +msgstr "Selecciona els ítems a suprimir" #: builtin/clean.c:757 #, c-format @@ -3674,11 +3775,11 @@ msgid "" msgstr "" "clean - comença a netejar\n" "filter by pattern - exclou ítems de supressió\n" -"select by numbers - selecciona ítems que suprimir per números\n" -"ask each - confirma cada supressió (com a \"rm -i\")\n" +"select by numbers - selecciona ítems a suprimir per números\n" +"ask each - confirma cada supressió (com \"rm -i\")\n" "quit - deixa de netejar\n" "help - aquesta pantalla\n" -"? - ajuda per selecció de l'avís" +"? - ajuda de selecció de l'avís" #: builtin/clean.c:817 msgid "*** Commands ***" @@ -3696,7 +3797,7 @@ msgstr[1] "Trauria els ítems següents:" #: builtin/clean.c:843 msgid "No more files to clean, exiting." -msgstr "No hi ha més fitxers que netejar; sortint." +msgstr "No hi ha més fitxers a netejar; sortint." #: builtin/clean.c:874 msgid "do not print names of files removed" @@ -3714,14 +3815,14 @@ msgstr "neteja interactiva" msgid "remove whole directories" msgstr "treu directoris enters" -#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714 +#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "patró" #: builtin/clean.c:881 msgid "add <pattern> to ignore rules" -msgstr "afegiu <patró> per ignorar les regles" +msgstr "afegiu <patró> per a ignorar les regles" #: builtin/clean.c:882 msgid "remove ignored files, too" @@ -3733,163 +3834,163 @@ msgstr "treu només els fitxers ignorats" #: builtin/clean.c:902 msgid "-x and -X cannot be used together" -msgstr "-x i -X no es poden utilitzar junts" +msgstr "-x i -X no es poden usar junts" #: builtin/clean.c:906 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -"clean.requireForce estaberta a veritat i ni -i, -n ni -f donat; refusant " -"netejar" +"clean.requireForce està establerta a veritat i ni -i, -n ni -f s'ha donat; " +"refusant netejar" #: builtin/clean.c:909 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" -"clean.requireForce és per defecte veritat i ni -i, -n ni -f donat; refusant " -"netejar" +"clean.requireForce és per defecte veritat i ni -i, -n ni -f s'ha donat; " +"refusant netejar" -#: builtin/clone.c:36 +#: builtin/clone.c:37 msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "git clone [opcions] [--] <repositori> [<directori>]" +msgstr "git clone [opcions] [--] <dipòsit> [<directori>]" -#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222 -#: builtin/push.c:503 +#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223 +#: builtin/push.c:514 msgid "force progress reporting" msgstr "força l'informe de progrés" -#: builtin/clone.c:66 +#: builtin/clone.c:67 msgid "don't create a checkout" msgstr "no fes una agafada" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 msgid "create a bare repository" -msgstr "crea un repositori nu" +msgstr "crea un dipòsit nu" -#: builtin/clone.c:71 +#: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" -msgstr "crea un repositori reflectit (implica nu)" +msgstr "crea un dipòsit reflectit (implica bare)" -#: builtin/clone.c:73 +#: builtin/clone.c:74 msgid "to clone from a local repository" -msgstr "per a clonar des d'un repositori local" +msgstr "per a clonar des d'un dipòsit local" -#: builtin/clone.c:75 +#: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" -msgstr "no utilitzeu enllaços durs locals, sempre copia" +msgstr "no usis enllaços durs locals, sempre copia" -#: builtin/clone.c:77 +#: builtin/clone.c:78 msgid "setup as shared repository" -msgstr "configura com repositori compartit" +msgstr "configura com a dipòsit compartit" -#: builtin/clone.c:79 builtin/clone.c:81 +#: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" msgstr "initialitza els submòduls en el clon" -#: builtin/clone.c:82 builtin/init-db.c:483 +#: builtin/clone.c:83 builtin/init-db.c:485 msgid "template-directory" msgstr "directori-de-plantilla" -#: builtin/clone.c:83 builtin/init-db.c:484 +#: builtin/clone.c:84 builtin/init-db.c:486 msgid "directory from which templates will be used" -msgstr "directori del qual les plantilles s'utilitzaran" +msgstr "directori del qual les plantilles s'usaran" -#: builtin/clone.c:85 +#: builtin/clone.c:86 msgid "reference repository" -msgstr "repositori de referència" +msgstr "dipòsit de referència" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "nom" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "use <name> instead of 'origin' to track upstream" -msgstr "utilitza <nom> en lloc de 'origin' per seguir la font" +msgstr "usa <nom> en lloc de 'origin' per a seguir la font" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" msgstr "agafa <rama> en lloc del HEAD del remot" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "path to git-upload-pack on the remote" msgstr "ruta a git-upload-pack en el remot" -#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659 msgid "depth" msgstr "profunditat" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "create a shallow clone of that depth" msgstr "crea un clon superficial de tal profunditat" -#: builtin/clone.c:95 +#: builtin/clone.c:96 msgid "clone only one branch, HEAD or --branch" -msgstr "cona només una rama, HEAD o --branch" +msgstr "clona només una rama, HEAD o --branch" -#: builtin/clone.c:96 builtin/init-db.c:492 +#: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" msgstr "directori de git" -#: builtin/clone.c:97 builtin/init-db.c:493 +#: builtin/clone.c:98 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "separa el directori de git de l'arbre de treball" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "key=value" msgstr "calu=valor" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "set config inside the new repository" -msgstr "estableix la configuració dins del repositori nou" +msgstr "estableix la configuració dins del dipòsit nou" -#: builtin/clone.c:252 +#: builtin/clone.c:253 #, c-format msgid "reference repository '%s' is not a local repository." -msgstr "el repositori de referència '%s' no és un repositori local." +msgstr "el dipòsit de referència '%s' no és un dipòsit local." -#: builtin/clone.c:256 +#: builtin/clone.c:257 #, c-format msgid "reference repository '%s' is shallow" -msgstr "el repositori de referència '%s' és superficial" +msgstr "el dipòsit de referència '%s' és superficial" -#: builtin/clone.c:259 +#: builtin/clone.c:260 #, c-format msgid "reference repository '%s' is grafted" -msgstr "el repositori de referència '%s' és empeltat" +msgstr "el dipòsit de referència '%s' és empeltat" -#: builtin/clone.c:321 +#: builtin/clone.c:322 #, c-format msgid "failed to create directory '%s'" -msgstr "s'ha fallat al crear el directori '%s'" +msgstr "s'ha fallat en crear el directori '%s'" -#: builtin/clone.c:323 builtin/diff.c:83 +#: builtin/clone.c:324 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" -msgstr "s'ha fallat al fer stat a '%s'" +msgstr "s'ha fallat en fer stat a '%s'" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "%s exists and is not a directory" msgstr "%s existeix i no és un directori" -#: builtin/clone.c:339 +#: builtin/clone.c:340 #, c-format msgid "failed to stat %s\n" -msgstr "s'ha fallat al fer stat a '%s'\n" +msgstr "s'ha fallat en fer stat a '%s'\n" -#: builtin/clone.c:361 +#: builtin/clone.c:362 #, c-format msgid "failed to create link '%s'" -msgstr "s'ha fallat al crear l'enllaç '%s'" +msgstr "s'ha fallat en crear l'enllaç '%s'" -#: builtin/clone.c:365 +#: builtin/clone.c:366 #, c-format msgid "failed to copy file to '%s'" -msgstr "s'ha fallat al copiar el fitxer a '%s'" +msgstr "s'ha fallat en copiar el fitxer a '%s'" -#: builtin/clone.c:388 builtin/clone.c:565 +#: builtin/clone.c:389 builtin/clone.c:563 #, c-format msgid "done.\n" msgstr "fet.\n" @@ -3900,116 +4001,116 @@ msgid "" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -"La clonació ha tingut éxit, però l'agafada ha fallat.\n" +"La clonació ha tingut èxit, però l'agafada ha fallat.\n" "Podeu inspeccionar què s'ha agafat amb 'git status' i\n" -"reintentar l'agafada amb 'git checkout -f HEAD'\n" +"tornar a intentar l'agafada amb 'git checkout -f HEAD'\n" -#: builtin/clone.c:480 +#: builtin/clone.c:478 #, c-format msgid "Could not find remote branch %s to clone." msgstr "No s'ha pogut trobar la rama remota %s per a clonar." -#: builtin/clone.c:560 +#: builtin/clone.c:558 #, c-format msgid "Checking connectivity... " msgstr "Provant connectivitat... " -#: builtin/clone.c:563 +#: builtin/clone.c:561 msgid "remote did not send all necessary objects" msgstr "el remot no ha enviat tots els objectes necessaris" -#: builtin/clone.c:627 +#: builtin/clone.c:625 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "el HEAD remot es refereix a una referència que no existeix; incapaç " "d'agafar.\n" -#: builtin/clone.c:658 +#: builtin/clone.c:656 msgid "unable to checkout working tree" msgstr "incapaç d'agafar l'arbre de treball" -#: builtin/clone.c:768 +#: builtin/clone.c:765 msgid "Too many arguments." -msgstr "Massa paràmetres." +msgstr "Hi ha massa paràmetres." -#: builtin/clone.c:772 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." -msgstr "Heu d'especificar un repositori que clonar." +msgstr "Heu d'especificar un dipòsit per a clonar." -#: builtin/clone.c:783 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les opcions --bare i --origin %s són incompatibles." -#: builtin/clone.c:786 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare i --separate-git-dir són incompatibles." -#: builtin/clone.c:799 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" -msgstr "el repositori '%s' no existeix" +msgstr "el dipòsit '%s' no existeix" -#: builtin/clone.c:805 builtin/fetch.c:1143 +#: builtin/clone.c:802 builtin/fetch.c:1155 #, c-format msgid "depth %s is not a positive number" msgstr "la profunditat %s no és nombre positiu" -#: builtin/clone.c:815 +#: builtin/clone.c:812 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "la ruta destí '%s' ja existeix i no és un directori buit." -#: builtin/clone.c:825 +#: builtin/clone.c:822 #, c-format msgid "working tree '%s' already exists." msgstr "l'arbre de treball '%s' ja existeix." -#: builtin/clone.c:838 builtin/clone.c:850 +#: builtin/clone.c:835 builtin/clone.c:847 #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'ha pogut crear els directoris inicials de '%s'" -#: builtin/clone.c:841 +#: builtin/clone.c:838 #, 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:860 +#: builtin/clone.c:857 #, c-format msgid "Cloning into bare repository '%s'...\n" -msgstr "Clonant al repositori nu '%s'...\n" +msgstr "Clonant al dipòsit nu '%s'...\n" -#: builtin/clone.c:862 +#: builtin/clone.c:859 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonant a '%s'...\n" -#: builtin/clone.c:898 +#: builtin/clone.c:895 msgid "--depth is ignored in local clones; use file:// instead." -msgstr "--depth s'ignora en clons locals; utilitzeu file:// en lloc." +msgstr "--depth s'ignora en els clons locals; useu file:// en lloc." -#: builtin/clone.c:901 +#: builtin/clone.c:898 msgid "source repository is shallow, ignoring --local" -msgstr "el repositori font és superficial, ignorant --local" +msgstr "el dipòsit font és superficial, ignorant --local" -#: builtin/clone.c:906 +#: builtin/clone.c:903 msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:910 +#: builtin/clone.c:907 #, c-format msgid "Don't know how to clone %s" msgstr "No es sap com clonar %s" -#: builtin/clone.c:961 builtin/clone.c:969 +#: builtin/clone.c:958 builtin/clone.c:966 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La rama remota %s no es troba en la font %s" -#: builtin/clone.c:972 +#: builtin/clone.c:969 msgid "You appear to have cloned an empty repository." -msgstr "Sembla que heu clonat un repositori buit." +msgstr "Sembla que heu clonat un dipòsit buit." #: builtin/column.c:9 msgid "git column [options]" @@ -4021,7 +4122,7 @@ msgstr "cerca els variables de configuració" #: builtin/column.c:27 builtin/column.c:28 msgid "layout to use" -msgstr "pla que utilitzar" +msgstr "pla a usar" #: builtin/column.c:29 msgid "Maximum width" @@ -4043,15 +4144,42 @@ msgstr "Espai d'encoixinada entre columnes" msgid "--command must be the first argument" msgstr "--command ha de ser el primer paràmetre" -#: builtin/commit.c:36 +#: builtin/commit.c:37 msgid "git commit [options] [--] <pathspec>..." msgstr "git commit [opcions] [--] <especificació-de-ruta>..." -#: builtin/commit.c:41 +#: builtin/commit.c:42 msgid "git status [options] [--] <pathspec>..." msgstr "git status [opcions] [--] <especificació-de-ruta>..." -#: builtin/commit.c:46 +#: builtin/commit.c:47 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"S'han configurat el vostre nom i adreça de correu electrònic\n" +"automàticament basats en el vostre nom d'usuari i nom de host. Si us\n" +"plau, comproveu que siguin correctes. Podeu suprimir aquest missatge\n" +"per establir-los explícitament. Executeu l'ordre següent i seguiu les\n" +"instruccions en el vostre editor per editar el vostre fitxer de\n" +"configuració:\n" +"\n" +" git config --global --edit\n" +"Després de fer això, podeu arreglar la identitat usada per a aquesta\n" +"comissió amb:\n" +"\n" +" git commit --amend --reset-author\n" + +#: builtin/commit.c:60 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4072,12 +4200,12 @@ msgstr "" " git config --global user.name \"El Vostre Nom\"\n" " git config --global user.email tu@example.com\n" "\n" -"Després de fer això, podeu arreglar la identitat utilitzada per a\n" -"aquesta comissió amb:\n" +"Després de fer això, podeu arreglar la identitat usada per a aquesta\n" +"comissió amb:\n" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:58 +#: builtin/commit.c:72 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -4087,7 +4215,7 @@ msgstr "" "buida. Podeu repetir el vostre ordre amb --allow-empty, o podeu\n" "treure la comissió per complet amb \"git reset HEAD^\".\n" -#: builtin/commit.c:63 +#: builtin/commit.c:77 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4097,16 +4225,16 @@ msgid "" msgstr "" "El recull de cireres previ ja està buit, possiblement a causa de resolució " "de conflicte.\n" -"Si el voleu cometre de totes maneres, utilitzeu:\n" +"Si el voleu cometre de totes maneres, useu:\n" "\n" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:70 +#: builtin/commit.c:84 msgid "Otherwise, please use 'git reset'\n" -msgstr "D'altra manera, si us plau, utilitzeu 'git reset'\n" +msgstr "D'altra manera, si us plau, useu 'git reset'\n" -#: builtin/commit.c:73 +#: builtin/commit.c:87 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4115,109 +4243,126 @@ msgid "" "Then \"git cherry-pick --continue\" will resume cherry-picking\n" "the remaining commits.\n" msgstr "" -"Si voleu saltar aquesta comissió, utilitzeu:\n" +"Si voleu saltar aquesta comissió, useu:\n" "\n" " git reset\n" "\n" "Llavors \"git cherry-pick --continue\" reprendrà recollint\n" "com cireres les comissions restants.\n" -#: builtin/commit.c:288 +#: builtin/commit.c:302 msgid "failed to unpack HEAD tree object" -msgstr "s'ha fallat al desempaquetar l'objecte d'arbre HEAD" +msgstr "s'ha fallat en desempaquetar l'objecte d'arbre HEAD" -#: builtin/commit.c:328 +#: builtin/commit.c:342 msgid "unable to create temporary index" msgstr "incapaç de crear un índex temporal" -#: builtin/commit.c:334 +#: builtin/commit.c:348 msgid "interactive add failed" msgstr "l'afegiment interactiu ha fallat" -#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435 +#: builtin/commit.c:359 +msgid "unable to write index file" +msgstr "incapaç d'escriure el fitxer d'índex" + +#: builtin/commit.c:361 +msgid "unable to update temporary index" +msgstr "incapaç de actualitzar l'índex temporal" + +#: builtin/commit.c:363 +msgid "Failed to update main cache tree" +msgstr "S'ha fallat en actualitzar l'arbre principal de memòria cau" + +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 msgid "unable to write new_index file" msgstr "incapaç d'escriure el fitxer new_index" -#: builtin/commit.c:418 +#: builtin/commit.c:443 msgid "cannot do a partial commit during a merge." msgstr "no es pot fer una comissió parcial durant una fusió." -#: builtin/commit.c:420 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a cherry-pick." msgstr "no es pot fer una comissió parcial durant un recull de cireres." -#: builtin/commit.c:429 +#: builtin/commit.c:454 msgid "cannot read the index" msgstr "no es pot llegir l'índex" -#: builtin/commit.c:447 +#: builtin/commit.c:473 msgid "unable to write temporary index file" msgstr "incapaç d'escriure un fitxer d'índex temporal" -#: builtin/commit.c:557 builtin/commit.c:563 +#: builtin/commit.c:592 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "a la comissió '%s' li manca la capçalera d'autor" + +#: builtin/commit.c:594 #, c-format -msgid "invalid commit: %s" -msgstr "comissió invàlida: %s" +msgid "commit '%s' has malformed author line" +msgstr "la comissió '%s' té una línia d'autor malformada" -#: builtin/commit.c:585 +#: builtin/commit.c:613 msgid "malformed --author parameter" msgstr "paràmetre --author malformat" -#: builtin/commit.c:592 +#: builtin/commit.c:621 #, c-format msgid "invalid date format: %s" msgstr "format de data invàlid: %s" -#: builtin/commit.c:609 +#: builtin/commit.c:642 #, c-format msgid "Malformed ident string: '%s'" msgstr "Cadena d'identificació malformada: '%s'" -#: builtin/commit.c:642 +#: builtin/commit.c:675 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" "incapaç de seleccionar un caràcter de comentari que\n" -"no sigui utilitzat en el missatge de comissió actual" +"no sigui usat en el missatge de comissió actual" -#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086 +#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120 #, c-format msgid "could not lookup commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: builtin/commit.c:691 builtin/shortlog.c:273 +#: builtin/commit.c:724 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(llegint el missatge de registre de l'entrada estàndard)\n" -#: builtin/commit.c:693 +#: builtin/commit.c:726 msgid "could not read log from standard input" msgstr "no s'ha pogut llegir de l'entrada estàndard" -#: builtin/commit.c:697 +#: builtin/commit.c:730 #, c-format msgid "could not read log file '%s'" msgstr "no s'ha pogut llegir el fitxer de registre '%s'" -#: builtin/commit.c:719 +#: builtin/commit.c:752 msgid "could not read MERGE_MSG" msgstr "no s'ha pogut llegir MERGE_MSG" -#: builtin/commit.c:723 +#: builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "no s'ha pogur llegir SQUASH_MSG" -#: builtin/commit.c:727 +#: builtin/commit.c:760 #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir '%s'" -#: builtin/commit.c:798 +#: builtin/commit.c:831 msgid "could not write commit template" msgstr "no s'ha pogut escriure la plantilla de comissió" -#: builtin/commit.c:816 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -4232,7 +4377,7 @@ msgstr "" "\t%s\n" "i intenteu de nou.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -4247,7 +4392,7 @@ msgstr "" "\t%s\n" "i intenteu de nou.\n" -#: builtin/commit.c:834 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4257,7 +4402,7 @@ msgstr "" "S'ignoraran les línies començant amb '%c', i un missatge de\n" "comissió buit avorta la comissió.\n" -#: builtin/commit.c:841 +#: builtin/commit.c:874 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4268,148 +4413,146 @@ msgstr "" "Es retindran les línies començants amb '%c'; podeu treure'ls per vós\n" "mateix si voleu. Un missatge buit avorta la comissió.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:888 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:863 +#: builtin/commit.c:896 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:870 +#: builtin/commit.c:903 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sComitent: %.*s <%.*s>" -#: builtin/commit.c:888 +#: builtin/commit.c:921 msgid "Cannot read index" msgstr "No es pot llegir l'índex" -#: builtin/commit.c:945 +#: builtin/commit.c:978 msgid "Error building trees" -msgstr "Error al construir arbres" +msgstr "Error en construir arbres" -#: builtin/commit.c:960 builtin/tag.c:495 +#: builtin/commit.c:993 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" -msgstr "" -"Si us plau, proveïu el missatge utilitzant l'opció o -m o l'opció -F.\n" +msgstr "Si us plau, proveïu el missatge per usar o l'opció -m o l'opció -F.\n" -#: builtin/commit.c:1061 +#: builtin/commit.c:1095 #, c-format msgid "No existing author found with '%s'" msgstr "Cap autor existent trobat amb '%s'" -#: builtin/commit.c:1076 builtin/commit.c:1316 +#: builtin/commit.c:1110 builtin/commit.c:1350 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fitxers no seguits invàlid '%s'" -#: builtin/commit.c:1113 +#: builtin/commit.c:1147 msgid "--long and -z are incompatible" msgstr "--long i -z són incompatibles" -#: builtin/commit.c:1143 +#: builtin/commit.c:1177 msgid "Using both --reset-author and --author does not make sense" -msgstr "Utilitzar ambdós --reset-author i --author no té sentit" +msgstr "Usar ambdós --reset-author i --author no té sentit" -#: builtin/commit.c:1152 +#: builtin/commit.c:1186 msgid "You have nothing to amend." -msgstr "No teniu res que esmenar." +msgstr "No teniu res a esmenar." -#: builtin/commit.c:1155 +#: builtin/commit.c:1189 msgid "You are in the middle of a merge -- cannot amend." msgstr "Esteu en el medi d'una fusió -- no es pot esmenar." -#: builtin/commit.c:1157 +#: builtin/commit.c:1191 msgid "You are in the middle of a cherry-pick -- cannot amend." -msgstr "Esteu en el medi d'una cherry-pick -- no es pot esmenar." +msgstr "Esteu en el medi d'un recull de cireres -- no es pot esmenar." -#: builtin/commit.c:1160 +#: builtin/commit.c:1194 msgid "Options --squash and --fixup cannot be used together" -msgstr "Les opcions --squash i --fixup no es poden utilitzar junts" +msgstr "Les opcions --squash i --fixup no es poden usar junts" -#: builtin/commit.c:1170 +#: builtin/commit.c:1204 msgid "Only one of -c/-C/-F/--fixup can be used." -msgstr "Només un de -c/-C/-F/--fixup es pot utilitzar." +msgstr "Només un de -c/-C/-F/--fixup es pot usar." -#: builtin/commit.c:1172 +#: builtin/commit.c:1206 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "L'opció -m no es pot combinar amb -c/-C/-F/--fixup." -#: builtin/commit.c:1180 +#: builtin/commit.c:1214 msgid "--reset-author can be used only with -C, -c or --amend." -msgstr "--reset-author només es pot utilitzar amb -C, -c o --amend." +msgstr "--reset-author només es pot usar amb -C, -c o --amend." -#: builtin/commit.c:1197 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." -msgstr "" -"Només un de --include/--only/--all/--interactive/--patch es pot utilitzar." +msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar." -#: builtin/commit.c:1199 +#: builtin/commit.c:1233 msgid "No paths with --include/--only does not make sense." msgstr "--include/--only no té sentit sense ruta." -#: builtin/commit.c:1201 +#: builtin/commit.c:1235 msgid "Clever... amending the last one with dirty index." -msgstr "Intel·ligent... esmenant el últim amb índex brut" +msgstr "Intel·ligent...esmenant el últim amb índex brut." -#: builtin/commit.c:1203 +#: builtin/commit.c:1237 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -"Rutes explícites especificades sense -i o -o; presumint rutes --only..." +"S'han especificat rutes explícites sense -i o -o; presumint rutes --only..." -#: builtin/commit.c:1215 builtin/tag.c:727 +#: builtin/commit.c:1249 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de neteja invàlid %s" -#: builtin/commit.c:1220 +#: builtin/commit.c:1254 msgid "Paths with -a does not make sense." msgstr "-a no té sentit amb rutes." -#: builtin/commit.c:1330 builtin/commit.c:1595 +#: builtin/commit.c:1364 builtin/commit.c:1644 msgid "show status concisely" msgstr "mostra l'estat concisament" -#: builtin/commit.c:1332 builtin/commit.c:1597 +#: builtin/commit.c:1366 builtin/commit.c:1646 msgid "show branch information" msgstr "mostra la informació de rama" -#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489 +#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500 msgid "machine-readable output" msgstr "sortida llegible per màquina" -#: builtin/commit.c:1337 builtin/commit.c:1601 +#: builtin/commit.c:1371 builtin/commit.c:1650 msgid "show status in long format (default)" msgstr "mostra l'estat en format llarg (per defecte)" -#: builtin/commit.c:1340 builtin/commit.c:1604 +#: builtin/commit.c:1374 builtin/commit.c:1653 msgid "terminate entries with NUL" msgstr "termina les entrades amb NUL" -#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703 -#: builtin/fast-export.c:706 builtin/tag.c:602 +#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980 +#: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "mode" -#: builtin/commit.c:1343 builtin/commit.c:1607 +#: builtin/commit.c:1377 builtin/commit.c:1656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostra els fitxers no seguits, modes opcional: all, normal, no. (Per " "defecte: all)" -#: builtin/commit.c:1346 +#: builtin/commit.c:1380 msgid "show ignored files" msgstr "mostra els fitxers ignorats" -#: builtin/commit.c:1347 parse-options.h:153 +#: builtin/commit.c:1381 parse-options.h:153 msgid "when" msgstr "quan" -#: builtin/commit.c:1348 +#: builtin/commit.c:1382 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4417,227 +4560,219 @@ msgstr "" "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per " "defecte: all)" -#: builtin/commit.c:1350 +#: builtin/commit.c:1384 msgid "list untracked files in columns" msgstr "mostra els fitxers no seguits en columnes" -#: builtin/commit.c:1419 +#: builtin/commit.c:1471 msgid "couldn't look up newly created commit" msgstr "no s'ha pogut trobar la comissió novament creat" -#: builtin/commit.c:1421 +#: builtin/commit.c:1473 msgid "could not parse newly created commit" msgstr "no s'ha pogut analitzar la comissió novament creat" -#: builtin/commit.c:1469 +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "HEAD separat" -#: builtin/commit.c:1471 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr " (comissió d'arrel)" -#: builtin/commit.c:1565 +#: builtin/commit.c:1614 msgid "suppress summary after successful commit" msgstr "omet el resum després d'una comissió reexita" -#: builtin/commit.c:1566 +#: builtin/commit.c:1615 msgid "show diff in commit message template" msgstr "mostra la diferència en la plantilla de missatge de comissió" -#: builtin/commit.c:1568 +#: builtin/commit.c:1617 msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1569 builtin/tag.c:600 +#: builtin/commit.c:1618 builtin/tag.c:601 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "author" msgstr "autor" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "override author for commit" msgstr "autor corregit de la comissió" -#: builtin/commit.c:1571 builtin/gc.c:286 +#: builtin/commit.c:1620 builtin/gc.c:275 msgid "date" msgstr "data" -#: builtin/commit.c:1571 +#: builtin/commit.c:1620 msgid "override date for commit" msgstr "data corregida de la comissió" -#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409 -#: builtin/notes.c:566 builtin/tag.c:598 +#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/tag.c:599 msgid "message" msgstr "missatge" -#: builtin/commit.c:1572 +#: builtin/commit.c:1621 msgid "commit message" msgstr "missatge de comissió" -#: builtin/commit.c:1573 +#: builtin/commit.c:1622 msgid "reuse and edit message from specified commit" -msgstr "reutilitza i edit el missatge de la comissió especificada" +msgstr "reusa i edita el missatge de la comissió especificada" -#: builtin/commit.c:1574 +#: builtin/commit.c:1623 msgid "reuse message from specified commit" -msgstr "reutilitza el missatge de la comissió especificada" +msgstr "reusa el missatge de la comissió especificada" -#: builtin/commit.c:1575 +#: builtin/commit.c:1624 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -"utilitza el missatge formatat d'aixafada automàtica per arreglar la comissió " +"usa el missatge formatat d'aixafada automàtica per a arreglar la comissió " "especificada" -#: builtin/commit.c:1576 +#: builtin/commit.c:1625 msgid "use autosquash formatted message to squash specified commit" msgstr "" -"utilitza el missatge formatat d'aixafada automàtica per aixafar la comissió " +"usa el missatge formatat d'aixafada automàtica per a aixafar la comissió " "especificada" -#: builtin/commit.c:1577 +#: builtin/commit.c:1626 msgid "the commit is authored by me now (used with -C/-c/--amend)" -msgstr "l'autor de la comissió ja sóc jo (utilitzat amb -C/-c/--amend)" +msgstr "l'autor de la comissió ja sóc jo (usat amb -C/-c/--amend)" -#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86 +#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" -#: builtin/commit.c:1579 +#: builtin/commit.c:1628 msgid "use specified template file" -msgstr "utilitza el fitxer de plantilla especificat" +msgstr "usa el fitxer de plantilla especificat" -#: builtin/commit.c:1580 +#: builtin/commit.c:1629 msgid "force edit of commit" -msgstr "edició de la comissió a la força" +msgstr "força l'edició de la comissió" -#: builtin/commit.c:1581 +#: builtin/commit.c:1630 msgid "default" msgstr "per defecte" -#: builtin/commit.c:1581 builtin/tag.c:603 +#: builtin/commit.c:1630 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:1582 +#: builtin/commit.c:1631 msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissió" -#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92 -#: builtin/tag.c:604 +#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92 +#: builtin/tag.c:605 msgid "key-id" msgstr "ID de clau" -#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93 +#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93 msgid "GPG sign commit" msgstr "firma la comissió amb GPG" -#: builtin/commit.c:1587 +#: builtin/commit.c:1636 msgid "Commit contents options" msgstr "Opcions dels continguts de les comissions" -#: builtin/commit.c:1588 +#: builtin/commit.c:1637 msgid "commit all changed files" msgstr "comet tots els fitxers canviats" -#: builtin/commit.c:1589 +#: builtin/commit.c:1638 msgid "add specified files to index for commit" msgstr "afegeix els fitxers especificats a l'índex per a cometre" -#: builtin/commit.c:1590 +#: builtin/commit.c:1639 msgid "interactively add files" msgstr "afegeix els fitxers interactivament" -#: builtin/commit.c:1591 +#: builtin/commit.c:1640 msgid "interactively add changes" msgstr "afegeix els canvis interactivament" -#: builtin/commit.c:1592 +#: builtin/commit.c:1641 msgid "commit only specified files" msgstr "comet només els fitxers especificats" -#: builtin/commit.c:1593 +#: builtin/commit.c:1642 msgid "bypass pre-commit hook" msgstr "evita el ganxo de precomissió" -#: builtin/commit.c:1594 +#: builtin/commit.c:1643 msgid "show what would be committed" msgstr "mostra què es cometria" -#: builtin/commit.c:1605 +#: builtin/commit.c:1654 msgid "amend previous commit" msgstr "esmena la comissió anterior" -#: builtin/commit.c:1606 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" msgstr "evita el ganxo de postreescriure" -#: builtin/commit.c:1611 +#: builtin/commit.c:1660 msgid "ok to record an empty change" -msgstr "bé registrar un canvi buit" +msgstr "està bé registrar un canvi buit" -#: builtin/commit.c:1613 +#: builtin/commit.c:1662 msgid "ok to record a change with an empty message" -msgstr "bé registrar un canvi amb missatge buit" +msgstr "està bé registrar un canvi amb missatge buit" -#: builtin/commit.c:1641 +#: builtin/commit.c:1691 msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: builtin/commit.c:1680 builtin/merge.c:518 +#: builtin/commit.c:1730 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" -msgstr "no s'ha pogut obrir '%s' per lectura" +msgstr "no s'ha pogut obrir '%s' per a lectura" -#: builtin/commit.c:1687 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fitxer MERGE_HEAD corrupte (%s)" -#: builtin/commit.c:1694 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" msgstr "no s'ha pogut llegir MERGE_MODE" -#: builtin/commit.c:1713 +#: builtin/commit.c:1763 #, c-format msgid "could not read commit message: %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: builtin/commit.c:1724 +#: builtin/commit.c:1774 #, 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:1729 +#: builtin/commit.c:1779 #, 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:1744 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875 msgid "failed to write commit object" -msgstr "s'ha fallat al escriure l'objecte de comissió" - -#: builtin/commit.c:1756 -msgid "cannot lock HEAD ref" -msgstr "no es pot bloquejar la referència HEAD" +msgstr "s'ha fallat en escriure l'objecte de comissió" -#: builtin/commit.c:1769 -msgid "cannot update HEAD ref" -msgstr "no es pot actualitzar la referència HEAD" - -#: builtin/commit.c:1780 +#: builtin/commit.c:1827 msgid "" "Repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full or quota is\n" +"new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" -"S'ha actualitzat el repositori, però no es pot escriure\n" -"el fitxer new_index. Comproveu que el disc no estigui\n" -"ple i la quota no estigui excedit, i després\n" -"\"git reset HEAD\" per recuperar." +"S'ha actualitzat el dipòsit, però no es pot escriure el\n" +"fitxer new_index. Comproveu que el disc no estigui ple i\n" +"que la quota no estigui excedit, i després\n" +"\"git reset HEAD\" per a recuperar." #: builtin/config.c:8 msgid "git config [options]" @@ -4649,19 +4784,19 @@ msgstr "Ubicació del fitxer de configuració" #: builtin/config.c:54 msgid "use global config file" -msgstr "utilitza el fitxer de configuració global" +msgstr "usa el fitxer de configuració global" #: builtin/config.c:55 msgid "use system config file" -msgstr "utilitza el fitxer de configuració del sistema" +msgstr "usa el fitxer de configuració del sistema" #: builtin/config.c:56 msgid "use repository config file" -msgstr "utilitza el fitxer de configuració del repositori" +msgstr "usa el fitxer de configuració del dipòsit" #: builtin/config.c:57 msgid "use given config file" -msgstr "utilitza el fitxer de configuració donat" +msgstr "usa el fitxer de configuració donat" #: builtin/config.c:58 msgid "blob-id" @@ -4742,19 +4877,19 @@ msgstr "Tipus" #: builtin/config.c:75 msgid "value is \"true\" or \"false\"" -msgstr "valor és \"true\" o \"false\"" +msgstr "el valor és \"true\" o \"false\"" #: builtin/config.c:76 msgid "value is decimal number" -msgstr "valor és un nombre decimal" +msgstr "el valor és un nombre decimal" #: builtin/config.c:77 msgid "value is --bool or --int" -msgstr "valor és --bool o --int" +msgstr "el valor és --bool o --int" #: builtin/config.c:78 msgid "value is a path (file or directory name)" -msgstr "valor és un path (nom de fitxer o directori)" +msgstr "el valor és una ruta (nom de fitxer o directori)" #: builtin/config.c:79 msgid "Other" @@ -4768,63 +4903,87 @@ msgstr "termina els valors amb un octet NUL" msgid "respect include directives on lookup" msgstr "respecta les directives d'inclusió al cercar" -#: builtin/count-objects.c:82 +#: builtin/config.c:315 +msgid "unable to parse default color value" +msgstr "incapaç d'analitzar el valor de color per defecte" + +#: builtin/config.c:455 +#, c-format +msgid "" +"# This is Git's per-user configuration file.\n" +"[core]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tuser = %s\n" +"#\temail = %s\n" +msgstr "" +"# Això és el fitxer de configuració del Git del usuari.\n" +"[core]\n" +"# Si us plau, adapteu i descomenteu les línies següentes:\n" +"#\tuser = %s\n" +"#\temail = %s\n" + +#: builtin/config.c:590 +#, c-format +msgid "cannot create configuration file %s" +msgstr "no es pot crear el fitxer de configuració '%s'" + +#: builtin/count-objects.c:55 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:65 msgid "print sizes in human readable format" msgstr "imprimeix les mides en un format llegible per humans" -#: builtin/describe.c:16 +#: builtin/describe.c:17 msgid "git describe [options] <commit-ish>*" msgstr "git describe [opcions] <comissió>*" -#: builtin/describe.c:17 +#: builtin/describe.c:18 msgid "git describe [options] --dirty" msgstr "git describe [opcions] --dirty" -#: builtin/describe.c:216 +#: builtin/describe.c:217 #, c-format msgid "annotated tag %s not available" msgstr "l'etiqueta anotada %s no és disponible" -#: builtin/describe.c:220 +#: builtin/describe.c:221 #, c-format msgid "annotated tag %s has no embedded name" msgstr "l'etiqueta anotada %s no té nom incrustat" -#: builtin/describe.c:222 +#: builtin/describe.c:223 #, c-format msgid "tag '%s' is really '%s' here" msgstr "l'etiqueta '%s' realment és '%s' aquí" -#: builtin/describe.c:249 +#: builtin/describe.c:250 builtin/log.c:452 #, c-format msgid "Not a valid object name %s" msgstr "%s no és un nom d'objecte vàlid" -#: builtin/describe.c:252 +#: builtin/describe.c:253 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s no és un objecte de '%s' vàlid" -#: builtin/describe.c:269 +#: builtin/describe.c:270 #, c-format msgid "no tag exactly matches '%s'" msgstr "cap etiqueta coincideix exactament amb '%s'" -#: builtin/describe.c:271 +#: builtin/describe.c:272 #, c-format msgid "searching to describe %s\n" -msgstr "cercant per descriure %s\n" +msgstr "cercant per a descriure %s\n" -#: builtin/describe.c:318 +#: builtin/describe.c:319 #, c-format msgid "finished search at %s\n" -msgstr "cerca terminada a %s\n" +msgstr "s'ha terminat la cerca a %s\n" -#: builtin/describe.c:345 +#: builtin/describe.c:346 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -4833,7 +4992,7 @@ msgstr "" "Cap etiqueta anotada pot descriure '%s'.\n" "No obstant, hi havia etiquetes no anotades: proveu --tags." -#: builtin/describe.c:349 +#: builtin/describe.c:350 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -4842,162 +5001,165 @@ msgstr "" "Cap etiqueta pot descriure '%s'.\n" "Proveu --always, o creeu algunes etiquetes." -#: builtin/describe.c:370 +#: builtin/describe.c:371 #, c-format msgid "traversed %lu commits\n" msgstr "%lu comissions travessades\n" -#: builtin/describe.c:373 +#: builtin/describe.c:374 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" "s'ha trobat més de %i etiquetes: s'ha llistat les %i més recents\n" -"cerca renunciada a %s\n" +"s'ha renunciat la cerca a %s\n" -#: builtin/describe.c:395 +#: builtin/describe.c:396 msgid "find the tag that comes after the commit" msgstr "troba l'etiqueta que vingui després de la comissió" -#: builtin/describe.c:396 +#: builtin/describe.c:397 msgid "debug search strategy on stderr" msgstr "estratègia de cerca de depuració en stderr" -#: builtin/describe.c:397 +#: builtin/describe.c:398 msgid "use any ref" -msgstr "utilitza qualsevulla referència" +msgstr "usa qualsevulla referència" -#: builtin/describe.c:398 +#: builtin/describe.c:399 msgid "use any tag, even unannotated" -msgstr "utilitza qualsevulla etiqueta, encara les sense anotar" +msgstr "usa qualsevulla etiqueta, encara les sense anotar" -#: builtin/describe.c:399 +#: builtin/describe.c:400 msgid "always use long format" -msgstr "sempre utilitza el format llarg" +msgstr "sempre usa el format llarg" -#: builtin/describe.c:400 +#: builtin/describe.c:401 msgid "only follow first parent" msgstr "només segueix el primer pare" -#: builtin/describe.c:403 +#: builtin/describe.c:404 msgid "only output exact matches" msgstr "emet només coincidències exactes" -#: builtin/describe.c:405 +#: builtin/describe.c:406 msgid "consider <n> most recent tags (default: 10)" msgstr "considera les <n> etiquetes més recents (per defecte: 10)" -#: builtin/describe.c:407 +#: builtin/describe.c:408 msgid "only consider tags matching <pattern>" msgstr "només considera les etiquetes que coincideixen amb <patró>" -#: builtin/describe.c:409 builtin/name-rev.c:318 +#: builtin/describe.c:410 builtin/name-rev.c:318 msgid "show abbreviated commit object as fallback" -msgstr "mostra l'objecte de comissió abreviat com retrocediment" +msgstr "mostra l'objecte de comissió abreviat com a retrocediment" -#: builtin/describe.c:410 +#: builtin/describe.c:411 msgid "mark" msgstr "marca" -#: builtin/describe.c:411 +#: builtin/describe.c:412 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")" -#: builtin/describe.c:429 +#: builtin/describe.c:430 msgid "--long is incompatible with --abbrev=0" msgstr "--long és incompatible amb --abbrev=0" -#: builtin/describe.c:455 +#: builtin/describe.c:456 msgid "No names found, cannot describe anything." msgstr "Cap nom trobat, no es pot descriure res." -#: builtin/describe.c:475 +#: builtin/describe.c:476 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty és incompatible amb les comissions" -#: builtin/diff.c:85 +#: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" -msgstr "'%s': no és un fitxer regular ni enllaç simbòlic" +msgstr "'%s': no és ni fitxer regular ni enllaç simbòlic" -#: builtin/diff.c:236 +#: builtin/diff.c:237 #, c-format msgid "invalid option: %s" msgstr "opció invàlida: %s" -#: builtin/diff.c:357 +#: builtin/diff.c:358 msgid "Not a git repository" -msgstr "No és un repositori de git" +msgstr "No és un dipòsit de git" -#: builtin/diff.c:400 +#: builtin/diff.c:401 #, c-format msgid "invalid object '%s' given." -msgstr "objecte invàlid '%s' donat." +msgstr "s'ha donat un objecte invàlid '%s'." -#: builtin/diff.c:409 +#: builtin/diff.c:410 #, c-format msgid "more than two blobs given: '%s'" -msgstr "més de dos blobs donats: '%s'" +msgstr "s'ha donat més de dos blobs: '%s" -#: builtin/diff.c:416 +#: builtin/diff.c:417 #, c-format msgid "unhandled object '%s' given." -msgstr "objecte no manejat '%s' donat." +msgstr "s'ha donat l'objecte no manejat '%s'." -#: builtin/fast-export.c:23 +#: builtin/fast-export.c:24 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [opcions-de-llista-de-revisions]" -#: builtin/fast-export.c:702 +#: builtin/fast-export.c:979 msgid "show progress after <n> objects" msgstr "mostra el progrés després de <n> objectes" -#: builtin/fast-export.c:704 +#: builtin/fast-export.c:981 msgid "select handling of signed tags" msgstr "selecciona el manejament de les etiquetes firmades" -#: builtin/fast-export.c:707 +#: builtin/fast-export.c:984 msgid "select handling of tags that tag filtered objects" msgstr "" -"selecciona el manejament de les etiquetes que etiqueten objectes filtrats" +"selecciona el manejament de les etiquetes que etiquetin objectes filtrats" -#: builtin/fast-export.c:710 +#: builtin/fast-export.c:987 msgid "Dump marks to this file" msgstr "Bolcar les marques a aquest fitxer" -#: builtin/fast-export.c:712 +#: builtin/fast-export.c:989 msgid "Import marks from this file" -msgstr "Importa marques d'aquest fitxer" +msgstr "Importa les marques d'aquest fitxer" -#: builtin/fast-export.c:714 +#: builtin/fast-export.c:991 msgid "Fake a tagger when tags lack one" -msgstr "Fingeix un etiquetador quan als etiquetes lis manca un" +msgstr "Fingeix un etiquetador quan un lis manca a les etiquetes" -#: builtin/fast-export.c:716 +#: builtin/fast-export.c:993 msgid "Output full tree for each commit" -msgstr "Imprimeix l'arbre complet per cada comissió" +msgstr "Imprimeix l'arbre complet de cada comissió" -#: builtin/fast-export.c:718 +#: builtin/fast-export.c:995 msgid "Use the done feature to terminate the stream" -msgstr "Utilitza la característica done per terminar el corrent" +msgstr "Usa la característica done per a terminar el corrent" -#: builtin/fast-export.c:719 +#: builtin/fast-export.c:996 msgid "Skip output of blob data" msgstr "Salta l'emissió de dades de blob" -#: builtin/fast-export.c:720 +#: builtin/fast-export.c:997 msgid "refspec" msgstr "especificació de referència" -#: builtin/fast-export.c:721 +#: builtin/fast-export.c:998 msgid "Apply refspec to exported refs" msgstr "Aplica l'especificació de referència a les referències exportades" +#: builtin/fast-export.c:999 +msgid "anonymize output" +msgstr "anonimitza la sortida" + #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" -msgstr "" -"git fetch [<opcions>] [<repositori> [<especificació-de-referència>...]]" +msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" #: builtin/fetch.c:21 msgid "git fetch [<options>] <group>" @@ -5005,7 +5167,7 @@ msgstr "git fetch [<opcions>] <grup>" #: builtin/fetch.c:22 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" -msgstr "git fetch --multiple [<opcions>] [(<repositori> | <grup>)...]" +msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]" #: builtin/fetch.c:23 msgid "git fetch --all [<options>]" @@ -5041,7 +5203,7 @@ msgstr "no obtingues les etiquetes (--no-tags)" #: builtin/fetch.c:103 msgid "prune remote-tracking branches no longer on remote" -msgstr "poda les rames amb seguiment remot que ja no estan en el remot" +msgstr "poda les rames amb seguiment remot que ja no estiguin en el remot" #: builtin/fetch.c:104 msgid "on-demand" @@ -5061,13 +5223,13 @@ msgstr "permet l'actualització de la referència HEAD" #: builtin/fetch.c:114 msgid "deepen history of shallow clone" -msgstr "aprofundeix la història del clon superficial" +msgstr "aprofundeix la història d'un clon superficial" #: builtin/fetch.c:116 msgid "convert to a complete repository" -msgstr "converteix en un repositori complet" +msgstr "converteix en un dipòsit complet" -#: builtin/fetch.c:118 builtin/log.c:1205 +#: builtin/fetch.c:118 builtin/log.c:1208 msgid "dir" msgstr "directori" @@ -5081,7 +5243,7 @@ msgstr "mode de recursivitat per defecte" #: builtin/fetch.c:124 msgid "accept refs that update .git/shallow" -msgstr "accepta referències que actualitzin .git/shallow" +msgstr "accepta les referències que actualitzin .git/shallow" #: builtin/fetch.c:125 msgid "refmap" @@ -5095,169 +5257,169 @@ msgstr "mostra el mapa de referències d'obteniment" msgid "Couldn't find remote ref HEAD" msgstr "No s'ha pogut trobar la referència HEAD remota" -#: builtin/fetch.c:440 +#: builtin/fetch.c:454 #, c-format msgid "object %s not found" msgstr "objecte %s no trobat" -#: builtin/fetch.c:445 +#: builtin/fetch.c:459 msgid "[up to date]" -msgstr "[actualitzat]" +msgstr "[al dia]" -#: builtin/fetch.c:459 +#: builtin/fetch.c:473 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (no es pot obtenir en la rama actual)" -#: builtin/fetch.c:460 builtin/fetch.c:546 +#: builtin/fetch.c:474 builtin/fetch.c:560 msgid "[rejected]" msgstr "[rebutjat]" -#: builtin/fetch.c:471 +#: builtin/fetch.c:485 msgid "[tag update]" msgstr "[actualització d'etiqueta]" -#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526 +#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 msgid " (unable to update local ref)" msgstr " (incapaç d'actualitzar la referència local)" -#: builtin/fetch.c:491 +#: builtin/fetch.c:505 msgid "[new tag]" msgstr "[etiqueta nova]" -#: builtin/fetch.c:494 +#: builtin/fetch.c:508 msgid "[new branch]" msgstr "[rama nova]" -#: builtin/fetch.c:497 +#: builtin/fetch.c:511 msgid "[new ref]" msgstr "[referència nova]" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "unable to update local ref" msgstr "incapaç d'actualitzar la referència local" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "forced update" msgstr "actualització forçada" -#: builtin/fetch.c:548 +#: builtin/fetch.c:562 msgid "(non-fast-forward)" msgstr "(sense avanç ràpid)" -#: builtin/fetch.c:581 builtin/fetch.c:814 +#: builtin/fetch.c:595 builtin/fetch.c:828 #, c-format msgid "cannot open %s: %s\n" msgstr "no és pot obrir %s: %s\n" -#: builtin/fetch.c:590 +#: builtin/fetch.c:604 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no ha enviat tots els objectes necessaris\n" -#: builtin/fetch.c:608 +#: builtin/fetch.c:622 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "rebutja %s perquè no es permet que els arrels superficials s'actualitzin" -#: builtin/fetch.c:696 builtin/fetch.c:779 +#: builtin/fetch.c:710 builtin/fetch.c:793 #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:707 +#: builtin/fetch.c:721 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" "algunes referències locals no s'han pogut actualitzar;\n" -" intenteu executar 'git remote prune %s' per treure\n" +" intenteu executar 'git remote prune %s' per a treure\n" " qualsevulla rama antiga o conflictiva" -#: builtin/fetch.c:759 +#: builtin/fetch.c:773 #, c-format msgid " (%s will become dangling)" msgstr " (%s es tornarà penjant)" -#: builtin/fetch.c:760 +#: builtin/fetch.c:774 #, c-format msgid " (%s has become dangling)" msgstr " (%s s'ha tornat penjant)" -#: builtin/fetch.c:784 +#: builtin/fetch.c:798 msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:785 builtin/remote.c:1059 +#: builtin/fetch.c:799 builtin/remote.c:1063 msgid "(none)" msgstr "(cap)" -#: builtin/fetch.c:804 +#: builtin/fetch.c:818 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "Refusar obtenir a la rama actual %s d'un repositori no nu" +msgstr "Refusant obtenir en la rama actual %s d'un dipòsit no nu" -#: builtin/fetch.c:823 +#: builtin/fetch.c:837 #, 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:826 +#: builtin/fetch.c:840 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "S'ignora l'opció \"%s\" per a %s\n" -#: builtin/fetch.c:882 +#: builtin/fetch.c:896 #, c-format msgid "Don't know how to fetch from %s" msgstr "No es sap com obtenir de %s" -#: builtin/fetch.c:1044 +#: builtin/fetch.c:1058 #, c-format msgid "Fetching %s\n" msgstr "Obtenint %s\n" -#: builtin/fetch.c:1046 builtin/remote.c:90 +#: builtin/fetch.c:1060 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "No s'ha pogut obtenir %s" -#: builtin/fetch.c:1064 +#: builtin/fetch.c:1078 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -"Cap repositori remot especificat. Si us plau, especifiqueu o un\n" -"URL o un nom remot del qual es deuen obtenir les revisions noves." +"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:1087 +#: builtin/fetch.c:1101 msgid "You need to specify a tag name." msgstr "Necessiteu especificar un nom d'etiqueta." -#: builtin/fetch.c:1131 +#: builtin/fetch.c:1143 msgid "--depth and --unshallow cannot be used together" -msgstr "--depth i --unshallow no es poden utilitzar junts" +msgstr "--depth i --unshallow no es poden usar junts" -#: builtin/fetch.c:1133 +#: builtin/fetch.c:1145 msgid "--unshallow on a complete repository does not make sense" -msgstr "--unshallow en un repositori complet no té sentit" +msgstr "--unshallow en un dipòsit complet no té sentit" -#: builtin/fetch.c:1156 +#: builtin/fetch.c:1168 msgid "fetch --all does not take a repository argument" -msgstr "fetch --all no accepta un paràmetre de repositori" +msgstr "fetch --all no accepta un paràmetre de dipòsit" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1170 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no té sentit amb especificacions de referència" -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1181 #, c-format msgid "No such remote or remote group: %s" -msgstr "Cap remot o grup remot així: %s" +msgstr "No hi ha tal remot ni tal grup remot: %s" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1189 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Obtenir un grup i especificar referències no té sentit" @@ -5267,8 +5429,8 @@ msgstr "" "git fmt-merge-msg [-m <missatge>] [--log[=<n>]|--no-log] [--file <fitxer>]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698 -#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589 +#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590 #: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "n" @@ -5287,168 +5449,172 @@ msgstr "text" #: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" -msgstr "utilitza <text> com inici de missatge" +msgstr "usa <text> com a inici de missatge" #: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "fitxer del qual llegir" -#: builtin/for-each-ref.c:1051 +#: builtin/for-each-ref.c:676 +msgid "unable to parse format" +msgstr "incapaç d'analitzar el format" + +#: builtin/for-each-ref.c:1057 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [opcions] [<patró>]" -#: builtin/for-each-ref.c:1066 +#: builtin/for-each-ref.c:1072 msgid "quote placeholders suitably for shells" msgstr "" "posa els marcadors de posició entre cometes adequades per als terminals" -#: builtin/for-each-ref.c:1068 +#: builtin/for-each-ref.c:1074 msgid "quote placeholders suitably for perl" msgstr "posa els marcadors de posició entre cometes adequades per a perl" -#: builtin/for-each-ref.c:1070 +#: builtin/for-each-ref.c:1076 msgid "quote placeholders suitably for python" msgstr "posa els marcadors de posició entre cometes adequades per a python" -#: builtin/for-each-ref.c:1072 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for tcl" msgstr "posa els marcadors de posició entre cometes adequades per a tcl" -#: builtin/for-each-ref.c:1075 +#: builtin/for-each-ref.c:1081 msgid "show only <n> matched refs" msgstr "mostra només <n> referències coincidents" -#: builtin/for-each-ref.c:1076 builtin/replace.c:435 +#: builtin/for-each-ref.c:1082 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1076 +#: builtin/for-each-ref.c:1082 msgid "format to use for the output" -msgstr "format que utilitzar per a la sortida" +msgstr "format a usar en la sortida" -#: builtin/for-each-ref.c:1077 +#: builtin/for-each-ref.c:1083 msgid "key" msgstr "clau" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1084 msgid "field name to sort on" msgstr "nom de camp en el qual ordenar" -#: builtin/fsck.c:147 builtin/prune.c:172 +#: builtin/fsck.c:147 builtin/prune.c:136 msgid "Checking connectivity" msgstr "Comprovant connectivitat" -#: builtin/fsck.c:538 +#: builtin/fsck.c:540 msgid "Checking object directories" msgstr "Comprovant els directoris d'objecte" -#: builtin/fsck.c:601 +#: builtin/fsck.c:603 msgid "git fsck [options] [<object>...]" msgstr "git fsck [opcions] [<objecte>...]" -#: builtin/fsck.c:607 +#: builtin/fsck.c:609 msgid "show unreachable objects" -msgstr "mostra els objects inabastable" +msgstr "mostra els objectes inabastables" -#: builtin/fsck.c:608 +#: builtin/fsck.c:610 msgid "show dangling objects" msgstr "mostra els objectes penjants" -#: builtin/fsck.c:609 +#: builtin/fsck.c:611 msgid "report tags" msgstr "informa de les etiquetes" -#: builtin/fsck.c:610 +#: builtin/fsck.c:612 msgid "report root nodes" msgstr "informa dels nodes d'arrel" -#: builtin/fsck.c:611 +#: builtin/fsck.c:613 msgid "make index objects head nodes" msgstr "fes els objectes d'índex nodes de cap" -#: builtin/fsck.c:612 +#: builtin/fsck.c:614 msgid "make reflogs head nodes (default)" -msgstr "fes notes de cap de registres de referències (per defecte)" +msgstr "fes que els registres de referències siguin nodes de cap (per defecte)" -#: builtin/fsck.c:613 +#: builtin/fsck.c:615 msgid "also consider packs and alternate objects" msgstr "també considera els paquets i els objectes alternatius" -#: builtin/fsck.c:614 +#: builtin/fsck.c:616 msgid "enable more strict checking" -msgstr "habilita comprovació més estricta" +msgstr "habilita la comprovació més estricta" -#: builtin/fsck.c:616 +#: builtin/fsck.c:618 msgid "write dangling objects in .git/lost-found" msgstr "escriu objectes penjants a .git/lost-found" -#: builtin/fsck.c:617 builtin/prune.c:144 +#: builtin/fsck.c:619 builtin/prune.c:108 msgid "show progress" -msgstr "mostra progrés" +msgstr "mostra el progrés" -#: builtin/fsck.c:667 +#: builtin/fsck.c:669 msgid "Checking objects" -msgstr "Comprovant objectes" +msgstr "Comprovant els objectes" #: builtin/gc.c:24 msgid "git gc [options]" msgstr "git gc [opcions]" -#: builtin/gc.c:91 +#: builtin/gc.c:79 #, c-format -msgid "Invalid %s: '%s'" -msgstr "%s invàlid: '%s'" +msgid "Invalid gc.pruneexpire: '%s'" +msgstr "gc.pruneexpire invàlid: %s" -#: builtin/gc.c:118 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "directori d'objectes increïblement llarga %.*s" -#: builtin/gc.c:287 +#: builtin/gc.c:276 msgid "prune unreferenced objects" msgstr "poda objectes sense referència" -#: builtin/gc.c:289 +#: builtin/gc.c:278 msgid "be more thorough (increased runtime)" msgstr "siguis més exhaustiu (temps d'execució augmentat)" -#: builtin/gc.c:290 +#: builtin/gc.c:279 msgid "enable auto-gc mode" -msgstr "habilita mode de recollida d'escombraries automàtica" +msgstr "habilita el mode de recollida d'escombraries automàtica" -#: builtin/gc.c:291 +#: builtin/gc.c:280 msgid "force running gc even if there may be another gc running" -msgstr "força l'execució de gc encara que hi pugui haver altre gc executant" +msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant" -#: builtin/gc.c:332 +#: builtin/gc.c:321 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -"Empaquetant automàticament el repositori en el fons per rendiment optim.\n" +"Empaquetant automàticament el dipòsit en el fons per rendiment òptim.\n" -#: builtin/gc.c:334 +#: builtin/gc.c:323 #, c-format msgid "Auto packing the repository for optimum performance.\n" -msgstr "Empaquetant automàticament el repositori per rendiment optim.\n" +msgstr "Empaquetant automàticament el dipòsit per rendiment òptim.\n" -#: builtin/gc.c:335 +#: builtin/gc.c:324 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Veu \"git help gc\" per neteja manual.\n" -#: builtin/gc.c:353 +#: builtin/gc.c:342 #, 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> (utilitzeu --force si " -"no)" +"gc ja està executant en la màquina '%s' pid %<PRIuMAX> (useu --force si no)" -#: builtin/gc.c:375 +#: builtin/gc.c:364 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -"Hi ha massa objectes solts inabastables; executeu 'git prune' per treure'ls." +"Hi ha massa objectes solts inabastables; executeu 'git prune' per a " +"treure'ls." #: builtin/grep.c:23 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" @@ -5457,7 +5623,7 @@ msgstr "git grep [opcions] [-e] <patró> [<revisió>...] [[--] <ruta>...]" #: builtin/grep.c:218 #, c-format msgid "grep: failed to create thread: %s" -msgstr "grep: s'ha fallat al crear fil: %s" +msgstr "grep: s'ha fallat en crear fil: %s" #: builtin/grep.c:441 builtin/grep.c:476 #, c-format @@ -5509,7 +5675,7 @@ msgstr "coincideix amb els patrons només als límits de paraula" #: builtin/grep.c:653 msgid "process binary files as text" -msgstr "processa els fitxers binaris com text" +msgstr "processa els fitxers binaris com a text" #: builtin/grep.c:655 msgid "don't match patterns in binary files" @@ -5521,23 +5687,23 @@ msgstr "processa els fitxers binaris amb filtres de textconv" #: builtin/grep.c:660 msgid "descend at most <depth> levels" -msgstr "descendeix al màxim <profunditat> nivells" +msgstr "descendeix com a màxim <profunditat> nivells" #: builtin/grep.c:664 msgid "use extended POSIX regular expressions" -msgstr "utilitza expressions regulars POSIX esteses" +msgstr "usa les expressions regulars POSIX esteses" #: builtin/grep.c:667 msgid "use basic POSIX regular expressions (default)" -msgstr "utilitza expressions regulars POSIX bàsiques (per defecte)" +msgstr "usa les expressions regulars POSIX bàsiques (per defecte)" #: builtin/grep.c:670 msgid "interpret patterns as fixed strings" -msgstr "interpreta els patrons com cadenes fixades" +msgstr "interpreta els patrons com a cadenes fixades" #: builtin/grep.c:673 msgid "use Perl-compatible regular expressions" -msgstr "utilitza expressions regulars compatibles amb Perl" +msgstr "usa les expressions regulars compatibles amb Perl" #: builtin/grep.c:676 msgid "show line numbers" @@ -5553,7 +5719,7 @@ msgstr "mostra els noms de fitxer" #: builtin/grep.c:680 msgid "show filenames relative to top directory" -msgstr "mostra els noms de fitxer relatiu al directori superior" +msgstr "mostra els noms de fitxer relatius al directori superior" #: builtin/grep.c:682 msgid "show only filenames instead of matching lines" @@ -5627,7 +5793,7 @@ msgstr "combina els patrons especificats amb -e" #: builtin/grep.c:729 msgid "indicate hit with exit status without output" -msgstr "indica coincidència amb estat de sortida sense sortida de text" +msgstr "indica coincidència amb estat de sortida sense sortida textual" #: builtin/grep.c:731 msgid "show only matches from files that match all patterns" @@ -5665,22 +5831,21 @@ msgstr "--open-files-in-pager només funciona en l'arbre de treball" #: builtin/grep.c:892 msgid "--cached or --untracked cannot be used with --no-index." -msgstr "--cached o --untracked no es pot utilitzar amb --no-index." +msgstr "--cached o --untracked no es pot usar amb --no-index." #: builtin/grep.c:897 msgid "--no-index or --untracked cannot be used with revs." -msgstr "--no-index o --untracked no es poden utilitzar amb revisions." +msgstr "--no-index o --untracked no es pot usar amb revisions." #: builtin/grep.c:900 msgid "--[no-]exclude-standard cannot be used for tracked contents." -msgstr "" -"--[no-]exclude-standard no es pot utilitzar per als continguts seguits." +msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits." #: builtin/grep.c:908 msgid "both --cached and trees are given." -msgstr "s'ha donat ambdós --caches i arbres." +msgstr "s'han donat ambdós --caches i arbres." -#: builtin/hash-object.c:60 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." @@ -5688,31 +5853,38 @@ msgstr "" "git hash-object [-t <tipus>] [-w] [--path=<fitxer>|--no-filters] [--stdin] " "[--] <fitxer>..." -#: builtin/hash-object.c:61 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <llista-de-rutes>" -#: builtin/hash-object.c:72 builtin/tag.c:609 +#: builtin/hash-object.c:94 builtin/tag.c:610 msgid "type" msgstr "tipus" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:94 msgid "object type" msgstr "tipus d'objecte" -#: builtin/hash-object.c:73 +#: builtin/hash-object.c:95 msgid "write the object into the object database" -msgstr "escriu l'objecte al base de dades d'objectes" +msgstr "escriu l'objecte a la base de dades d'objectes" -#: builtin/hash-object.c:74 +#: builtin/hash-object.c:97 msgid "read the object from stdin" -msgstr "llegiu l'objecte des de stdin" +msgstr "llegiu l'objecte des d'stdin" -#: builtin/hash-object.c:76 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "emmagatzema el fitxer tal com és sense filtres" -#: builtin/hash-object.c:77 +#: builtin/hash-object.c:100 +msgid "" +"just hash any random garbage to create corrupt objects for debugging Git" +msgstr "" +"només sumar qualsevulla brossa aleatòria per a crear objectes corruptes per " +"a depurar al Git" + +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "processa el fitxer com si fos d'aquesta ruta" @@ -5745,78 +5917,82 @@ msgstr "git help [--all] [--guides] [--man|--web|--info] [ordre]" msgid "unrecognized help format '%s'" msgstr "format d'ajuda no reconegut '%s'" -#: builtin/help.c:92 +#: builtin/help.c:91 msgid "Failed to start emacsclient." -msgstr "S'ha fallat al iniciar emacsclient." +msgstr "S'ha fallat en iniciar emacsclient." -#: builtin/help.c:105 +#: builtin/help.c:104 msgid "Failed to parse emacsclient version." -msgstr "S'ha fallat al analitzar la versió d'emacsclint." +msgstr "S'ha fallat en analitzar la versió d'emacsclint." -#: builtin/help.c:113 +#: builtin/help.c:112 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la versió d'emacsclient '%d' és massa vella (< 22)." -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 #, c-format msgid "failed to exec '%s': %s" -msgstr "s'ha fallat al executar '%s': %s" +msgstr "s'ha fallat en executar '%s': %s" -#: builtin/help.c:216 +#: builtin/help.c:215 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -"'%s': ruta d'un visualitzador de manuals no suportat.\n" -"Si us plau, considereu utilitzar 'man.<tool>.cmd' en lloc." +"'%s': ruta a un visualitzador de manuals no suportat.\n" +"Si us plau, considereu usar 'man.<eine>.cmd' en lloc." -#: builtin/help.c:228 +#: builtin/help.c:227 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" "'%s': ordre per un visualitzador de manuals suportat.\n" -"Si us plau, considereu utilitzar 'man.<tool>.path' en lloc." +"Si us plau, considereu usar 'man.<eine>.path' en lloc." -#: builtin/help.c:353 +#: builtin/help.c:352 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': visualitzador de manuals desconegut" -#: builtin/help.c:370 +#: builtin/help.c:369 msgid "no man viewer handled the request" msgstr "cap visualitzador de manuals ha manejat la sol·licitud" -#: builtin/help.c:378 +#: builtin/help.c:377 msgid "no info viewer handled the request" msgstr "cap visualitzador d'informació ha manejat la sol·licitud" -#: builtin/help.c:424 +#: builtin/help.c:423 msgid "Defining attributes per path" msgstr "La definició d'atributs per ruta" +#: builtin/help.c:424 +msgid "Everyday Git With 20 Commands Or So" +msgstr "Git quotidià amb més o menys 20 ordres" + #: builtin/help.c:425 msgid "A Git glossary" msgstr "Un glossari de Git" #: builtin/help.c:426 msgid "Specifies intentionally untracked files to ignore" -msgstr "Especifica fitxers intencionalment no seguits que ignorar" +msgstr "Especifica els fitxers intencionalment no seguits a ignorar" #: builtin/help.c:427 msgid "Defining submodule properties" -msgstr "La definició dels propietats de submòduls" +msgstr "La definició de les propietats de submòduls" #: builtin/help.c:428 msgid "Specifying revisions and ranges for Git" -msgstr "L'especificació de revisions i rangs per a Git" +msgstr "L'especificació de revisions i rangs per al Git" #: builtin/help.c:429 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" -msgstr "Una introducció tutorial a Git (per a la versió 1.5.1 o més nou)" +msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nou)" #: builtin/help.c:430 msgid "An overview of recommended workflows with Git" @@ -5836,293 +6012,293 @@ msgstr "ús: %s%s" msgid "`git %s' is aliased to `%s'" msgstr "`git %s' és àlies a `%s'" -#: builtin/index-pack.c:145 +#: builtin/index-pack.c:150 #, c-format msgid "unable to open %s" msgstr "incapaç d'obrir %s" -#: builtin/index-pack.c:191 +#: builtin/index-pack.c:200 #, c-format msgid "object type mismatch at %s" -msgstr "discordança de tipus d'objecte a %s" +msgstr "hi ha una discordança de tipus d'objecte a %s" -#: builtin/index-pack.c:211 +#: builtin/index-pack.c:220 #, c-format msgid "did not receive expected object %s" msgstr "no s'ha rebut l'objecte esperat %s" -#: builtin/index-pack.c:214 +#: builtin/index-pack.c:223 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objecte %s: tipus %s esperat, %s trobat" -#: builtin/index-pack.c:256 +#: builtin/index-pack.c:265 #, 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:266 +#: builtin/index-pack.c:275 msgid "early EOF" msgstr "EOF aviat" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:276 msgid "read error on input" msgstr "error de lectura d'entrada" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:288 msgid "used more bytes than were available" -msgstr "més octets utilitzats que estaven disponibles" +msgstr "s'han usat més octets que estaven disponibles" -#: builtin/index-pack.c:286 +#: builtin/index-pack.c:295 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:302 +#: builtin/index-pack.c:311 #, c-format msgid "unable to create '%s'" msgstr "no es pot crear '%s'" -#: builtin/index-pack.c:307 +#: builtin/index-pack.c:316 #, c-format msgid "cannot open packfile '%s'" msgstr "no es pot obrir el fitxer de paquet '%s'" -#: builtin/index-pack.c:321 +#: builtin/index-pack.c:330 msgid "pack signature mismatch" -msgstr "discordança de firma de paquet" +msgstr "hi ha una discordança de firma de paquet" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:332 #, c-format msgid "pack version %<PRIu32> unsupported" -msgstr "versió de paquet %<PRIu32> no suportada" +msgstr "la versió de paquet %<PRIu32> no es suporta" -#: builtin/index-pack.c:341 +#: builtin/index-pack.c:350 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "el paquet té un objecte dolent a desplaçament %lu: %s" -#: builtin/index-pack.c:462 +#: builtin/index-pack.c:471 #, c-format msgid "inflate returned %d" msgstr "la inflació ha retornat %d" -#: builtin/index-pack.c:511 +#: builtin/index-pack.c:520 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:519 +#: builtin/index-pack.c:528 msgid "delta base offset is out of bound" -msgstr "desplaçament de base de delta està fora de límits" +msgstr "el desplaçament de base de delta està fora de límits" -#: builtin/index-pack.c:527 +#: builtin/index-pack.c:536 #, c-format msgid "unknown object type %d" msgstr "tipus d'objecte desconegut %d" -#: builtin/index-pack.c:558 +#: builtin/index-pack.c:567 msgid "cannot pread pack file" -msgstr "no es pot fer pread en en fitxer de paquet" +msgstr "no es pot fer pread en el fitxer de paquet" -#: builtin/index-pack.c:560 +#: builtin/index-pack.c:569 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "fin prematur de fitxer de paquet, manca %lu octet" msgstr[1] "fin prematur de fitxer de paquet, manquen %lu octets" -#: builtin/index-pack.c:586 +#: builtin/index-pack.c:595 msgid "serious inflate inconsistency" -msgstr "inconsistència d'inflació seria" +msgstr "hi ha una inconsistència seria d'inflació" -#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706 -#: builtin/index-pack.c:740 builtin/index-pack.c:749 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" -msgstr "COL·LISIÓ SHA1 TROBAT AMB %s !" +msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#: builtin/index-pack.c:680 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:689 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "incapaç de llegir %s" -#: builtin/index-pack.c:746 +#: builtin/index-pack.c:755 #, c-format msgid "cannot read existing object %s" msgstr "no es pot llegir l'objecte existent %s" -#: builtin/index-pack.c:760 +#: builtin/index-pack.c:769 #, c-format msgid "invalid blob object %s" msgstr "objecte de blob invàlid %s" -#: builtin/index-pack.c:774 +#: builtin/index-pack.c:783 #, c-format msgid "invalid %s" msgstr "%s invàlid" -#: builtin/index-pack.c:777 +#: builtin/index-pack.c:787 msgid "Error in object" msgstr "Error en objecte" -#: builtin/index-pack.c:779 +#: builtin/index-pack.c:789 #, 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:851 builtin/index-pack.c:881 +#: builtin/index-pack.c:861 builtin/index-pack.c:890 msgid "failed to apply delta" -msgstr "s'ha fallat al aplicar delta" +msgstr "s'ha fallat en aplicar la delta" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Receiving objects" msgstr "Rebent objectes" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Indexing objects" msgstr "Indexant objectes" -#: builtin/index-pack.c:1048 +#: builtin/index-pack.c:1081 msgid "pack is corrupted (SHA1 mismatch)" msgstr "el paquet és corromput (discordança SHA1)" -#: builtin/index-pack.c:1053 +#: builtin/index-pack.c:1086 msgid "cannot fstat packfile" -msgstr "no es pot fer fstat en en fitxer de paquet" +msgstr "no es pot fer fstat en el fitxer de paquet" -#: builtin/index-pack.c:1056 +#: builtin/index-pack.c:1089 msgid "pack has junk at the end" -msgstr "el paquet té brossa al final" +msgstr "el paquet té brossa al seu fin" -#: builtin/index-pack.c:1067 +#: builtin/index-pack.c:1100 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusió més enllà de la insanitat en parse_pack_objects()" -#: builtin/index-pack.c:1090 +#: builtin/index-pack.c:1123 msgid "Resolving deltas" msgstr "Resolent les deltes" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1133 #, c-format msgid "unable to create thread: %s" msgstr "incapaç de crear fil: %s" -#: builtin/index-pack.c:1142 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity" msgstr "confusió més enllà de la insanitat" -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1181 #, c-format msgid "completed with %d local objects" -msgstr "terminat amb %d objectes locals" +msgstr "s'ha terminat amb %d objectes locals" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1191 #, 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:1164 +#: builtin/index-pack.c:1195 #, 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:1189 +#: builtin/index-pack.c:1220 #, c-format msgid "unable to deflate appended object (%d)" msgstr "incapaç de desinflar l'objecte annexat (%d)" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1299 #, c-format msgid "local object %s is corrupt" msgstr "l'objecte local %s és corrupte" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1323 msgid "error while closing pack file" -msgstr "error al tancar el fitxer de paquet" +msgstr "error en tancar el fitxer de paquet" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1336 #, c-format msgid "cannot write keep file '%s'" -msgstr "no es pot escriure el fitxer que retenir '%s'" +msgstr "no es pot escriure el fitxer a retenir '%s'" -#: builtin/index-pack.c:1313 +#: builtin/index-pack.c:1344 #, c-format msgid "cannot close written keep file '%s'" -msgstr "no es pot tancar el fitxer que retenir escrit '%s'" +msgstr "no es pot tancar el fitxer escrit a retenir '%s'" -#: builtin/index-pack.c:1326 +#: builtin/index-pack.c:1357 msgid "cannot store pack file" msgstr "no es pot emmagatzemar el fitxer de paquet" -#: builtin/index-pack.c:1337 +#: builtin/index-pack.c:1368 msgid "cannot store index file" msgstr "no es pot emmagatzemar el fitxer d'índex" -#: builtin/index-pack.c:1370 +#: builtin/index-pack.c:1401 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> dolent" -#: builtin/index-pack.c:1376 +#: builtin/index-pack.c:1407 #, c-format msgid "invalid number of threads specified (%d)" -msgstr "nombre de fils invàlid especificat (%d)" +msgstr "s'ha especificat un nombre de fils invàlid (%d)" -#: builtin/index-pack.c:1380 builtin/index-pack.c:1559 +#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 #, c-format msgid "no threads support, ignoring %s" -msgstr "cap suport de fils, ignorant %s" +msgstr "no hi ha suport de fils, ignorant %s" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1469 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No es pot obrir el fitxer de paquet existent '%s'" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1471 #, 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:1487 +#: builtin/index-pack.c:1518 #, 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:1494 +#: builtin/index-pack.c:1525 #, 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:1523 +#: builtin/index-pack.c:1554 msgid "Cannot come back to cwd" msgstr "No es pot tornar al directori de treball actual" -#: builtin/index-pack.c:1571 builtin/index-pack.c:1574 -#: builtin/index-pack.c:1586 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 +#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 #, c-format msgid "bad %s" msgstr "%s dolent" -#: builtin/index-pack.c:1604 +#: builtin/index-pack.c:1635 msgid "--fix-thin cannot be used without --stdin" -msgstr "--fix-thin no es pot utilitzar sense --stdin" +msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/index-pack.c:1608 builtin/index-pack.c:1617 +#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "el nom de fitxer de paquet '%s' no termina amb '.pack'" -#: builtin/index-pack.c:1625 +#: builtin/index-pack.c:1656 msgid "--verify with no packfile name given" -msgstr "--verify donat sense nom de fitxer de paquet" +msgstr "s'ha donat --verify sense nom de fitxer de paquet" #: builtin/init-db.c:35 #, c-format @@ -6177,12 +6353,12 @@ msgstr "ignorant la plantilla %s" #: builtin/init-db.c:133 #, c-format msgid "insanely long template path %s" -msgstr "enllaç ruta de plantilla %s" +msgstr "ruta de plantilla insanament llarg %s" #: builtin/init-db.c:141 #, c-format msgid "templates not found %s" -msgstr "plantilles no trobades %s" +msgstr "no s'han trobat les plantilles %s" #: builtin/init-db.c:154 #, c-format @@ -6215,25 +6391,21 @@ msgstr "incapaç de moure %s a %s" #: builtin/init-db.c:418 #, c-format msgid "%s%s Git repository in %s%s\n" -msgstr "%s%s repositori de Git en %s%s\n" +msgstr "%s%s dipòsit de Git en %s%s\n" #: builtin/init-db.c:419 msgid "Reinitialized existing" -msgstr "Reinicialitzat existent" +msgstr "S'ha reinicialitzat un existent" #: builtin/init-db.c:419 msgid "Initialized empty" -msgstr "Inicialitzat buit" +msgstr "S'ha inicialitzat un buit" #: builtin/init-db.c:420 msgid " shared" msgstr " compartit" -#: builtin/init-db.c:439 -msgid "cannot tell cwd" -msgstr "no es pot determinar el directori de treball actual" - -#: builtin/init-db.c:465 +#: builtin/init-db.c:467 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [directory]" @@ -6241,30 +6413,29 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--" "shared[=<permisos>]] [directori]" -#: builtin/init-db.c:488 +#: builtin/init-db.c:490 msgid "permissions" msgstr "permisos" -#: builtin/init-db.c:489 +#: builtin/init-db.c:491 msgid "specify that the git repository is to be shared amongst several users" -msgstr "" -"especifica que el repositori de git es compartirà entre diversos usuaris" +msgstr "especifica que el dipòsit de git es compartirà entre diversos usuaris" -#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172 +#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172 msgid "be quiet" msgstr "calla" -#: builtin/init-db.c:523 builtin/init-db.c:528 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "no es pot mkdir %s" -#: builtin/init-db.c:532 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "no es pot chdir a %s" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6273,15 +6444,31 @@ msgstr "" "no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-" "dir=<directori>)" -#: builtin/init-db.c:578 -msgid "Cannot access current working directory" -msgstr "No es pot accedir al directori de treball corrent" - -#: builtin/init-db.c:585 +#: builtin/init-db.c:583 #, c-format msgid "Cannot access work tree '%s'" msgstr "No es pot accedir al arbre de treball '%s'" +#: builtin/interpret-trailers.c:15 +msgid "" +"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " +"[<file>...]" +msgstr "" +"git interpret-trailers [--trim-empty] [(--trailer <fitxa>[(=|:)<valor>])...] " +"[<fitxer>...]" + +#: builtin/interpret-trailers.c:25 +msgid "trim empty trailers" +msgstr "escurça els remolcs buits" + +#: builtin/interpret-trailers.c:26 +msgid "trailer" +msgstr "remolc" + +#: builtin/interpret-trailers.c:27 +msgid "trailer(s) to add" +msgstr "remolcs a afegir" + #: builtin/log.c:41 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "git log [<opcions>] [<rang de revisions>] [[--] <ruta>...]\n" @@ -6290,6 +6477,11 @@ msgstr "git log [<opcions>] [<rang de revisions>] [[--] <ruta>...]\n" msgid " or: git show [options] <object>..." msgstr " o: git show [opcions] <objecte>..." +#: builtin/log.c:81 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "opció --decorate invàlida: %s" + #: builtin/log.c:127 msgid "suppress diff output" msgstr "omet la sortida de diferències" @@ -6300,247 +6492,256 @@ msgstr "mostra el fons" #: builtin/log.c:129 msgid "Use mail map file" -msgstr "Utilitza fitxer de mapa de correu" +msgstr "Usa el fitxer de mapa de correu" #: builtin/log.c:130 msgid "decorate options" msgstr "opcions de decoració" +#: builtin/log.c:133 +msgid "Process line range n,m in file, counting from 1" +msgstr "Processa el rang de línies n,m en el fitxer, comptant des de 1" + #: builtin/log.c:229 #, c-format msgid "Final output: %d %s\n" msgstr "Sortida final: %d %s\n" -#: builtin/log.c:470 builtin/log.c:562 +#: builtin/log.c:458 +#, c-format +msgid "git show %s: bad file" +msgstr "git show %s: fitxer dolent" + +#: builtin/log.c:472 builtin/log.c:564 #, c-format msgid "Could not read object %s" msgstr "No es pot llegir l'objecte %s" -#: builtin/log.c:586 +#: builtin/log.c:588 #, c-format msgid "Unknown type: %d" msgstr "Tipus desconegut: %d" -#: builtin/log.c:687 +#: builtin/log.c:689 msgid "format.headers without value" msgstr "format.headers sense valor" -#: builtin/log.c:771 +#: builtin/log.c:773 msgid "name of output directory is too long" msgstr "el nom del directori de sortida és massa llarg" -#: builtin/log.c:787 +#: builtin/log.c:789 #, c-format msgid "Cannot open patch file %s" msgstr "No es pot obrir el fitxer de pedaç %s" -#: builtin/log.c:801 +#: builtin/log.c:803 msgid "Need exactly one range." msgstr "Cal exactament un rang." -#: builtin/log.c:809 +#: builtin/log.c:811 msgid "Not a range." msgstr "No és un rang." -#: builtin/log.c:916 +#: builtin/log.c:919 msgid "Cover letter needs email format" msgstr "La carta de presentació necessita el format de correu electrònic" -#: builtin/log.c:995 +#: builtin/log.c:998 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to boig: %s" -#: builtin/log.c:1023 +#: builtin/log.c:1026 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [opcions] [<des de> | <rang de revisions>]" -#: builtin/log.c:1068 +#: builtin/log.c:1071 msgid "Two output directories?" msgstr "Dos directoris de sortida?" -#: builtin/log.c:1183 +#: builtin/log.c:1186 msgid "use [PATCH n/m] even with a single patch" -msgstr "utilitza [PATCH n/m] encara amb un pedaç solter" +msgstr "usa [PATCH n/m] encara amb un pedaç solter" -#: builtin/log.c:1186 +#: builtin/log.c:1189 msgid "use [PATCH] even with multiple patches" -msgstr "utilitza [PATCH] encara amb múltiples pedaços" +msgstr "usa [PATCH] encara amb múltiples pedaços" -#: builtin/log.c:1190 +#: builtin/log.c:1193 msgid "print patches to standard out" -msgstr "imprimeix els pedaços al sortida estàndard" +msgstr "imprimeix els pedaços a la sortida estàndard" -#: builtin/log.c:1192 +#: builtin/log.c:1195 msgid "generate a cover letter" msgstr "genera una carta de presentació" -#: builtin/log.c:1194 +#: builtin/log.c:1197 msgid "use simple number sequence for output file names" -msgstr "utilitza una seqüència de números per als noms dels fitxers de sortida" +msgstr "usa una seqüència de números per als noms dels fitxers de sortida" -#: builtin/log.c:1195 +#: builtin/log.c:1198 msgid "sfx" msgstr "sufix" -#: builtin/log.c:1196 +#: builtin/log.c:1199 msgid "use <sfx> instead of '.patch'" -msgstr "utilitza <sufix> en lloc de '.patch'" +msgstr "usa <sufix> en lloc de '.patch'" -#: builtin/log.c:1198 +#: builtin/log.c:1201 msgid "start numbering patches at <n> instead of 1" msgstr "comença nombrant els pedaços a <n> en lloc d'1" -#: builtin/log.c:1200 +#: builtin/log.c:1203 msgid "mark the series as Nth re-roll" -msgstr "marca la sèrie com la Nª llançada" +msgstr "marca la sèrie com a la Nª llançada" -#: builtin/log.c:1202 +#: builtin/log.c:1205 msgid "Use [<prefix>] instead of [PATCH]" -msgstr "Utilitza [<prefix>] en lloc de [PATCH]" +msgstr "Usa [<prefix>] en lloc de [PATCH]" -#: builtin/log.c:1205 +#: builtin/log.c:1208 msgid "store resulting files in <dir>" msgstr "emmagatzema els fitxers resultants en <directori>" -#: builtin/log.c:1208 +#: builtin/log.c:1211 msgid "don't strip/add [PATCH]" msgstr "no despullis/afegeixis [PATCH]" -#: builtin/log.c:1211 +#: builtin/log.c:1214 msgid "don't output binary diffs" msgstr "no emetis diferències binàries" -#: builtin/log.c:1213 +#: builtin/log.c:1216 msgid "don't include a patch matching a commit upstream" -msgstr "no incloguis un pedaç que coincideixi amb una comissió a la font" +msgstr "no incloguis pedaços que coincideixin amb comissions a la font" -#: builtin/log.c:1215 +#: builtin/log.c:1218 msgid "show patch format instead of default (patch + stat)" msgstr "" "mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)" -#: builtin/log.c:1217 +#: builtin/log.c:1220 msgid "Messaging" msgstr "Missatgeria" -#: builtin/log.c:1218 +#: builtin/log.c:1221 msgid "header" msgstr "capçalera" -#: builtin/log.c:1219 +#: builtin/log.c:1222 msgid "add email header" -msgstr "afegeix capçalera de correu electrònic" +msgstr "afegeix una capçalera de correu electrònic" -#: builtin/log.c:1220 builtin/log.c:1222 +#: builtin/log.c:1223 builtin/log.c:1225 msgid "email" msgstr "correu electrònic" -#: builtin/log.c:1220 +#: builtin/log.c:1223 msgid "add To: header" -msgstr "afegeix capçalera To:" +msgstr "afegeix la capçalera To:" -#: builtin/log.c:1222 +#: builtin/log.c:1225 msgid "add Cc: header" -msgstr "afegeix capçalera Cc:" +msgstr "afegeix la capçalera Cc:" -#: builtin/log.c:1224 +#: builtin/log.c:1227 msgid "ident" msgstr "identitat" -#: builtin/log.c:1225 +#: builtin/log.c:1228 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "estableix l'adreça From a <identitat> (o la identitat del comitent si absent)" -#: builtin/log.c:1227 +#: builtin/log.c:1230 msgid "message-id" msgstr "ID de missatge" -#: builtin/log.c:1228 +#: builtin/log.c:1231 msgid "make first mail a reply to <message-id>" msgstr "fes el primer missatge una resposta a <ID de missatge>" -#: builtin/log.c:1229 builtin/log.c:1232 +#: builtin/log.c:1232 builtin/log.c:1235 msgid "boundary" msgstr "límit" -#: builtin/log.c:1230 +#: builtin/log.c:1233 msgid "attach the patch" msgstr "ajunta el pedaç" -#: builtin/log.c:1233 +#: builtin/log.c:1236 msgid "inline the patch" msgstr "posa el pedaç en el cos" -#: builtin/log.c:1237 +#: builtin/log.c:1240 msgid "enable message threading, styles: shallow, deep" msgstr "habilita l'enfilada de missatges, estils: shallow, deep" -#: builtin/log.c:1239 +#: builtin/log.c:1242 msgid "signature" msgstr "firma" -#: builtin/log.c:1240 +#: builtin/log.c:1243 msgid "add a signature" msgstr "afegeix una firma" -#: builtin/log.c:1242 +#: builtin/log.c:1245 msgid "add a signature from a file" msgstr "afegeix una firma des d'un fitxer" -#: builtin/log.c:1243 +#: builtin/log.c:1246 msgid "don't print the patch filenames" msgstr "no imprimeixis els noms de fitxer del pedaç" -#: builtin/log.c:1317 +#: builtin/log.c:1320 #, c-format msgid "invalid ident line: %s" msgstr "línia d'identitat invàlida: %s" -#: builtin/log.c:1332 +#: builtin/log.c:1335 msgid "-n and -k are mutually exclusive." msgstr "-n i -k són mutualment exclusius." -#: builtin/log.c:1334 +#: builtin/log.c:1337 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix i -k són mutualment exclusius." -#: builtin/log.c:1342 +#: builtin/log.c:1345 msgid "--name-only does not make sense" msgstr "--name-only no té sentit" -#: builtin/log.c:1344 +#: builtin/log.c:1347 msgid "--name-status does not make sense" msgstr "--name-status no té sentit" -#: builtin/log.c:1346 +#: builtin/log.c:1349 msgid "--check does not make sense" msgstr "--check no té sentit" -#: builtin/log.c:1369 +#: builtin/log.c:1372 msgid "standard output, or directory, which one?" -msgstr "sortida estàndard, o directori, qual?" +msgstr "sortida estàndard, o directori, qual dels dos?" -#: builtin/log.c:1371 +#: builtin/log.c:1374 #, c-format msgid "Could not create directory '%s'" msgstr "No s'ha pogut crear el directori '%s'" -#: builtin/log.c:1468 +#: builtin/log.c:1472 #, c-format msgid "unable to read signature file '%s'" msgstr "incapaç de llegir el fitxer de firma '%s'" -#: builtin/log.c:1531 +#: builtin/log.c:1535 msgid "Failed to create output files" -msgstr "S'ha fallat al crear fitxers de sortida" +msgstr "S'ha fallat en crear els fitxers de sortida" -#: builtin/log.c:1579 +#: builtin/log.c:1583 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]" -#: builtin/log.c:1634 +#: builtin/log.c:1638 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -6548,7 +6749,7 @@ msgstr "" "No s'ha pogut trobar una rama remota seguida, si us plau, especifiqueu " "<font> manualment.\n" -#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661 +#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 #, c-format msgid "Unknown commit %s" msgstr "Comissió desconeguda %s" @@ -6563,7 +6764,7 @@ msgstr "identifica l'estat de fitxer amb etiquetes" #: builtin/ls-files.c:460 msgid "use lowercase letters for 'assume unchanged' files" -msgstr "utilitza lletres minúscules per als fitxers 'assume unchanged'" +msgstr "usa lletres minúscules per als fitxers 'assume unchanged'" #: builtin/ls-files.c:462 msgid "show cached files in the output (default)" @@ -6594,12 +6795,12 @@ msgid "show files on the filesystem that need to be removed" msgstr "mostra els fitxers en el sistema de fitxers que s'han de treure" #: builtin/ls-files.c:477 -msgid "show 'other' directories' name only" +msgid "show 'other' directories' names only" msgstr "mostra només els noms dels directoris 'other'" #: builtin/ls-files.c:480 msgid "don't show empty directories" -msgstr "no mostris directoris buits" +msgstr "no mostris els directoris buits" #: builtin/ls-files.c:483 msgid "show unmerged files in the output" @@ -6619,7 +6820,7 @@ msgstr "els patrons d'exclusió es llegeixen de <fitxer>" #: builtin/ls-files.c:493 msgid "read additional per-directory exclude patterns in <file>" -msgstr "llegeix els patrons d'exclusió per directori addicionals en <fitxer>" +msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>" #: builtin/ls-files.c:495 msgid "add the standard git exclusions" @@ -6631,7 +6832,7 @@ msgstr "fes que la sortida sigui relativa al directori superior del project" #: builtin/ls-files.c:501 msgid "if any <file> is not in the index, treat this as an error" -msgstr "si qualsevol <fitxer> no està en l'índex, tracta això com error" +msgstr "si qualsevol <fitxer> no és en l'índex, tracta això com a error" #: builtin/ls-files.c:502 msgid "tree-ish" @@ -6640,11 +6841,11 @@ msgstr "arbre" #: builtin/ls-files.c:503 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -"pretenguis que les rutes tretes deprés de <arbre> encara estiguin presents" +"pretenguis que les rutes tretes després de <arbre> encara estiguin presents" #: builtin/ls-files.c:505 msgid "show debugging data" -msgstr "mostra dades de depuració" +msgstr "mostra les dades de depuració" #: builtin/ls-tree.c:28 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" @@ -6656,7 +6857,7 @@ msgstr "mostra només els arbres" #: builtin/ls-tree.c:128 msgid "recurse into subtrees" -msgstr "recursa a subarbres" +msgstr "recursa als subarbres" #: builtin/ls-tree.c:130 msgid "show trees when recursing" @@ -6672,110 +6873,110 @@ msgstr "mida de l'objecte d'inclusió" #: builtin/ls-tree.c:136 builtin/ls-tree.c:138 msgid "list only filenames" -msgstr "llista només noms de fitxer" +msgstr "llista només els noms de fitxer" #: builtin/ls-tree.c:141 msgid "use full path names" -msgstr "utilitza noms de ruta compets" +msgstr "usa els noms de ruta complets" #: builtin/ls-tree.c:143 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "llista l'arbre enter; no sol el directori actual (implica --full-name)" -#: builtin/merge.c:43 +#: builtin/merge.c:44 msgid "git merge [options] [<commit>...]" msgstr "git merge [opcions] [<comissió>...]" -#: builtin/merge.c:44 +#: builtin/merge.c:45 msgid "git merge [options] <msg> HEAD <commit>" msgstr "git merge [opcions] <missatge> HEAD <comissió>" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:98 +#: builtin/merge.c:99 msgid "switch `m' requires a value" msgstr "l'opció `m' requereix un valor" -#: builtin/merge.c:135 +#: builtin/merge.c:136 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No s'ha pogut trobar l'estratègia de fusió '%s'.\n" -#: builtin/merge.c:136 +#: builtin/merge.c:137 #, c-format msgid "Available strategies are:" msgstr "Les estratègies disponibles són:" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "Available custom strategies are:" msgstr "Les estratègies personalitzades disponibles són:" -#: builtin/merge.c:191 +#: builtin/merge.c:192 msgid "do not show a diffstat at the end of the merge" msgstr "no mostris les estadístiques de diferència al final de la fusió" -#: builtin/merge.c:194 +#: builtin/merge.c:195 msgid "show a diffstat at the end of the merge" msgstr "mostra les estadístiques de diferència al final de la fusió" -#: builtin/merge.c:195 +#: builtin/merge.c:196 msgid "(synonym to --stat)" msgstr "(sinònim de --stat)" -#: builtin/merge.c:197 +#: builtin/merge.c:198 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -"afegeix (com màxim <n>) entrades del registre curt per fusionar el missatge " -"de comissió" +"afegeix (com a màxim <n>) entrades del registre curt per a fusionar el " +"missatge de comissió" -#: builtin/merge.c:200 +#: builtin/merge.c:201 msgid "create a single commit instead of doing a merge" msgstr "crea una comissió soltera en lloc de fusionar" -#: builtin/merge.c:202 +#: builtin/merge.c:203 msgid "perform a commit if the merge succeeds (default)" msgstr "realitza una comissió si la fusió té èxit (per defecte)" -#: builtin/merge.c:204 +#: builtin/merge.c:205 msgid "edit message before committing" msgstr "edita el missatge abans de cometre" -#: builtin/merge.c:205 +#: builtin/merge.c:206 msgid "allow fast-forward (default)" msgstr "permet l'avanç ràpid (per defecte)" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "abort if fast-forward is not possible" msgstr "avorta si l'avanç ràpid no és possible" -#: builtin/merge.c:211 +#: builtin/merge.c:212 msgid "Verify that the named commit has a valid GPG signature" -msgstr "Verifica que la comissió anomenada té una firma GPG vàlida" +msgstr "Verifica que la comissió anomenada tingui una firma GPG vàlida" -#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89 +#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89 msgid "strategy" msgstr "estratègia" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "merge strategy to use" -msgstr "estratègia de fusió que utilitzar" +msgstr "estratègia de fusió a usar" -#: builtin/merge.c:214 +#: builtin/merge.c:215 msgid "option=value" msgstr "opció=valor" -#: builtin/merge.c:215 +#: builtin/merge.c:216 msgid "option for selected merge strategy" msgstr "opció per a l'estratègia de fusió seleccionada" -#: builtin/merge.c:217 +#: builtin/merge.c:218 msgid "merge commit message (for a non-fast-forward merge)" msgstr "missatge de comissió de fusió (per a una fusió no de avanç ràpid)" -#: builtin/merge.c:221 +#: builtin/merge.c:222 msgid "abort the current in-progress merge" msgstr "avorta la fusió en curs actual" @@ -6790,7 +6991,7 @@ msgstr "L'emmagatzemament ha fallat." #: builtin/merge.c:260 #, c-format msgid "not a valid object: %s" -msgstr "no és un objecte vàlid: %s" +msgstr "no és objecte vàlid: %s" #: builtin/merge.c:279 builtin/merge.c:296 msgid "read-tree failed" @@ -6798,7 +6999,7 @@ msgstr "read-tree ha fallat" #: builtin/merge.c:326 msgid " (nothing to squash)" -msgstr " (res que aixafar)" +msgstr " (res a aixafar)" #: builtin/merge.c:339 #, c-format @@ -6830,33 +7031,33 @@ msgstr "Cadena branch.%s.mergeoptions dolenta: %s" #: builtin/merge.c:653 msgid "git write-tree failed to write a tree" -msgstr "git write-tree ha fallat al escriure un arbre" +msgstr "git write-tree ha fallat en escriure un arbre" -#: builtin/merge.c:678 +#: builtin/merge.c:677 msgid "Not handling anything other than two heads merge." msgstr "No manejant res apart de la fusió de dos caps." -#: builtin/merge.c:692 +#: builtin/merge.c:691 #, 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:704 #, c-format msgid "unable to write %s" msgstr "incapaç d'escriure %s" -#: builtin/merge.c:794 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "No s'ha pogut llegir de '%s'" -#: builtin/merge.c:803 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" -msgstr "No comitent la fusió; utilitzeu 'git commit' per terminar la fusió.\n" +msgstr "No comitent la fusió; useu 'git commit' per a terminar la fusió.\n" -#: builtin/merge.c:809 +#: builtin/merge.c:808 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6872,167 +7073,169 @@ 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:832 msgid "Empty commit message." msgstr "Missatge de comissió buit." -#: builtin/merge.c:845 +#: builtin/merge.c:844 #, c-format msgid "Wonderful.\n" msgstr "Meravellós.\n" -#: builtin/merge.c:908 +#: builtin/merge.c:907 #, 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:924 +#: builtin/merge.c:923 #, c-format msgid "'%s' is not a commit" msgstr "'%s' no és una comissió" -#: builtin/merge.c:965 +#: builtin/merge.c:964 msgid "No current branch." msgstr "Cap rama actual." -#: builtin/merge.c:967 +#: builtin/merge.c:966 msgid "No remote for the current branch." msgstr "Cap remot per a la rama actual." -#: builtin/merge.c:969 +#: builtin/merge.c:968 msgid "No default upstream defined for the current branch." msgstr "Cap font per defecte definida per a la rama actual." -#: builtin/merge.c:974 +#: builtin/merge.c:973 #, c-format msgid "No remote-tracking branch for %s from %s" -msgstr "Cap rama de seguiment remot per a %s a %s" +msgstr "Cap rama de seguiment remot per a %s de %s" -#: builtin/merge.c:1130 +#: builtin/merge.c:1129 msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "No hi ha fusió que avortar (manca MERGE_HEAD)." +msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)." -#: builtin/merge.c:1146 git-pull.sh:31 +#: builtin/merge.c:1145 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "No heu terminat la vostra fusió (MERGE_HEAD existeix).\n" "Si us plau, cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1149 git-pull.sh:34 +#: builtin/merge.c:1148 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No heu terminat la vostra fusió (MERGE_HEAD existeix)." -#: builtin/merge.c:1153 +#: builtin/merge.c:1152 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "No heu terminat el vostre recull de cireres (CHERRY_PICK_HEAD existeix).\n" "Si us plau, cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1156 +#: builtin/merge.c:1155 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "No heu terminat el vostre recull de cireres (CHERRY_PICK_HEAD existeix)." -#: builtin/merge.c:1165 +#: builtin/merge.c:1164 msgid "You cannot combine --squash with --no-ff." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1174 +#: builtin/merge.c:1173 msgid "No commit specified and merge.defaultToUpstream not set." -msgstr "Cap comissió especificada i merge.defaultToUpstream no establert." +msgstr "" +"No hi ha una comissió especificada i merge.defaultToUpstream no està " +"establert." -#: builtin/merge.c:1206 +#: builtin/merge.c:1205 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:1209 +#: builtin/merge.c:1208 msgid "Squash commit into empty head not supported yet" msgstr "Aixafar una comissió a un cap buit encara no es suporta" -#: builtin/merge.c:1211 +#: builtin/merge.c:1210 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:1216 +#: builtin/merge.c:1215 #, c-format msgid "%s - not something we can merge" -msgstr "%s - no és cosa que podem fusionar" +msgstr "%s - no és cosa que puguem fusionar" -#: builtin/merge.c:1267 +#: builtin/merge.c:1266 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La comissió %s té una firma GPG no confiada, suposadament de %s." -#: builtin/merge.c:1270 +#: builtin/merge.c:1269 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "La comissió %s té una firma GPG dolenta suposadament per %s." +msgstr "La comissió %s té una firma GPG dolenta suposadament de %s." -#: builtin/merge.c:1273 +#: builtin/merge.c:1272 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La comissió %s no té firma GPG." -#: builtin/merge.c:1276 +#: builtin/merge.c:1275 #, c-format msgid "Commit %s has a good GPG signature by %s\n" -msgstr "La comissió %s té una firma GPG bona per %s\n" +msgstr "La comissió %s té una firma GPG bona de %s\n" -#: builtin/merge.c:1357 +#: builtin/merge.c:1356 #, c-format msgid "Updating %s..%s\n" -msgstr "Actualizant %s..%s\n" +msgstr "Actualitzant %s..%s\n" -#: builtin/merge.c:1396 +#: builtin/merge.c:1395 #, c-format msgid "Trying really trivial in-index merge...\n" -msgstr "Intentant una fusió realment trivial en l'índex...\n" +msgstr "Intentant una fusió molt trivial en l'índex...\n" -#: builtin/merge.c:1403 +#: builtin/merge.c:1402 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1435 +#: builtin/merge.c:1434 msgid "Not possible to fast-forward, aborting." msgstr "No és possible avançar ràpidament, avortant." -#: builtin/merge.c:1458 builtin/merge.c:1537 +#: builtin/merge.c:1457 builtin/merge.c:1536 #, c-format msgid "Rewinding the tree to pristine...\n" -msgstr "Rebobinant l'arbre a la prístina...\n" +msgstr "Rebobinant l'arbre a la pristina...\n" -#: builtin/merge.c:1462 +#: builtin/merge.c:1461 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentant l'estratègia de fusió %s...\n" -#: builtin/merge.c:1528 +#: builtin/merge.c:1527 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Cap estratègia de fusió ha manejat la fusió.\n" -#: builtin/merge.c:1530 +#: builtin/merge.c:1529 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "L'estratègia de fusió %s ha fallat.\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1538 #, c-format msgid "Using the %s to prepare resolving by hand.\n" -msgstr "Utilitzant el %s per preparar la resolució a mà.\n" +msgstr "Usant el %s per a preparar la resolució a mà.\n" -#: builtin/merge.c:1551 +#: builtin/merge.c:1550 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -"La fusió automàtica ha sortit bé; aturat abans de cometre com demanat\n" +"La fusió automàtica ha sortit bé; aturat abans de cometre segons demanat\n" #: builtin/merge-base.c:29 msgid "git merge-base [-a|--all] <commit> <commit>..." @@ -7060,7 +7263,7 @@ msgstr "emet tots els avantpassats comuns" #: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" -msgstr "troba els avantpassats per a una fusió de n vies soltera" +msgstr "troba els avantpassats per a una fusió soltera de n vies" #: builtin/merge-base.c:218 msgid "list revs not reachable from others" @@ -7068,7 +7271,7 @@ msgstr "llista les revisions no abastables d'altres" #: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" -msgstr "és el primer avantpassat de l'altre?" +msgstr "és el primer un avantpassat de l'altre?" #: builtin/merge-base.c:222 msgid "find where <commit> forked from reflog of <ref>" @@ -7089,23 +7292,23 @@ msgstr "envia els resultats a la sortida estàndard" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" -msgstr "utilitza una fusió basada en diff3" +msgstr "usa una fusió basada en diff3" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" -msgstr "en conflictes, utilitza la versió nostra" +msgstr "en conflictes, usa la versió nostra" #: builtin/merge-file.c:37 msgid "for conflicts, use their version" -msgstr "en conflictes, utilitza la versió seva" +msgstr "en conflictes, usa la versió seva" #: builtin/merge-file.c:39 msgid "for conflicts, use a union version" -msgstr "en conflictes, utilitza una versió d'unió" +msgstr "en conflictes, usa una versió d'unió" #: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" -msgstr "en conflicte, utilitza aquesta mida de marcador" +msgstr "en conflictes, usa aquesta mida de marcador" #: builtin/merge-file.c:43 msgid "do not warn about conflicts" @@ -7113,7 +7316,7 @@ msgstr "no avisis de conflictes" #: builtin/merge-file.c:45 msgid "set labels for file1/orig_file/file2" -msgstr "estableix les etiquetes per a file1/orig_file/file2" +msgstr "estableix les etiquetes per a fitxer1/fitxer_original/fitxer2" #: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" @@ -7133,89 +7336,94 @@ msgstr "permet la creació de més d'un arbre" #: builtin/mv.c:15 msgid "git mv [options] <source>... <destination>" -msgstr "git mv [opcions] <fons>... <destí>" +msgstr "git mv [opcions] <font>... <destí>" + +#: builtin/mv.c:69 +#, c-format +msgid "Directory %s is in index and no submodule?" +msgstr "El directori %s està en l'índex i no hi ha submòdul?" #: builtin/mv.c:71 +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/mv.c:89 +#, c-format +msgid "%.*s is in index" +msgstr "%.*s està en l'índex" + +#: builtin/mv.c:111 msgid "force move/rename even if target exists" -msgstr "força moviment/canvi de nom encara que el destí existeixi" +msgstr "força el moviment / canvi de nom encara que el destí existeixi" -#: builtin/mv.c:72 +#: builtin/mv.c:112 msgid "skip move/rename errors" -msgstr "salta els error de moviment/canvi de nom" +msgstr "salta els error de moviment / canvi de nom" + +#: builtin/mv.c:151 +#, c-format +msgid "destination '%s' is not a directory" +msgstr "el destí '%s' no és un directori" -#: builtin/mv.c:122 +#: builtin/mv.c:162 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Comprovant el canvi de nom de '%s' a '%s'\n" -#: builtin/mv.c:126 +#: builtin/mv.c:166 msgid "bad source" msgstr "font dolenta" -#: builtin/mv.c:129 +#: builtin/mv.c:169 msgid "can not move directory into itself" msgstr "no es pot moure un directori al seu mateix" -#: builtin/mv.c:132 +#: builtin/mv.c:172 msgid "cannot move directory over file" msgstr "no es pot moure un directori sobre un fitxer" -#: builtin/mv.c:138 -#, c-format -msgid "Huh? Directory %s is in index and no submodule?" -msgstr "Perdó? El directori %s està en l'índex i no hi ha submòdul?" - -#: builtin/mv.c:140 builtin/rm.c:318 -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/mv.c:156 -#, c-format -msgid "Huh? %.*s is in index?" -msgstr "Perdó? %.*s està en l'índex?" - -#: builtin/mv.c:169 +#: builtin/mv.c:181 msgid "source directory is empty" msgstr "el directori font està buit" -#: builtin/mv.c:205 +#: builtin/mv.c:206 msgid "not under version control" -msgstr "no baix control de versions" +msgstr "no està baix control de versions" -#: builtin/mv.c:208 +#: builtin/mv.c:209 msgid "destination exists" msgstr "el destí existeix" -#: builtin/mv.c:216 +#: builtin/mv.c:217 #, c-format msgid "overwriting '%s'" msgstr "sobreescrivint '%s'" -#: builtin/mv.c:219 +#: builtin/mv.c:220 msgid "Cannot overwrite" msgstr "No es pot sobreescriure" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "multiple sources for the same target" msgstr "múltiples fonts per al mateix destí" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "destination directory does not exist" msgstr "el directori destí no existeix" -#: builtin/mv.c:244 +#: builtin/mv.c:232 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, origen=%s, destí=%s" -#: builtin/mv.c:254 +#: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" msgstr "Canviant el nom de %s a %s\n" -#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358 #, c-format msgid "renaming '%s' failed" msgstr "el canvi del nom de '%s' ha fallat" @@ -7234,15 +7442,15 @@ msgstr "git name-rev [opcions] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" -msgstr "imprimeix només els noms (cap SHA-1)" +msgstr "imprimeix només els noms (sense SHA-1)" #: builtin/name-rev.c:310 msgid "only use tags to name the commits" -msgstr "només utilitza etiquetes per anomenar les comissions" +msgstr "només usa les etiquetes per a anomenar les comissions" #: builtin/name-rev.c:312 msgid "only use refs matching <pattern>" -msgstr "només utilitza les referències que coincideixen amb <patró>" +msgstr "només usa les referències que coincideixin amb <patró>" #: builtin/name-rev.c:314 msgid "list all commits reachable from all refs" @@ -7250,11 +7458,11 @@ msgstr "llista totes les comissions abastables de totes les referències" #: builtin/name-rev.c:315 msgid "read from stdin" -msgstr "llegeix de stdin" +msgstr "llegeix d'stdin" #: builtin/name-rev.c:316 msgid "allow to print `undefined` names (default)" -msgstr "permet imprimir noms `undefined` (per defecte)" +msgstr "permet imprimir els noms `undefined` (per defecte)" #: builtin/name-rev.c:322 msgid "dereference tags in the input (internal use)" @@ -7372,414 +7580,422 @@ msgstr "git notes prune [<opcions>]" msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:137 +#: builtin/notes.c:136 #, c-format msgid "unable to start 'show' for object '%s'" -msgstr "incapaç d'iniciar 'show' per al objecte '%s'" +msgstr "incapaç d'iniciar 'show' per a l'objecte '%s'" -#: builtin/notes.c:141 +#: builtin/notes.c:140 msgid "could not read 'show' output" msgstr "no s'ha pogut llegir la sortida de 'show'" -#: builtin/notes.c:149 +#: builtin/notes.c:148 #, c-format msgid "failed to finish 'show' for object '%s'" -msgstr "s'ha fallat al terminar 'show' per al objecte '%s'" +msgstr "s'ha fallat en terminar 'show' per a l'objecte '%s'" -#: builtin/notes.c:167 builtin/tag.c:477 +#: builtin/notes.c:166 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "no s'ha pogut crear el fitxer '%s'" -#: builtin/notes.c:186 +#: builtin/notes.c:185 msgid "Please supply the note contents using either -m or -F option" msgstr "" -"Si us plau, proveïu els continguts de la nota utilitzant o l'opció -m o " +"Si us plau, proveïu els continguts de la nota per usar o l'opció -m o " "l'opció -F" -#: builtin/notes.c:207 builtin/notes.c:848 +#: builtin/notes.c:206 builtin/notes.c:847 #, c-format msgid "Removing note for object %s\n" msgstr "Traient la nota de l'objecte %s\n" -#: builtin/notes.c:212 +#: builtin/notes.c:211 msgid "unable to write note object" msgstr "incapaç d'escriure l'objecte de nota" -#: builtin/notes.c:214 +#: builtin/notes.c:213 #, c-format -msgid "The note contents has been left in %s" +msgid "The note contents have been left in %s" msgstr "Els continguts de la nota s'han deixat en %s" -#: builtin/notes.c:248 builtin/tag.c:692 +#: builtin/notes.c:247 builtin/tag.c:693 #, c-format msgid "cannot read '%s'" msgstr "no es pot llegir '%s'" -#: builtin/notes.c:250 builtin/tag.c:695 +#: builtin/notes.c:249 builtin/tag.c:696 #, c-format msgid "could not open or read '%s'" msgstr "no s'ha pogut obrir ni llegir '%s'" -#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322 -#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519 -#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641 -#: builtin/notes.c:843 builtin/tag.c:708 +#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321 +#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518 +#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640 +#: builtin/notes.c:842 builtin/tag.c:709 #, c-format msgid "Failed to resolve '%s' as a valid ref." -msgstr "S'ha fallat al resoldre '%s' com referència vàlida." +msgstr "S'ha fallat en resoldre '%s' com a referència vàlida." -#: builtin/notes.c:272 +#: builtin/notes.c:271 #, c-format msgid "Failed to read object '%s'." -msgstr "S'ha fallat al llegir l'objecte '%s'." +msgstr "S'ha fallat en llegir l'objecte '%s'." -#: builtin/notes.c:276 +#: builtin/notes.c:275 #, c-format msgid "Cannot read note data from non-blob object '%s'." -msgstr "No es pot llegir dades de node de l'objecte no de blob '%s'." +msgstr "No es pot llegir les dades de node de l'objecte no de blob '%s'." -#: builtin/notes.c:316 +#: builtin/notes.c:315 #, c-format msgid "Malformed input line: '%s'." msgstr "Línia d'entrada malformada: '%s'." -#: builtin/notes.c:331 +#: builtin/notes.c:330 #, c-format msgid "Failed to copy notes from '%s' to '%s'" -msgstr "S'ha fallat al copiar les notes de '%s' a '%s'" +msgstr "S'ha fallat en copiar les notes de '%s' a '%s'" -#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502 -#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634 -#: builtin/notes.c:908 +#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501 +#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633 +#: builtin/notes.c:907 msgid "too many parameters" msgstr "massa paràmetres" -#: builtin/notes.c:388 builtin/notes.c:647 +#: builtin/notes.c:387 builtin/notes.c:646 #, c-format msgid "No note found for object %s." msgstr "Cap nota trobada per a l'objecte %s." -#: builtin/notes.c:410 builtin/notes.c:567 +#: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents as a string" -msgstr "nota els continguta com cadena" +msgstr "nota els continguts com a cadena" -#: builtin/notes.c:413 builtin/notes.c:570 +#: builtin/notes.c:412 builtin/notes.c:569 msgid "note contents in a file" msgstr "nota els continguts en un fitxer" -#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572 -#: builtin/notes.c:575 builtin/tag.c:627 +#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571 +#: builtin/notes.c:574 builtin/tag.c:628 msgid "object" msgstr "objecte" -#: builtin/notes.c:416 builtin/notes.c:573 +#: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse and edit specified note object" -msgstr "reutilitza i edita l'objecte de nota especificat" +msgstr "reusa i edita l'objecte de nota especificat" -#: builtin/notes.c:419 builtin/notes.c:576 +#: builtin/notes.c:418 builtin/notes.c:575 msgid "reuse specified note object" -msgstr "reutilitza l'objecte de nota especificat" +msgstr "reusa l'objecte de nota especificat" -#: builtin/notes.c:421 builtin/notes.c:489 +#: builtin/notes.c:420 builtin/notes.c:488 msgid "replace existing notes" -msgstr "reemplaça notes existents" +msgstr "reemplaça les notes existents" -#: builtin/notes.c:455 +#: builtin/notes.c:454 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" "No es pot afegir les notes. S'ha trobat notes existents de l'objecte %s. " -"Utilitza '-f' per sobreescriure les notes existents." +"Useu '-f' per a sobreescriure les notes existents." -#: builtin/notes.c:460 builtin/notes.c:537 +#: builtin/notes.c:459 builtin/notes.c:536 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Sobreescrivint les notes existents de l'objecte %s\n" -#: builtin/notes.c:490 +#: builtin/notes.c:489 msgid "read objects from stdin" -msgstr "llegeix els objects des de stdin" +msgstr "llegeix els objectes des d'stdin" -#: builtin/notes.c:492 +#: builtin/notes.c:491 msgid "load rewriting config for <command> (implies --stdin)" -msgstr "carrega configuració de reescriptura per a <ordre> (implica --stdin)" +msgstr "" +"carrega la configuració de reescriptura per a <ordre> (implica --stdin)" -#: builtin/notes.c:510 +#: builtin/notes.c:509 msgid "too few parameters" -msgstr "massa pocs paràmetres" +msgstr "hi ha massa pocs paràmetres" -#: builtin/notes.c:531 +#: builtin/notes.c:530 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -"No es pot copiar les notes. S'ha trobat notes existents de l'objecte %s. " -"Utilitza '-f' per sobreescriure les notes existents." +"No es pot copiar les notes. S'han trobat notes existents de l'objecte %s. " +"Useu '-f' per a sobreescriure les notes existents." -#: builtin/notes.c:543 +#: builtin/notes.c:542 #, c-format msgid "Missing notes on source object %s. Cannot copy." -msgstr "Manquen notes en l'objecte font %s. No es pot copiar." +msgstr "Manquen notes a l'objecte font %s. No es pot copiar." -#: builtin/notes.c:592 +#: builtin/notes.c:591 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" "S'han desaprovat les opcions -m/-F/-c/-C del subordre 'edit'.\n" -"Si us plau, utilitzeu 'git notes add -f -m/-F/-c/-C' en lloc.\n" +"Si us plau, useu 'git notes add -f -m/-F/-c/-C' en lloc.\n" -#: builtin/notes.c:739 +#: builtin/notes.c:738 msgid "General options" msgstr "Opcions generals" -#: builtin/notes.c:741 +#: builtin/notes.c:740 msgid "Merge options" msgstr "Opcions de fusió" -#: builtin/notes.c:743 +#: builtin/notes.c:742 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -"resol conflictes de nota utilitzant l'estratègia donada (manual/ours/theirs/" +"resol conflictes de nota per usar l'estratègia donada (manual/ours/theirs/" "union/cat_sort_uniq)" -#: builtin/notes.c:745 +#: builtin/notes.c:744 msgid "Committing unmerged notes" msgstr "Cometent les notes sense fusionar" -#: builtin/notes.c:747 +#: builtin/notes.c:746 msgid "finalize notes merge by committing unmerged notes" msgstr "finalitza la fusió de notes per cometre les notes sense fusionar" -#: builtin/notes.c:749 +#: builtin/notes.c:748 msgid "Aborting notes merge resolution" msgstr "Avortant la resolució de fusió de notes" -#: builtin/notes.c:751 +#: builtin/notes.c:750 msgid "abort notes merge" -msgstr "avorta fusió de notes" +msgstr "avorta la fusió de notes" -#: builtin/notes.c:846 +#: builtin/notes.c:845 #, c-format msgid "Object %s has no note\n" msgstr "L'objecte %s no té cap nota\n" -#: builtin/notes.c:858 +#: builtin/notes.c:857 msgid "attempt to remove non-existent note is not an error" -msgstr "L'intent de treure una nota no existent no és un error" +msgstr "l'intent de treure una nota no existent no és un error" -#: builtin/notes.c:861 +#: builtin/notes.c:860 msgid "read object names from the standard input" msgstr "llegeix els noms d'objecte des de l'entrada estàndard" -#: builtin/notes.c:942 +#: builtin/notes.c:941 msgid "notes-ref" msgstr "referència de notes" -#: builtin/notes.c:943 +#: builtin/notes.c:942 msgid "use notes from <notes_ref>" -msgstr "utilitza les notes de <referència de notes>" +msgstr "usa les notes de <referència de notes>" -#: builtin/notes.c:978 builtin/remote.c:1616 +#: builtin/notes.c:977 builtin/remote.c:1624 #, c-format msgid "Unknown subcommand: %s" msgstr "Subordre desconegut: %s" -#: builtin/pack-objects.c:25 +#: builtin/pack-objects.c:28 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "" "git pack-objects --stdout [opcions...] [< llista-de-referències | < llista-" "de-objectes]" -#: builtin/pack-objects.c:26 +#: builtin/pack-objects.c:29 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" -"git pack-objects [opcions...] base-name [< llista-de-referències | < llista-" +"git pack-objects [opcions...] nom-base [< llista-de-referències | < llista-" "de-objectes]" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "error de deflació (%d)" -#: builtin/pack-objects.c:771 +#: builtin/pack-objects.c:773 msgid "Writing objects" -msgstr "Escrivint objectes" +msgstr "Escrivint els objectes" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1015 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "deshabilitant l'escriptura de mapes de bits, perquè alguns objectes no " "s'estan empaquetant" -#: builtin/pack-objects.c:2174 +#: builtin/pack-objects.c:2175 msgid "Compressing objects" msgstr "Comprimint objectes" -#: builtin/pack-objects.c:2526 +#: builtin/pack-objects.c:2572 #, c-format msgid "unsupported index version %s" msgstr "versió d'índex no suportada %s" -#: builtin/pack-objects.c:2530 +#: builtin/pack-objects.c:2576 #, c-format msgid "bad index version '%s'" msgstr "versió d'índex dolenta '%s'" -#: builtin/pack-objects.c:2553 +#: builtin/pack-objects.c:2599 #, c-format msgid "option %s does not accept negative form" -msgstr "l'opció %s no accepta el forma negatiu" +msgstr "l'opció %s no accepta la forma negativa" -#: builtin/pack-objects.c:2557 +#: builtin/pack-objects.c:2603 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "incapaç d'analitzar el valor '%s' per a l'opció %s" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2622 msgid "do not show progress meter" msgstr "no mostris l'indicador de progrés" -#: builtin/pack-objects.c:2578 +#: builtin/pack-objects.c:2624 msgid "show progress meter" -msgstr "mostra indicador de progrés" +msgstr "mostra l'indicador de progrés" -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c:2626 msgid "show progress meter during object writing phase" -msgstr "mostra indicador de progrés durant el fase d'escriptura d'objectes" +msgstr "mostra l'indicador de progrés durant el fase d'escriptura d'objectes" -#: builtin/pack-objects.c:2583 +#: builtin/pack-objects.c:2629 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:2584 +#: builtin/pack-objects.c:2630 msgid "version[,offset]" msgstr "versió[,desplaçament]" -#: builtin/pack-objects.c:2585 +#: builtin/pack-objects.c:2631 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:2588 +#: builtin/pack-objects.c:2634 msgid "maximum size of each output pack file" msgstr "mida màxima de cada fitxer de paquet de sortida" -#: builtin/pack-objects.c:2590 +#: builtin/pack-objects.c:2636 msgid "ignore borrowed objects from alternate object store" msgstr "" "ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2638 msgid "ignore packed objects" -msgstr "ignora objectes empaquetats" +msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2640 msgid "limit pack window by objects" -msgstr "limita la finestra de paquete per objectes" +msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2642 msgid "limit pack window by memory in addition to object limit" -msgstr "limita la finestra de paquet per memòria a més del límit d'objectes" +msgstr "" +"limita la finestra d'empaquetament per memòria a més del límit d'objectes" -#: builtin/pack-objects.c:2598 +#: builtin/pack-objects.c:2644 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud màxima de la cadena de deltes permesa en el paquet resultat" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2646 msgid "reuse existing deltas" -msgstr "reutilitza deltes existents" +msgstr "reusa les deltes existents" -#: builtin/pack-objects.c:2602 +#: builtin/pack-objects.c:2648 msgid "reuse existing objects" -msgstr "reutilitza objectes existents" +msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2650 msgid "use OFS_DELTA objects" -msgstr "utilitza objectes OFS_DELTA" +msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2652 msgid "use threads when searching for best delta matches" -msgstr "utilitza fils al cercar les millores coincidències de delta" +msgstr "usa fils en cercar les millores coincidències de delta" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2654 msgid "do not create an empty pack output" -msgstr "no creis una emissió de paquet buida" +msgstr "no creïs una emissió de paquet buida" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2656 msgid "read revision arguments from standard input" msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2658 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:2615 +#: builtin/pack-objects.c:2661 msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevulla referència" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2664 msgid "include objects referred by reflog entries" -msgstr "inclou els objectes referits per entrades del registre de referències" +msgstr "" +"inclou els objectes als quals les entrades del registre de referències " +"refereixin" + +#: builtin/pack-objects.c:2667 +msgid "include objects referred to by the index" +msgstr "inclou els objectes als quals l'índex refereixi" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2670 msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2672 msgid "include tag objects that refer to objects to be packed" msgstr "" "inclou els objectes d'etiqueta que refereixin als objectes que empaquetar" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2674 msgid "keep unreachable objects" -msgstr "reté objectes inabastables" +msgstr "reté els objectes inabastables" -#: builtin/pack-objects.c:2626 parse-options.h:140 +#: builtin/pack-objects.c:2675 parse-options.h:140 msgid "time" msgstr "hora" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2676 msgid "unpack unreachable objects newer than <time>" msgstr "desempaquetar els objectes inabastables més nous que <hora>" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2679 msgid "create thin packs" msgstr "crea paquets prims" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2681 msgid "ignore packs that have companion .keep file" msgstr "ignora els paquets que tinguin un fitxer .keep de company" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2683 msgid "pack compression level" msgstr "nivell de compressió de paquet" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2685 msgid "do not hide commits by grafts" msgstr "no amaguis les comissions per empelt" -#: builtin/pack-objects.c:2638 +#: builtin/pack-objects.c:2687 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -"utilitza un índex de mapa de bits, si disponible, per accelerar el recompte " +"usa un índex de mapa de bits, si disponible, per a accelerar el recompte " "d'objectes" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2689 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:2719 +#: builtin/pack-objects.c:2778 msgid "Counting objects" -msgstr "Comptant objectes" +msgstr "Comptant els objectes" #: builtin/pack-refs.c:6 msgid "git pack-refs [options]" @@ -7791,13 +8007,13 @@ msgstr "empaqueta tot" #: builtin/pack-refs.c:15 msgid "prune loose refs (default)" -msgstr "poda referències soltes (per defecte)" +msgstr "poda les referències soltes (per defecte)" #: builtin/prune-packed.c:7 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" -#: builtin/prune-packed.c:49 +#: builtin/prune-packed.c:40 msgid "Removing duplicate objects" msgstr "Traient objectes duplicats" @@ -7805,25 +8021,25 @@ msgstr "Traient objectes duplicats" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <hora>] [--] [<cap>...]" -#: builtin/prune.c:142 +#: builtin/prune.c:106 msgid "do not remove, show only" msgstr "no treguis, només mostra" -#: builtin/prune.c:143 +#: builtin/prune.c:107 msgid "report pruned objects" msgstr "informa d'objectes podats" -#: builtin/prune.c:146 +#: builtin/prune.c:110 msgid "expire objects older than <time>" -msgstr "caduca els objectes majors que <hora>" +msgstr "caduca els objectes més vells que <hora>" #: builtin/push.c:14 msgid "git push [<options>] [<repository> [<refspec>...]]" -msgstr "git push [<options>] [<repositori> [<especificació-de-referència>...]]" +msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" #: builtin/push.c:85 msgid "tag shorthand without <tag>" -msgstr "abreviatura d'etiqueta sense <etiqueta>" +msgstr "abreviatura d'etiqueta sense <tag>" #: builtin/push.c:95 msgid "--delete only accepts plain target ref names" @@ -7835,7 +8051,7 @@ msgid "" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" -"Per triar qualsevulla opció permanentment, veu push.default en 'git help " +"Per a triar qualsevulla opció permanentment, veu push.default en 'git help " "config'." #: builtin/push.c:142 @@ -7853,12 +8069,12 @@ msgid "" "%s" msgstr "" "La rama font de la vostra rama actual no coincideix amb\n" -"el nom de la vostra rama actual. Per pujar-la a la rama font\n" -"en el remot, utilitzeu\n" +"el nom de la vostra rama actual. Per a pujar-la a la rama font\n" +"en el remot, useu\n" "\n" " git push %s HEAD:%s\n" "\n" -"Per pujar a la rama de la mateixa nom en el remot, utilitzeu\n" +"Per a pujar a la rama de la mateixa nom en el remot, useu\n" "\n" " git push %s %s\n" "%s" @@ -7872,9 +8088,9 @@ msgid "" "\n" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -"Actualment no esteu en una rama.\n" -"Per pujar la història que condueix a l'estat actual (HEAD\n" -"separat) ara, utilitzeu\n" +"Actualment no esteu en cap rama.\n" +"Per a pujar la història que condueix a l'estat actual\n" +"(HEAD separat) ara, useu\n" "\n" " git push %s HEAD:<nom-de-rama-remota>\n" @@ -7887,7 +8103,7 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" "La rama actual %s no té rama font.\n" -"Per pujar la rama actual i estableix el remot com font, utilitzeu\n" +"Per a pujar la rama actual i estableix el remot com a font, useu\n" "\n" " git push --set-upstream %s %s\n" @@ -7904,7 +8120,7 @@ msgid "" "to update which remote branch." msgstr "" "Esteu pujant al remot '%s', que no és la font de la vostra\n" -"rama actual '%s', sense dir-me què pujar per actualitzar\n" +"rama actual '%s', sense dir-me què pujar per a actualitzar\n" "quina rama remota." #: builtin/push.c:205 @@ -7931,35 +8147,34 @@ msgid "" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" -"push.default no està estabert; el seu valor implícit s'ha\n" -"canviat en Git 2.0 de 'matching' a 'simple'. Per suprimir\n" -"aquest missatge i mantenir el compartament tradicional,\n" -"utilitzeu:\n" +"push.default no està establert; el seu valor implícit s'ha\n" +"canviat en el Git 2.0 de 'matching' a 'simple'. Per a suprimir\n" +"aquest missatge i mantenir el comportament tradicional,\n" +"useu:\n" "\n" " git config --global push.default matching\n" "\n" -"Per suprimir aquest missatge i adoptar el comportament nou ara, utilitzeu:\n" +"Per a suprimir aquest missatge i adoptar el comportament nou ara, useu:\n" "\n" " git config --global push.default simple\n" "\n" "Quan push.default és 'matching', git pujarà les rames locals a les\n" "rames remotes que ja existeixen amb el mateix nom.\n" "\n" -"Des de Git 2.0, Git per defecte té el comportament més\n" +"Des del Git 2.0, el Git per defecte té el comportament més\n" "conservatiu 'simple', que només puja la rama actual a la rama\n" -"corresponent que 'git pull' utilitza per actualitzar la rama\n" -"actual.\n" +"corresponent que 'git pull' usa per actualitzar la rama actual.\n" "\n" "Veu 'git help config' i cerqueu 'push.default' per més informació.\n" -"(s'ha introduït el mode 'simple' en Git 1.7.11. Utilitzeu el mode similar\n" +"(s'ha introduït el mode 'simple' en el Git 1.7.11. Useu el mode similar\n" "'current' en lloc de 'simple' si a vegades utilitzeu versions més\n" -"antigues de Git)" +"antigues del Git)" #: builtin/push.c:272 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -"No heu especificat cap especificació de referència que pujar, i push.default " +"No heu especificat cap especificació de referència a pujar, i push.default " "és \"nothing\"." #: builtin/push.c:279 @@ -7970,7 +8185,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "S'han rebutjat les actualitzacions perquè el punt de la vostra rama\n" -"actual està darrerre de la seva contrapart remota. Integreu els canvis\n" +"actual està darrere de la seva contrapart remota. Integreu els canvis\n" "remots (per exemple, 'git pull ...') abans de pujar de nou.\n" "Veu la 'Nota sobre avances ràpids' en 'git push --help' per detalls." @@ -7982,7 +8197,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "S'han rebutjat les actualitzacions perquè un punt de rama pujada està\n" -"darrere de la seva contraparte remota. Agafeu aquesta rama i integreu\n" +"darrere de la seva contrapart remota. Agafeu aquesta rama i integreu\n" "els canvis remots (per exemple, 'git pull ...') abans de pujar de nou.\n" "Veu la 'Nota sobre avances ràpids' en 'git push --help' per detalls." @@ -7995,8 +8210,8 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "S'han rebutjat les actualitzacions perquè el remot conté treball que\n" -"no teniu localment. Això usualment es causa per altre repositori\n" -"havent pujant a la mateixa referència. Podeu voler primer integar els\n" +"no teniu localment. Això usualment es causa per un altre dipòsit\n" +"havent pujat a la mateixa referència. Podeu voler primer integrar els\n" "canvis remots (per exemple, 'git pull ...') abans de pujar de nou.\n" "Veu la 'Nota sobre avances ràpids' en 'git push --help' per detalls." @@ -8013,8 +8228,8 @@ msgid "" msgstr "" "No podeu actualitzar una referència remota que assenyala un\n" "objecte no de comissió, ni actualitzar una referència remota per\n" -"fer que assenyali un objecte no de comissió, sense utilitzar\n" -"l'opció '--force'.\n" +"fer que assenyali un objecte no de comissió, sense usar l'opció\n" +"'--force'.\n" #: builtin/push.c:360 #, c-format @@ -8024,12 +8239,12 @@ msgstr "Pujant a %s\n" #: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" -msgstr "s'ha fallat al pujar algunes referències a '%s'" +msgstr "s'ha fallat en pujar algunes referències a '%s'" #: builtin/push.c:394 #, c-format msgid "bad repository '%s'" -msgstr "repositori dolent '%s'" +msgstr "dipòsit dolent '%s'" #: builtin/push.c:395 msgid "" @@ -8044,14 +8259,14 @@ msgid "" " git push <name>\n" msgstr "" "Cap destí de pujada configurada.\n" -"O especifiqueu l'URL des de la línia d'ordres o configura un repositori " -"remot utilitzant\n" +"O especifiqueu l'URL des de la línia d'ordres o configureu un dipòsit remot " +"per usar\n" "\n" -" git remote add <name> <url>\n" +" git remote add <nom> <url>\n" "\n" -"i després pujeu utilitzant el nom remot\n" +"i després pujeu per usar el nom remot\n" "\n" -" git push <name>\n" +" git push <nom>\n" #: builtin/push.c:410 msgid "--all and --tags are incompatible" @@ -8073,79 +8288,79 @@ msgstr "--mirror no es pot combinar amb especificacions de referència" msgid "--all and --mirror are incompatible" msgstr "--all i --mirror són incompatibles" -#: builtin/push.c:482 +#: builtin/push.c:493 msgid "repository" -msgstr "repositori" +msgstr "dipòsit" -#: builtin/push.c:483 +#: builtin/push.c:494 msgid "push all refs" msgstr "envia totes les referències" -#: builtin/push.c:484 +#: builtin/push.c:495 msgid "mirror all refs" msgstr "reflecteix totes les referències" -#: builtin/push.c:486 +#: builtin/push.c:497 msgid "delete refs" msgstr "suprimeix les referències" -#: builtin/push.c:487 +#: builtin/push.c:498 msgid "push tags (can't be used with --all or --mirror)" -msgstr "envia les etiquetes (no es pot utilitzar amb --all o --mirror)" +msgstr "envia les etiquetes (no es pot usar amb --all o --mirror)" -#: builtin/push.c:490 +#: builtin/push.c:501 msgid "force updates" msgstr "força actualitzacions" -#: builtin/push.c:492 +#: builtin/push.c:503 msgid "refname>:<expect" msgstr "nom-de-referència>:<esperat" -#: builtin/push.c:493 +#: builtin/push.c:504 msgid "require old value of ref to be at this value" msgstr "requereix que el valor antic de la referència sigui d'aquest valor" -#: builtin/push.c:495 -msgid "check" -msgstr "comprova" - -#: builtin/push.c:496 +#: builtin/push.c:507 msgid "control recursive pushing of submodules" -msgstr "controla la pujada recursiva de submòduls" +msgstr "controla la pujada recursiva dels submòduls" -#: builtin/push.c:498 +#: builtin/push.c:509 msgid "use thin pack" -msgstr "utilitza el paquet prim" +msgstr "usa el paquet prim" -#: builtin/push.c:499 builtin/push.c:500 +#: builtin/push.c:510 builtin/push.c:511 msgid "receive pack program" msgstr "programa que rep els paquets" -#: builtin/push.c:501 +#: builtin/push.c:512 msgid "set upstream for git pull/status" msgstr "estableix la font per a git pull/status" -#: builtin/push.c:504 +#: builtin/push.c:515 msgid "prune locally removed refs" msgstr "poda les referències localment tretes" -#: builtin/push.c:506 +#: builtin/push.c:517 msgid "bypass pre-push hook" msgstr "evita el ganxo de prepujada" -#: builtin/push.c:507 +#: builtin/push.c:518 msgid "push missing but relevant tags" msgstr "puja les etiquetes mancants però relevants" -#: builtin/push.c:517 +#: builtin/push.c:520 +msgid "GPG sign the push" +msgstr "firma la pujada amb GPG" + +#: builtin/push.c:529 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete és incompatible amb --all, --mirror i --tags" -#: builtin/push.c:519 +#: builtin/push.c:531 msgid "--delete doesn't make sense without any refs" msgstr "--delete no té sentit sense referències" -#: builtin/read-tree.c:36 +#: builtin/read-tree.c:37 msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -8155,74 +8370,74 @@ msgstr "" "[-u [--exclude-per-directory=<ignoral-de-git>] | -i]] [--no-sparse-checkout] " "[--index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])" -#: builtin/read-tree.c:109 +#: builtin/read-tree.c:110 msgid "write resulting index to <file>" msgstr "escriu l'índex resultant al <fitxer>" -#: builtin/read-tree.c:112 +#: builtin/read-tree.c:113 msgid "only empty the index" msgstr "només buida l'índex" -#: builtin/read-tree.c:114 +#: builtin/read-tree.c:115 msgid "Merging" msgstr "Fusionant" -#: builtin/read-tree.c:116 +#: builtin/read-tree.c:117 msgid "perform a merge in addition to a read" msgstr "realitza una fusió a més d'una lectura" -#: builtin/read-tree.c:118 +#: builtin/read-tree.c:119 msgid "3-way merge if no file level merging required" msgstr "fusió de 3 vies si no cal fusió a la nivell de fitxers" -#: builtin/read-tree.c:120 +#: builtin/read-tree.c:121 msgid "3-way merge in presence of adds and removes" msgstr "fusió de 3 vies en presència d'afegiments i tretes" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:123 msgid "same as -m, but discard unmerged entries" msgstr "el mateix que -m, però descarta les entrades no fusionades" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "<subdirectory>/" msgstr "<subdirectori>/" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:125 msgid "read the tree into the index under <subdirectory>/" msgstr "llegiu l'arbre a l'índex baix <subdirectori>/" -#: builtin/read-tree.c:127 +#: builtin/read-tree.c:128 msgid "update working tree with merge result" msgstr "actualitza l'arbre de treball amb el resultat de fusió" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "gitignore" msgstr "ignoral de git" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:131 msgid "allow explicitly ignored files to be overwritten" msgstr "permet que els fitxers explícitament ignorats es sobreescriguin" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't check the working tree after merging" msgstr "no comprovis l'arbre de treball després de fusionar" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:135 msgid "don't update the index or the work tree" msgstr "no actualitzis l'índex ni l'arbre de treball" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" msgstr "salta l'aplicació del filtre d'agafament escàs" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "depura unpack-trees" #: builtin/reflog.c:499 #, c-format msgid "%s' for '%s' is not a valid timestamp" -msgstr "%s' per '%s' no és una marca de temps vàlida" +msgstr "%s' per a '%s' no és una marca de temps vàlida" #: builtin/reflog.c:615 builtin/reflog.c:620 #, c-format @@ -8321,8 +8536,8 @@ msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -"--mirror és peligrós i desaprovat; si us\n" -"\t plau, utilitzeu --mirror=fetch o\t --mirror=push en lloc" +"--mirror és perillós i desaprovat; si us\n" +"\t plau, useu --mirror=fetch o\t --mirror=push en lloc" #: builtin/remote.c:137 #, c-format @@ -8335,15 +8550,15 @@ msgstr "obtén les rames remotes" #: builtin/remote.c:155 msgid "import all tags and associated objects when fetching" -msgstr "importa totes les etiquetes i tos els objectes al obtenir" +msgstr "en obtenir, importa totes les etiquetes i tos els objectes" #: builtin/remote.c:158 msgid "or do not fetch any tag at all (--no-tags)" -msgstr "o no obtén cap etiqueta (--no-tags)" +msgstr "o no obtinguis cap etiqueta (--no-tags)" #: builtin/remote.c:160 msgid "branch(es) to track" -msgstr "rames que seguir" +msgstr "rames a seguir" #: builtin/remote.c:161 msgid "master branch" @@ -8355,7 +8570,7 @@ msgstr "push|fetch" #: builtin/remote.c:163 msgid "set up remote as a mirror to push to or fetch from" -msgstr "estableix remot com mirall a que pujar o de que obtenir" +msgstr "estableix el remot com a mirall a que pujar o de que obtenir" #: builtin/remote.c:175 msgid "specifying a master branch makes no sense with --mirror" @@ -8363,14 +8578,15 @@ msgstr "especificar una rama mestra no té sentit amb --mirror" #: builtin/remote.c:177 msgid "specifying branches to track makes sense only with fetch mirrors" -msgstr "especificar rames que seguir té sentit només amb miralls d'obteniment" +msgstr "" +"especificar les rames a seguir té sentit només amb miralls d'obteniment" -#: builtin/remote.c:185 builtin/remote.c:640 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "el remot %s ja existeix." -#: builtin/remote.c:189 builtin/remote.c:644 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' no és un nom de remot vàlid" @@ -8380,11 +8596,6 @@ msgstr "'%s' no és un nom de remot vàlid" msgid "Could not setup master '%s'" msgstr "No s'ha pogut configurar el mestre '%s'" -#: builtin/remote.c:288 -#, c-format -msgid "more than one %s" -msgstr "més d'un %s" - #: builtin/remote.c:333 #, c-format msgid "Could not get fetch map for refspec %s" @@ -8400,27 +8611,27 @@ msgstr "(coincident)" msgid "(delete)" msgstr "(suprimir)" -#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "No s'ha pogut annexar '%s' a '%s'" -#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894 +#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898 #, c-format msgid "No such remote: %s" -msgstr "Cap remot així: %s" +msgstr "No hi ha tal remot: %s" -#: builtin/remote.c:650 +#: builtin/remote.c:651 #, 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:656 builtin/remote.c:846 +#: builtin/remote.c:657 builtin/remote.c:850 #, c-format msgid "Could not remove config section '%s'" msgstr "No s'ha pogut treure la secció de configuració '%s'" -#: builtin/remote.c:671 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8431,32 +8642,32 @@ msgstr "" "\t%s\n" "\tSi us plau, actualitzeu la configuració manualment si és necessari." -#: builtin/remote.c:677 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "No s'ha pogut annexar '%s'" -#: builtin/remote.c:688 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "No s'ha pogut establir '%s'" -#: builtin/remote.c:710 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "la supressió de '%s' ha fallat" -#: builtin/remote.c:744 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "la creació de '%s' ha fallat" -#: builtin/remote.c:765 +#: builtin/remote.c:769 #, c-format msgid "Could not remove branch %s" msgstr "No s'ha pogut treure la rama %s" -#: builtin/remote.c:832 +#: builtin/remote.c:836 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8465,270 +8676,270 @@ msgid_plural "" "to delete them, use:" msgstr[0] "" "Nota: Una rama fora de la jerarquia refs/remotes/ no s'ha tret;\n" -"per suprimir-la, utilitzeu:" +"per a suprimir-la, useu:" msgstr[1] "" "Nota: Unes rames fora de la jerarquia refs/remotes/ no s'han tret;\n" -"per suprimir-les, utilitzeu:" +"per a suprimir-les, useu:" -#: builtin/remote.c:947 +#: builtin/remote.c:951 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nou (el pròxim obteniment emmagatzemarà en remotes/%s)" -#: builtin/remote.c:950 +#: builtin/remote.c:954 msgid " tracked" msgstr " seguit" -#: builtin/remote.c:952 +#: builtin/remote.c:956 msgid " stale (use 'git remote prune' to remove)" -msgstr " ranci (utilitzeu 'git remote prune' per treure)" +msgstr " ranci (useu 'git remote prune' per a treure)" -#: builtin/remote.c:954 +#: builtin/remote.c:958 msgid " ???" msgstr " ???" -#: builtin/remote.c:995 +#: builtin/remote.c:999 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge invàlid; no es pot rebasar en > 1 rama" -#: builtin/remote.c:1002 +#: builtin/remote.c:1006 #, c-format msgid "rebases onto remote %s" msgstr "es rebasa en el remot %s" -#: builtin/remote.c:1005 +#: builtin/remote.c:1009 #, c-format msgid " merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:1006 +#: builtin/remote.c:1010 msgid " and with remote" msgstr " i amb el remot" -#: builtin/remote.c:1008 +#: builtin/remote.c:1012 #, c-format msgid "merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:1009 +#: builtin/remote.c:1013 msgid " and with remote" msgstr " i amb el remot" -#: builtin/remote.c:1055 +#: builtin/remote.c:1059 msgid "create" msgstr "crea" -#: builtin/remote.c:1058 +#: builtin/remote.c:1062 msgid "delete" msgstr "suprimeix" -#: builtin/remote.c:1062 +#: builtin/remote.c:1066 msgid "up to date" -msgstr "actualitzat" +msgstr "al dia" -#: builtin/remote.c:1065 +#: builtin/remote.c:1069 msgid "fast-forwardable" msgstr "avanç ràpid possible" -#: builtin/remote.c:1068 +#: builtin/remote.c:1072 msgid "local out of date" msgstr "local no actualitzat" -#: builtin/remote.c:1075 +#: builtin/remote.c:1079 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s força a %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1082 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s puja a %-*s (%s)" -#: builtin/remote.c:1082 +#: builtin/remote.c:1086 #, c-format msgid " %-*s forces to %s" msgstr " %-*s força a %s" -#: builtin/remote.c:1085 +#: builtin/remote.c:1089 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s puja a %s" -#: builtin/remote.c:1153 +#: builtin/remote.c:1157 msgid "do not query remotes" msgstr "no consultis els remots" -#: builtin/remote.c:1180 +#: builtin/remote.c:1184 #, c-format msgid "* remote %s" msgstr "* remot %s" -#: builtin/remote.c:1181 +#: builtin/remote.c:1185 #, c-format msgid " Fetch URL: %s" msgstr " URL d'obteniment: %s" -#: builtin/remote.c:1182 builtin/remote.c:1329 +#: builtin/remote.c:1186 builtin/remote.c:1333 msgid "(no URL)" msgstr "(sense URL)" -#: builtin/remote.c:1191 builtin/remote.c:1193 +#: builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " Push URL: %s" msgstr " URL de pujada: %s" -#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199 +#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203 #, c-format msgid " HEAD branch: %s" msgstr " Rama de HEAD: %s" -#: builtin/remote.c:1201 +#: builtin/remote.c:1205 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " Rama de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n" -#: builtin/remote.c:1213 +#: builtin/remote.c:1217 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Rama remota:%s" msgstr[1] " Rames remotes:%s" -#: builtin/remote.c:1216 builtin/remote.c:1243 +#: builtin/remote.c:1220 builtin/remote.c:1247 msgid " (status not queried)" msgstr " (estat no consultat)" -#: builtin/remote.c:1225 +#: builtin/remote.c:1229 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Rama local configurada per a 'git pull':" msgstr[1] " Rames locals configurades per a 'git pull':" -#: builtin/remote.c:1233 +#: builtin/remote.c:1237 msgid " Local refs will be mirrored by 'git push'" -msgstr " 'git push' reflectira les referències locals" +msgstr " 'git push' reflectirà les referències locals" -#: builtin/remote.c:1240 +#: builtin/remote.c:1244 #, 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:1261 +#: builtin/remote.c:1265 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "estableix refs/remotes/<name>/HEAD segons el remot" -#: builtin/remote.c:1263 +#: builtin/remote.c:1267 msgid "delete refs/remotes/<name>/HEAD" msgstr "suprimeix refs/remotes/<name>/HEAD" -#: builtin/remote.c:1278 +#: builtin/remote.c:1282 msgid "Cannot determine remote HEAD" msgstr "No es pot determinar el HEAD remot" -#: builtin/remote.c:1280 +#: builtin/remote.c:1284 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Múltiples rames de HEAD remotes. Si us plau, trieu una explícitament amb:" -#: builtin/remote.c:1290 +#: builtin/remote.c:1294 #, c-format msgid "Could not delete %s" msgstr "No s'ha pogut suprimir %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1302 #, c-format msgid "Not a valid ref: %s" msgstr "No és una referència vàlida: %s" -#: builtin/remote.c:1300 +#: builtin/remote.c:1304 #, c-format msgid "Could not setup %s" msgstr "No s'ha pogut configurar %s" -#: builtin/remote.c:1318 +#: builtin/remote.c:1322 #, c-format msgid " %s will become dangling!" msgstr " %s es tornarà en penjant!" -#: builtin/remote.c:1319 +#: builtin/remote.c:1323 #, c-format msgid " %s has become dangling!" msgstr " %s s'ha tornat en penjant!" -#: builtin/remote.c:1325 +#: builtin/remote.c:1329 #, c-format msgid "Pruning %s" msgstr "Podant %s" -#: builtin/remote.c:1326 +#: builtin/remote.c:1330 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1349 +#: builtin/remote.c:1357 #, c-format msgid " * [would prune] %s" msgstr " * [podaria] %s" -#: builtin/remote.c:1352 +#: builtin/remote.c:1360 #, c-format msgid " * [pruned] %s" msgstr " * [podat] %s" -#: builtin/remote.c:1397 +#: builtin/remote.c:1405 msgid "prune remotes after fetching" msgstr "poda els remots després d'obtenir-los" -#: builtin/remote.c:1463 builtin/remote.c:1537 +#: builtin/remote.c:1471 builtin/remote.c:1545 #, c-format msgid "No such remote '%s'" -msgstr "Cap remot així '%s'" +msgstr "No hi ha tal remot '%s'" -#: builtin/remote.c:1483 +#: builtin/remote.c:1491 msgid "add branch" msgstr "afegeix rama" -#: builtin/remote.c:1490 +#: builtin/remote.c:1498 msgid "no remote specified" msgstr "cap remot especificat" -#: builtin/remote.c:1512 +#: builtin/remote.c:1520 msgid "manipulate push URLs" msgstr "manipula els URL de pujada" -#: builtin/remote.c:1514 +#: builtin/remote.c:1522 msgid "add URL" msgstr "afegeix URL" -#: builtin/remote.c:1516 +#: builtin/remote.c:1524 msgid "delete URLs" msgstr "suprimeix URLs" -#: builtin/remote.c:1523 +#: builtin/remote.c:1531 msgid "--add --delete doesn't make sense" msgstr "--add --delete no té sentit" -#: builtin/remote.c:1563 +#: builtin/remote.c:1571 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patró d'URL antic invàlid: %s" -#: builtin/remote.c:1571 +#: builtin/remote.c:1579 #, c-format msgid "No such URL found: %s" -msgstr "Cap URL així trobat: %s" +msgstr "No s'ha trobat tal URL: %s" -#: builtin/remote.c:1573 +#: builtin/remote.c:1581 msgid "Will not delete all non-push URLs" msgstr "Suprimirà tots els URL no de pujada" -#: builtin/remote.c:1587 +#: builtin/remote.c:1595 msgid "be verbose; must be placed before a subcommand" -msgstr "sigues verbós; s'ha de col·locar abans d'un subordre" +msgstr "siguis verbós; s'ha de col·locar abans d'un subordre" #: builtin/repack.c:17 msgid "git repack [options]" @@ -8748,7 +8959,7 @@ msgstr "tragueu els paquets redundants, i executeu git-prune-packed" #: builtin/repack.c:167 msgid "pass --no-reuse-delta to git-pack-objects" -msgstr "passa --no-resuse-delta a git-pack-objects" +msgstr "passa --no-reuse-delta a git-pack-objects" #: builtin/repack.c:169 msgid "pass --no-reuse-object to git-pack-objects" @@ -8772,11 +8983,11 @@ msgstr "aproximat" #: builtin/repack.c:178 msgid "with -A, do not loosen objects older than this" -msgstr "amb -A, no soltis objectes majors que aquest" +msgstr "amb -A, no soltis els objectes més vells que aquest" #: builtin/repack.c:180 msgid "size of the window used for delta compression" -msgstr "mida de la ventana utilitzada per compressió de deltes" +msgstr "mida de la ventana que s'usa per a compressió de deltes" #: builtin/repack.c:181 builtin/repack.c:185 msgid "bytes" @@ -8785,12 +8996,12 @@ msgstr "octets" #: builtin/repack.c:182 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -"ex mateix que l'anterior, però limita la mida de memòria en lloc del " +"el mateix que l'anterior, però limita la mida de memòria en lloc del " "recompte d'entrades" #: builtin/repack.c:184 msgid "limits the maximum delta depth" -msgstr "limita la profunditat màxima dels deltes" +msgstr "limita la profunditat màxima de les deltes" #: builtin/repack.c:186 msgid "maximum size of each packfile" @@ -8825,71 +9036,71 @@ msgstr "git replace -d <objecte>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<patró>]]" -#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388 +#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 #, c-format msgid "Not a valid object name: '%s'" msgstr "No és un nom d'objecte vàlid: '%s'" -#: builtin/replace.c:352 +#: builtin/replace.c:355 #, c-format msgid "bad mergetag in commit '%s'" msgstr "etiqueta de fusió dolenta en la comissió '%s'" -#: builtin/replace.c:354 +#: builtin/replace.c:357 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "etiqueta de fusió malformada en la comissió '%s'" -#: builtin/replace.c:365 +#: builtin/replace.c:368 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "" "la comissió original '%s' conté l'etiqueta de fusió '%s' que es descarta; " -"utilitzeu --edit en lloc de --graft" +"useu --edit en lloc de --graft" -#: builtin/replace.c:398 +#: builtin/replace.c:401 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "la comissió original '%s' té una firma gpg." -#: builtin/replace.c:399 +#: builtin/replace.c:402 msgid "the signature will be removed in the replacement commit!" msgstr "la firma es traurà en la comissió de reemplaçament!" -#: builtin/replace.c:405 +#: builtin/replace.c:408 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: '%s'" -#: builtin/replace.c:429 +#: builtin/replace.c:432 msgid "list replace refs" msgstr "llista les referències reemplaçades" -#: builtin/replace.c:430 +#: builtin/replace.c:433 msgid "delete replace refs" msgstr "suprimeix les referències reemplaçades" -#: builtin/replace.c:431 +#: builtin/replace.c:434 msgid "edit existing object" msgstr "edita un objecte existent" -#: builtin/replace.c:432 +#: builtin/replace.c:435 msgid "change a commit's parents" msgstr "canvia els pares d'una comissió" -#: builtin/replace.c:433 +#: builtin/replace.c:436 msgid "replace the ref if it exists" msgstr "reemplaça la referència si existeix" -#: builtin/replace.c:434 +#: builtin/replace.c:437 msgid "do not pretty-print contents for --edit" msgstr "no imprimeixis bellament els continguts per a --edit" -#: builtin/replace.c:435 +#: builtin/replace.c:438 msgid "use this format" -msgstr "utilitza aquest format" +msgstr "usa aquest format" #: builtin/rerere.c:12 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" @@ -8899,155 +9110,155 @@ msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" msgid "register clean resolutions in index" msgstr "registre les resolucions netes en l'índex" -#: builtin/reset.c:25 +#: builtin/reset.c:26 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]" -#: builtin/reset.c:26 +#: builtin/reset.c:27 msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "git reset [-q] <arbre> [--] <rutes>..." -#: builtin/reset.c:27 +#: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<arbre>] [--] [<rutes>...]" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "mixed" msgstr "mixt" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "soft" msgstr "suau" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "hard" msgstr "dur" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "merge" msgstr "fusió" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "keep" msgstr "reteniment" -#: builtin/reset.c:73 +#: builtin/reset.c:74 msgid "You do not have a valid HEAD." msgstr "No teniu un HEAD vàlid." -#: builtin/reset.c:75 +#: builtin/reset.c:76 msgid "Failed to find tree of HEAD." -msgstr "S'ha fallat al trobar l'arbre de HEAD." +msgstr "S'ha fallat en trobar l'arbre de HEAD." -#: builtin/reset.c:81 +#: builtin/reset.c:82 #, c-format msgid "Failed to find tree of %s." -msgstr "S'ha fallat al trobar l'arbre de %s." +msgstr "S'ha fallat en trobar l'arbre de %s." -#: builtin/reset.c:99 +#: builtin/reset.c:100 #, c-format msgid "HEAD is now at %s" msgstr "HEAD ara està a %s" -#: builtin/reset.c:182 +#: builtin/reset.c:183 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "No es pot fer un restabliment de %s en el medi d'una fusió." -#: builtin/reset.c:275 +#: builtin/reset.c:276 msgid "be quiet, only report errors" msgstr "calla, només informa d'errors" -#: builtin/reset.c:277 +#: builtin/reset.c:278 msgid "reset HEAD and index" msgstr "restableix HEAD i l'índex" -#: builtin/reset.c:278 +#: builtin/reset.c:279 msgid "reset only HEAD" msgstr "restablex només HEAD" -#: builtin/reset.c:280 builtin/reset.c:282 +#: builtin/reset.c:281 builtin/reset.c:283 msgid "reset HEAD, index and working tree" msgstr "restableix HEAD, l'índex i l'arbre de treball" -#: builtin/reset.c:284 +#: builtin/reset.c:285 msgid "reset HEAD but keep local changes" msgstr "restableix HEAD però reté els canvis locals" -#: builtin/reset.c:287 +#: builtin/reset.c:288 msgid "record only the fact that removed paths will be added later" -msgstr "registre només el fet de que les rutes tretes s'afegiran després" +msgstr "registra només el fet de que les rutes tretes s'afegiran després" -#: builtin/reset.c:304 +#: builtin/reset.c:305 #, c-format msgid "Failed to resolve '%s' as a valid revision." -msgstr "S'ha fallat al resoldre '%s' com revisió vàlida." +msgstr "S'ha fallat en resoldre '%s' com a revisió vàlida." -#: builtin/reset.c:307 builtin/reset.c:315 +#: builtin/reset.c:308 builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "No s'ha pogut analitzar l'objecte '%s'." -#: builtin/reset.c:312 +#: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." -msgstr "S'ha fallat al resoldre '%s' com arbre vàlid." +msgstr "S'ha fallat en resoldre '%s' com a arbre vàlid." -#: builtin/reset.c:321 +#: builtin/reset.c:322 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch és incompatible amb --{hard,mixed,soft}" -#: builtin/reset.c:330 +#: builtin/reset.c:331 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -"--mixed amb rutes es desaprovat; utilitzeu 'git reset -- <paths>' en lloc." +"--mixed amb rutes està desaprovat; useu 'git reset -- <rutes>' en lloc." -#: builtin/reset.c:332 +#: builtin/reset.c:333 #, c-format msgid "Cannot do %s reset with paths." msgstr "No es pot fer reinici de %s amb rutes." -#: builtin/reset.c:342 +#: builtin/reset.c:343 #, c-format msgid "%s reset is not allowed in a bare repository" -msgstr "reset de %s no és permet en un repositori nu" +msgstr "el reinici de %s no es permet en un dipòsit nu" -#: builtin/reset.c:346 +#: builtin/reset.c:347 msgid "-N can only be used with --mixed" -msgstr "-N només es pot utilitzar amb --mixed" +msgstr "-N només es pot usar amb --mixed" -#: builtin/reset.c:363 +#: builtin/reset.c:364 msgid "Unstaged changes after reset:" msgstr "Canvis no allistats després de restabliment:" -#: builtin/reset.c:369 +#: builtin/reset.c:370 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió '%s'." -#: builtin/reset.c:373 +#: builtin/reset.c:374 msgid "Could not write new index file." msgstr "No s'ha pogut escriure el fitxer d'índex nou." -#: builtin/rev-parse.c:360 +#: builtin/rev-parse.c:361 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [opcions] -- [<paràmetres>...]" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" -msgstr "reté el `--` passat com paràmetre" +msgstr "reté el `--` passat com a paràmetre" -#: builtin/rev-parse.c:367 +#: builtin/rev-parse.c:368 msgid "stop parsing after the first non-option argument" msgstr "deixa d'analitzar després del primer paràmetre no d'opció" -#: builtin/rev-parse.c:370 +#: builtin/rev-parse.c:371 msgid "output in stuck long form" msgstr "emet en forma llarga enganxada" -#: builtin/rev-parse.c:498 +#: builtin/rev-parse.c:499 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -9059,7 +9270,7 @@ msgstr "" " or: git rev-parse --sq-quote [<paràmetre>...]\n" " or: git rev-parse [opcions] [<paràmetre>...]\n" "\n" -"Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús " +"Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús " "inicial." #: builtin/revert.c:22 @@ -9081,19 +9292,19 @@ msgstr "git cherry-pick <subordre>" #: builtin/revert.c:71 #, c-format msgid "%s: %s cannot be used with %s" -msgstr "%s: %s no es pot utilitzar amb %s" +msgstr "%s: %s no es pot usar amb %s" #: builtin/revert.c:80 msgid "end revert or cherry-pick sequence" -msgstr "termina la seqüència de reversió o recull de cireres" +msgstr "termina la seqüència de reversió o el recull de cireres" #: builtin/revert.c:81 msgid "resume revert or cherry-pick sequence" -msgstr "reprèn la seqüència de reversió o recull de cireres" +msgstr "reprèn la seqüència de reversió o el recull de cireres" #: builtin/revert.c:82 msgid "cancel revert or cherry-pick sequence" -msgstr "cancel·la la seqüència de reversió o recull de cireres" +msgstr "cancel·la la seqüència de reversió o el recull de cireres" #: builtin/revert.c:83 msgid "don't automatically commit" @@ -9121,7 +9332,7 @@ msgstr "opció d'estratègia de fusió" #: builtin/revert.c:104 msgid "append commit name" -msgstr "nom de la comissió que annexar" +msgstr "nom de la comissió a annexar" #: builtin/revert.c:105 msgid "allow fast-forward" @@ -9160,14 +9371,14 @@ msgid "" "the following submodule (or one of its nested submodules)\n" "uses a .git directory:" msgid_plural "" -"the following submodules (or one of its nested submodules)\n" +"the following submodules (or one of their nested submodules)\n" "use a .git directory:" msgstr[0] "" "el submòdul següent (o un dels seus submòduls niats)\n" -"utilitza un directori .git:" +"usa un directori .git:" msgstr[1] "" "els submòduls següents (o un dels seus submòduls niats)\n" -"utilitza un directori .git:" +"usa un directori .git:" #: builtin/rm.c:71 msgid "" @@ -9175,7 +9386,7 @@ msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" "\n" -"(utilitzeu 'rm -rf' si realment voleu treure'l, inclòs tota la seva història)" +"(useu 'rm -rf' si realment voleu treure'l, inclòs tota la seva història)" #: builtin/rm.c:231 msgid "" @@ -9197,7 +9408,7 @@ msgid "" "(use -f to force removal)" msgstr "" "\n" -"(utilitzeu -f per forçar la treta)" +"(useu -f per a forçar la treta)" #: builtin/rm.c:240 msgid "the following file has changes staged in the index:" @@ -9211,7 +9422,7 @@ msgid "" "(use --cached to keep the file, or -f to force removal)" msgstr "" "\n" -"(utilitzeu --cached per desar el fitxer, o -f per forçar la treta)" +"(useu --cached per a desar el fitxer, o -f per a forçar la treta)" #: builtin/rm.c:252 msgid "the following file has local modifications:" @@ -9229,16 +9440,22 @@ msgstr "només treu de l'índex" #: builtin/rm.c:272 msgid "override the up-to-date check" -msgstr "passa per dalt la comprovació d'actualització" +msgstr "passa per dalt la comprovació d'actualitat" #: builtin/rm.c:273 msgid "allow recursive removal" -msgstr "permet treta recursiva" +msgstr "permet la treta recursiva" #: builtin/rm.c:275 msgid "exit with a zero status even if nothing matched" msgstr "surt amb estat zero encara que res hagi coincidit" +#: builtin/rm.c:318 +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 #, c-format msgid "not removing '%s' recursively without -r" @@ -9287,7 +9504,7 @@ msgid "" "<glob>)...]" msgstr "" "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" -"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" +"current] [--color[=<quan>] | --no-color] [--sparse] [--more=<n> | --list | --" "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<revisió> " "| <glob>)...]" @@ -9329,7 +9546,7 @@ msgstr "anomena les comissions amb els seus noms d'objecte" #: builtin/show-branch.c:664 msgid "show possible merge bases" -msgstr "mostra els bases de fusió possibles" +msgstr "mostra les bases de fusió possibles" #: builtin/show-branch.c:666 msgid "show refs unreachable from any other ref" @@ -9341,7 +9558,7 @@ msgstr "mostra les comissions en ordre topològic" #: builtin/show-branch.c:671 msgid "show only commits not on the first branch" -msgstr "mostra només les comissions no en la primera rama" +msgstr "mostra només les comissions que no siguin en la primera rama" #: builtin/show-branch.c:673 msgid "show merges reachable from only one tip" @@ -9357,7 +9574,7 @@ msgstr "<n>[,<base>]" #: builtin/show-branch.c:679 msgid "show <n> most recent ref-log entries starting at base" -msgstr "mostra les <n> entrades més recents començant al base" +msgstr "mostra les <n> entrades més recents començant a la base" #: builtin/show-ref.c:10 msgid "" @@ -9373,11 +9590,11 @@ msgstr "git show-ref --exclude-existing[=pattern] < llista-de-referències" #: builtin/show-ref.c:168 msgid "only show tags (can be combined with heads)" -msgstr "mostra només les etiquetes (pot combinar-se amb heads)" +msgstr "mostra només les etiquetes (es pot combinar amb heads)" #: builtin/show-ref.c:169 msgid "only show heads (can be combined with tags)" -msgstr "mostra només els caps (pot combinar-se amb etiquetes)" +msgstr "mostra només els caps (es pot combinar amb tags)" #: builtin/show-ref.c:170 msgid "stricter reference checking, requires exact ref path" @@ -9395,7 +9612,7 @@ msgstr "dereferencia les etiquetes a IDs d'objecte" #: builtin/show-ref.c:179 msgid "only show SHA1 hash using <n> digits" -msgstr "mostra el hash SHA1 només utilitzant <n> xifres" +msgstr "mostra el hash SHA1 usant només <n> xifres" #: builtin/show-ref.c:183 msgid "do not print results to stdout (useful with --verify)" @@ -9403,7 +9620,7 @@ msgstr "no imprimeixis els resultats a stdout (útil amb --verify)" #: builtin/show-ref.c:185 msgid "show refs from stdin that aren't in local repository" -msgstr "mostra les referència de stdin que no estan en el repositori local" +msgstr "mostra les referència d'stdin que no siguin en el dipòsit local" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [options] name [ref]" @@ -9425,11 +9642,11 @@ msgstr "suprimeix la referència simbòlica" msgid "shorten ref output" msgstr "escurça la sortida de referències" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "raó" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "raó de l'actualització" @@ -9490,9 +9707,9 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "" "\n" -"Escrui el missatge de l'etiqueta:\n" +"Escriviu el missatge de l'etiqueta:\n" " %s\n" -"Les línies que comencen amb '%c' s'ignoraran.\n" +"Les línies que comencin amb '%c' s'ignoraran.\n" #: builtin/tag.c:347 #, c-format @@ -9504,10 +9721,10 @@ msgid "" "want to.\n" msgstr "" "\n" -"Escriu el missatge de l'etiqueta:\n" +"Escriviu el missatge de l'etiqueta:\n" " %s\n" -"Les línies començant amb '%c' es retindran; podeu treure'ls per vós mateix " -"si voleu.\n" +"Les línies que comencin amb '%c' es retindran; podeu treure'ls per vós " +"mateix si voleu.\n" #: builtin/tag.c:371 #, c-format @@ -9553,240 +9770,230 @@ msgstr "l'opció 'points-at' requereix un objecte" msgid "malformed object name '%s'" msgstr "nom d'objecte malformat '%s'" -#: builtin/tag.c:588 +#: builtin/tag.c:589 msgid "list tag names" msgstr "llista els noms d'etiqueta" -#: builtin/tag.c:590 +#: builtin/tag.c:591 msgid "print <n> lines of each tag message" msgstr "imprimeix <n> línies de cada missatge d'etiqueta" -#: builtin/tag.c:592 +#: builtin/tag.c:593 msgid "delete tags" -msgstr "suprimeix etiquetes" +msgstr "suprimeix les etiquetes" -#: builtin/tag.c:593 +#: builtin/tag.c:594 msgid "verify tags" -msgstr "verifica etiquetes" +msgstr "verifica les etiquetes" -#: builtin/tag.c:595 +#: builtin/tag.c:596 msgid "Tag creation options" msgstr "Opcions de creació d'etiquetes" -#: builtin/tag.c:597 +#: builtin/tag.c:598 msgid "annotated tag, needs a message" msgstr "etiqueta anotada, necessita un missatge" -#: builtin/tag.c:599 +#: builtin/tag.c:600 msgid "tag message" msgstr "missatge d'etiqueta" -#: builtin/tag.c:601 +#: builtin/tag.c:602 msgid "annotated and GPG-signed tag" msgstr "etiqueta anotada i firmada per GPG" -#: builtin/tag.c:605 +#: builtin/tag.c:606 msgid "use another key to sign the tag" -msgstr "utilitza altra clau per firmar l'etiqueta" +msgstr "usa una altra clau per a firmar l'etiqueta" -#: builtin/tag.c:606 +#: builtin/tag.c:607 msgid "replace the tag if exists" -msgstr "reempaça l'etiqueta si existeix" +msgstr "reemplaça l'etiqueta si existeix" -#: builtin/tag.c:607 +#: builtin/tag.c:608 msgid "show tag list in columns" msgstr "mostra la llista d'etiquetes en columnes" -#: builtin/tag.c:609 +#: builtin/tag.c:610 msgid "sort tags" msgstr "ordena les etiquetes" -#: builtin/tag.c:613 +#: builtin/tag.c:614 msgid "Tag listing options" msgstr "Opcions de llistament d'etiquetes" -#: builtin/tag.c:616 builtin/tag.c:622 +#: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "imprimeix només les etiquetes que continguin la comissió" -#: builtin/tag.c:628 +#: builtin/tag.c:629 msgid "print only tags of the object" -msgstr "imprimeix només les etiquets de l'objecte" +msgstr "imprimeix només les etiquetes de l'objecte" -#: builtin/tag.c:654 +#: builtin/tag.c:655 msgid "--column and -n are incompatible" msgstr "--column i -n són incompatibles" -#: builtin/tag.c:666 +#: builtin/tag.c:667 msgid "--sort and -n are incompatible" msgstr "--sort i -n són incompatibles" -#: builtin/tag.c:673 +#: builtin/tag.c:674 msgid "-n option is only allowed with -l." msgstr "es permet l'opció -n només amb -l." -#: builtin/tag.c:675 +#: builtin/tag.c:676 msgid "--contains option is only allowed with -l." msgstr "es permet l'opció --contains només amb -l." -#: builtin/tag.c:677 +#: builtin/tag.c:678 msgid "--points-at option is only allowed with -l." msgstr "es permet --points-at option només amb -l." -#: builtin/tag.c:685 +#: builtin/tag.c:686 msgid "only one -F or -m option is allowed." msgstr "només una opció -F o -m es permet." -#: builtin/tag.c:705 +#: builtin/tag.c:706 msgid "too many params" msgstr "massa paràmetres" -#: builtin/tag.c:711 +#: builtin/tag.c:712 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' no és un nom d'etiqueta vàlid." -#: builtin/tag.c:716 +#: builtin/tag.c:717 #, c-format msgid "tag '%s' already exists" msgstr "l'etiqueta '%s' ja existeix" -#: builtin/tag.c:734 -#, c-format -msgid "%s: cannot lock the ref" -msgstr "%s: no es pot bloquejar la referència" - -#: builtin/tag.c:736 -#, c-format -msgid "%s: cannot update the ref" -msgstr "%s: no es pot actualitzar la referència" - -#: builtin/tag.c:738 +#: builtin/tag.c:741 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta '%s' actualitzada (ha estat %s)\n" -#: builtin/unpack-objects.c:483 +#: builtin/unpack-objects.c:489 msgid "Unpacking objects" msgstr "Desempaquetant objectes" -#: builtin/update-index.c:402 +#: builtin/update-index.c:403 msgid "git update-index [options] [--] [<file>...]" msgstr "git update-index [opcions] [--] [<fitxer>...]" -#: builtin/update-index.c:755 +#: builtin/update-index.c:756 msgid "continue refresh even when index needs update" msgstr "" "continua l'actualització encara que l'índex necessiti una actualització" -#: builtin/update-index.c:758 +#: builtin/update-index.c:759 msgid "refresh: ignore submodules" msgstr "actualitza: ignora els submòduls" -#: builtin/update-index.c:761 +#: builtin/update-index.c:762 msgid "do not ignore new files" -msgstr "no ignoris fitxers nous" +msgstr "no ignoris els fitxers nous" -#: builtin/update-index.c:763 +#: builtin/update-index.c:764 msgid "let files replace directories and vice-versa" -msgstr "deixa que els fitxer reemplacin els directoris i viceversa" +msgstr "deixa que els fitxers reemplacin els directoris i viceversa" -#: builtin/update-index.c:765 +#: builtin/update-index.c:766 msgid "notice files missing from worktree" msgstr "nota els fitxers mancants de l'arbre de treball" -#: builtin/update-index.c:767 +#: builtin/update-index.c:768 msgid "refresh even if index contains unmerged entries" msgstr "actualitza encara que l'índex contingui entrades no fusionades" -#: builtin/update-index.c:770 +#: builtin/update-index.c:771 msgid "refresh stat information" msgstr "actualitza la informació d'estadístiques" -#: builtin/update-index.c:774 +#: builtin/update-index.c:775 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "com --refresh, però ignora l'ajust assume-unchanged" -#: builtin/update-index.c:778 +#: builtin/update-index.c:779 msgid "<mode>,<object>,<path>" msgstr "<mode>,<objecte>,<ruta>" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "add the specified entry to the index" msgstr "afegeix l'entrada especificada a l'índex" -#: builtin/update-index.c:783 +#: builtin/update-index.c:784 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "override the executable bit of the listed files" msgstr "passa per dalt el bit executable dels fitxers llistats" -#: builtin/update-index.c:788 +#: builtin/update-index.c:789 msgid "mark files as \"not changing\"" -msgstr "marca els fitxers com \"not changing\"" +msgstr "marca els fitxers com a \"not changing\"" -#: builtin/update-index.c:791 +#: builtin/update-index.c:792 msgid "clear assumed-unchanged bit" msgstr "neteja el bit assumed-unchanged" -#: builtin/update-index.c:794 +#: builtin/update-index.c:795 msgid "mark files as \"index-only\"" -msgstr "marca els fitxers com \"index-only\"" +msgstr "marca els fitxers com a \"index-only\"" -#: builtin/update-index.c:797 +#: builtin/update-index.c:798 msgid "clear skip-worktree bit" msgstr "neteja el bit skip-worktree" -#: builtin/update-index.c:800 +#: builtin/update-index.c:801 msgid "add to index only; do not add content to object database" msgstr "" -"només afegeix a l'índex; no afegeixis el contingut al base de dades " +"només afegeix a l'índex; no afegeixis el contingut a la base de dades " "d'objectes" -#: builtin/update-index.c:802 +#: builtin/update-index.c:803 msgid "remove named paths even if present in worktree" msgstr "" "treu les rutes anomenades encara que estiguin presents en l'arbre de treball" -#: builtin/update-index.c:804 +#: builtin/update-index.c:805 msgid "with --stdin: input lines are terminated by null bytes" msgstr "amb --stdin: les línies d'entrada es terminen per octets nuls" -#: builtin/update-index.c:806 +#: builtin/update-index.c:807 msgid "read list of paths to be updated from standard input" -msgstr "llegeix la llista de rutes que actualitzar des de l'entrada estàndard" +msgstr "llegeix la llista de rutes a actualitzar des de l'entrada estàndard" -#: builtin/update-index.c:810 +#: builtin/update-index.c:811 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:814 +#: builtin/update-index.c:815 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "reemplena les etapes #2 i #3 per a les rutes llistades" -#: builtin/update-index.c:818 +#: builtin/update-index.c:819 msgid "only update entries that differ from HEAD" msgstr "només actualitza les entrades que difereixin de HEAD" -#: builtin/update-index.c:822 +#: builtin/update-index.c:823 msgid "ignore files missing from worktree" msgstr "ignora els fitxers que manquin a l'arbre de treball" -#: builtin/update-index.c:825 +#: builtin/update-index.c:826 msgid "report actions to standard output" msgstr "informa de les accions en la sortida estàndard" -#: builtin/update-index.c:827 +#: builtin/update-index.c:828 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(per porcellanes) oblida't dels conflictes no resolts ni desats" -#: builtin/update-index.c:831 +#: builtin/update-index.c:832 msgid "write index in this format" msgstr "escriu l'índex en aquest format" -#: builtin/update-index.c:833 +#: builtin/update-index.c:834 msgid "enable or disable split index" msgstr "habilita o deshabilita l'índex dividit" @@ -9803,21 +10010,21 @@ msgstr "" msgid "git update-ref [options] --stdin [-z]" msgstr "git update-ref [opcions] --stdin [-z]" -#: builtin/update-ref.c:350 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "suprimeix la referència" -#: builtin/update-ref.c:352 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "actualitza <nom de referència>, no la a que assenyali" -#: builtin/update-ref.c:353 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "stdin té paràmetres terminats per NUL" -#: builtin/update-ref.c:354 +#: builtin/update-ref.c:367 msgid "read updates from stdin" -msgstr "llegeix actualitzacions des de stdin" +msgstr "llegeix les actualitzacions des d'stdin" #: builtin/update-server-info.c:6 msgid "git update-server-info [--force]" @@ -9835,15 +10042,15 @@ msgstr "git verify-commit [-v|--verbose] <comissió>..." msgid "print commit contents" msgstr "imprimeix els continguts de la comissió" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:54 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <paquet>..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:64 msgid "verbose" msgstr "verbós" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:66 msgid "show statistics only" msgstr "mostra només estadístiques" @@ -9853,7 +10060,7 @@ msgstr "git verify-tag [-v|--verbose] <etiqueta>..." #: builtin/verify-tag.c:73 msgid "print tag contents" -msgstr "imprimeix els continguits de l'etiqueta" +msgstr "imprimeix els continguts de l'etiqueta" #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" @@ -9869,46 +10076,30 @@ msgstr "escriu l'objecte d'arbre per a un subdirectori <prefix>" #: builtin/write-tree.c:30 msgid "only useful for debugging" -msgstr "només útil per la depuració" +msgstr "només útil per a la depuració" + +#: credential-cache--daemon.c:267 +msgid "print debugging messages to stderr" +msgstr "imprimeix els missatges de depuració a stderr" #: git.c:17 msgid "" -"'git help -a' and 'git help -g' lists available subcommands and some\n" +"'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" "'git help -a' i 'git help -g' llisten subordres disponibles i\n" -"algunes guies de concepte. Veu 'git help <command>' o\n" -"'git help <concept>' per llegir sobre un subordre o concepte\n" +"algunes guies de concepte. Veu 'git help <ordre>' o\n" +"'git help <concepte>' per a llegir sobre un subordre o concepte\n" "específic." -#: parse-options.h:143 -msgid "expiry-date" -msgstr "data-de-caducitat" - -#: parse-options.h:158 -msgid "no-op (backward compatibility)" -msgstr "operació nul·la (compatibilitat amb versions anteriors)" - -#: parse-options.h:232 -msgid "be more verbose" -msgstr "siguis més verbós" - -#: parse-options.h:234 -msgid "be more quiet" -msgstr "siguis més callat" - -#: parse-options.h:240 -msgid "use <n> digits to display SHA-1s" -msgstr "utilitza <n> xifres per presentar els SHA-1" - #: common-cmds.h:8 msgid "Add file contents to the index" -msgstr "Afegeix els continguts de fitxers a l'índex" +msgstr "Afegeix els continguts dels fitxers a l'índex" #: common-cmds.h:9 msgid "Find by binary search the change that introduced a bug" -msgstr "Troba per cerca binària el canvi que ha introduït un defecte" +msgstr "Troba per cerca binària el canvi que hagi introduït un defecte" #: common-cmds.h:10 msgid "List, create, or delete branches" @@ -9920,20 +10111,20 @@ msgstr "Agafa una rama o unes rutes a l'arbre de treball" #: common-cmds.h:12 msgid "Clone a repository into a new directory" -msgstr "Clona un repositori a un directori nou" +msgstr "Clona un dipòsit a un directori nou" #: common-cmds.h:13 msgid "Record changes to the repository" -msgstr "Registre els canvis al repositori" +msgstr "Registra els canvis al dipòsit" #: common-cmds.h:14 msgid "Show changes between commits, commit and working tree, etc" msgstr "" -"Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc" +"Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc." #: common-cmds.h:15 msgid "Download objects and refs from another repository" -msgstr "Baixa objectes i referències d'altre repositori" +msgstr "Baixa objectes i referències d'un altre dipòsit" #: common-cmds.h:16 msgid "Print lines matching a pattern" @@ -9941,7 +10132,7 @@ msgstr "Imprimeix les línies coincidents amb un patró" #: common-cmds.h:17 msgid "Create an empty Git repository or reinitialize an existing one" -msgstr "Crea un repositori de Git buit o reinicialitza un existent" +msgstr "Crea un dipòsit de Git buit o reinicialitza un existent" #: common-cmds.h:18 msgid "Show commit logs" @@ -9953,11 +10144,11 @@ msgstr "Uneix dos o més històries de desenvolupament" #: common-cmds.h:20 msgid "Move or rename a file, a directory, or a symlink" -msgstr "Mou o canvia de nom un fitxer, directori, o enllaç simbòlic" +msgstr "Mou o canvia de nom un fitxer, directori o enllaç simbòlic" #: common-cmds.h:21 msgid "Fetch from and integrate with another repository or a local branch" -msgstr "Obté de i integra con altre repositori o una rama local" +msgstr "Obté de i integra con un altre dipòsit o una rama local" #: common-cmds.h:22 msgid "Update remote refs along with associated objects" @@ -9988,6 +10179,31 @@ 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 +msgid "expiry-date" +msgstr "data-de-caducitat" + +#: parse-options.h:158 +msgid "no-op (backward compatibility)" +msgstr "operació nul·la (per a compatibilitat amb versions anteriors)" + +#: parse-options.h:232 +msgid "be more verbose" +msgstr "siguis més verbós" + +#: parse-options.h:234 +msgid "be more quiet" +msgstr "siguis més callat" + +#: parse-options.h:240 +msgid "use <n> digits to display SHA-1s" +msgstr "usa <n> xifres per presentar els SHA-1" + +#: rerere.h:27 +msgid "update the index with reused conflict resolution if possible" +msgstr "" +"actualitza l'índex amb la resolució de conflicte reusada si és possible" + #: git-am.sh:52 msgid "You need to set your committer info first" msgstr "Cal establir la vostra informació de comitent primer" @@ -10007,7 +10223,7 @@ msgid "" "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" "To restore the original branch and stop patching, run \"$cmdline --abort\"." msgstr "" -"Quan heu resolt aquest problema, executeu \"$cmdline --continue\".\n" +"Quan hàgiu resolt aquest problema, executeu \"$cmdline --continue\".\n" "Si preferiu saltar aquest pedaç, executeu \"$cmdline --skip\" en lloc.\n" "Per restaurar la rama original i deixar d'apedaçar, executeu \"$cmdline --" "abort\"." @@ -10019,12 +10235,12 @@ msgstr "No es pot retrocedir a una fusió de 3 vies." #: git-am.sh:139 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -"Al repositori li manquen els blobs necessaris per a retrocedir a una fusió " -"de 3 vies." +"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 " +"vies." #: git-am.sh:141 msgid "Using index info to reconstruct a base tree..." -msgstr "Utilitzant la informació d'índex per reconstruir un arbre base..." +msgstr "Usant la informació d'índex per a reconstruir un arbre base..." #: git-am.sh:156 msgid "" @@ -10036,11 +10252,11 @@ msgstr "" #: git-am.sh:165 msgid "Falling back to patching base and 3-way merge..." -msgstr "Retrocedint a apedaçar el base i fusionar de 3 vies..." +msgstr "Retrocedint a apedaçar la base i fusionar de 3 vies..." #: git-am.sh:181 msgid "Failed to merge in the changes." -msgstr "S'ha fallat al fusionar els canvis." +msgstr "S'ha fallat en fusionar els canvis." #: git-am.sh:276 msgid "Only one StGIT patch series can be applied at once" @@ -10061,7 +10277,7 @@ msgid "" "it will be removed. Please do not use it anymore." msgstr "" "Fa molt que l'opció -b/--binary no ha fet res, i\n" -"es traurà. Si us plau, no l'utilitzis més." +"es traurà. Si us plau, no l'usis més." #: git-am.sh:486 #, sh-format @@ -10081,11 +10297,11 @@ msgid "" "Use \"git am --abort\" to remove it." msgstr "" "Directori $dotest extraviat trobat.\n" -"Utilitzeu \"git am --abort\" per treure'l." +"Useu \"git am --abort\" per a treure'l." #: git-am.sh:535 msgid "Resolve operation not in progress, we are not resuming." -msgstr "Operació de resolució no en curs, no reprenem." +msgstr "Operació de resolució no en curs; no reprenem." #: git-am.sh:601 #, sh-format @@ -10100,9 +10316,9 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" "El pedaç és buit. S'ha dividit mal?\n" -"Si preferiríeu saltar aquest pedaç, en lloc executeu \"$cmdline --skip\".\n" -"Per restaurar la rama original i deixar d'empaquetar, executeu \"$cmdline --" -"abort\"." +"Si preferiríeu saltar aquest pedaç, executeu en lloc \"$cmdline --skip\".\n" +"Per a restaurar la rama original i deixar d'empaquetar, executeu \"$cmdline " +"--abort\"." #: git-am.sh:732 msgid "Patch does not have a valid e-mail address." @@ -10122,7 +10338,7 @@ msgstr "El cos de la comissió és:" #. input at this point. #: git-am.sh:790 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -msgstr "Aplica? sí [y]/[n]o/[e]dita/[v]isualitza pedaç/[a]ccepta tots" +msgstr "Aplica? [y]es/[n]o/[e]dita/[v]isualitza pedaç/[a]ccepta tots" #: git-am.sh:826 #, sh-format @@ -10135,8 +10351,8 @@ msgid "" "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 "" -"Cap canvi - heu oblidat utilitzar 'git add'?\n" -"Si no hi ha res que allistar, probablement alguna altra cosa\n" +"Cap canvi - heu oblidat usar 'git add'?\n" +"Si no hi ha res a allistar, probablement alguna altra cosa\n" "ja ha introduït els mateixos canvis; potser voleu saltar aquest pedaç." #: git-am.sh:855 @@ -10145,11 +10361,11 @@ msgid "" "did you forget to use 'git add'?" msgstr "" "Encara teniu rutes sense fusionar en el vostre índex\n" -"heu oblidat utilitzar 'git add'?" +"heu oblidat d'usar 'git add'?" #: git-am.sh:871 msgid "No changes -- Patch already applied." -msgstr "Sense canvis -- Pedaç ja aplicat." +msgstr "Sense canvis -- El pedaç ja s'ha aplicat." #: git-am.sh:881 #, sh-format @@ -10178,7 +10394,7 @@ msgstr "Cal començar per \"git bisect start\"" #. at this point. #: git-bisect.sh:54 msgid "Do you want me to do it for you [Y/n]? " -msgstr "Voleu que jo el faci per vós [Y/n]? " +msgstr "Voleu que es faci per vós [Y/n]? " #: git-bisect.sh:95 #, sh-format @@ -10199,8 +10415,8 @@ msgstr "HEAD dolent - Cal un HEAD" msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." msgstr "" -"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset " -"<validbranch>'." +"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <rama-" +"vàlida>'." #: git-bisect.sh:140 msgid "won't bisect on cg-seek'ed tree" @@ -10246,21 +10462,21 @@ msgstr "Esteu segur [Y/n]? " #: git-bisect.sh:289 msgid "" -"You need to give me at least one good and one bad revisions.\n" +"You need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Cal donar-me almenys una revisió bona i una dolenta.\n" -"(Podeu utilitzar \"git bisect bad\" i \"git bisect good\" per això.)" +"(Podeu usar \"git bisect bad\" i \"git bisect good\" per això.)" #: git-bisect.sh:292 msgid "" "You need to start by \"git bisect start\".\n" -"You then need to give me at least one good and one bad revisions.\n" +"You then need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Cal començar amb \"git bisect start\".\n" "Després cal donar-me almenys una revisió bona i una dolenta.\n" -"(Podeu utilitzar \"git bisect bad\" i \"git bisect good\" per això.)" +"(Podeu usar \"git bisect bad\" i \"git bisect good\" per això.)" #: git-bisect.sh:363 git-bisect.sh:490 msgid "We are not bisecting." @@ -10287,7 +10503,7 @@ msgstr "Cap fitxer de registre donat" #: git-bisect.sh:407 #, sh-format msgid "cannot read $file for replaying" -msgstr "no es pot llegir $file per reproduir" +msgstr "no es pot llegir $file per a reproducció" #: git-bisect.sh:424 msgid "?? what are you talking about?" @@ -10328,17 +10544,25 @@ msgstr "pas de bisecció reeixit" 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, or use 'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" "Baixar no és possible perquè teniu fitxers sense fusionar.\n" -"Si us plau, arregleu-los en l'arbre de treball, i després utilitzeu\n" -"'git add/rm <file>' segons sigui apropiat per a marcar resolució, o\n" -"utilitzeu 'git commit -a'." +"Si us plau, arregleu-los en l'arbre de treball, i després useu\n" +"'git add/rm <fitxer>' segons sigui apropiat per a marcar resolució i\n" +"feu una comissió." #: git-pull.sh:25 msgid "Pull is not possible because you have unmerged files." msgstr "Baixar no és possible perquè teniu fitxers sense fusionar." +#: git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"No heu terminat la vostra fusió (MERGE_HEAD existeix).\n" +"Si us plau, cometeu els vostres canvis abans de fusionar." + #: git-pull.sh:245 msgid "updating an unborn branch with changes added to the index" msgstr "actualitzant una rama no nascuda amb canvis afegits a l'índex" @@ -10350,14 +10574,13 @@ msgid "" "Warning: fast-forwarding your working tree from\n" "Warning: commit $orig_head." msgstr "" -"Avís: l'obteniment ha actualitzat el cap de la\n" -"Avís: rama actual. avançant ràpidament el\n" -"Avís: vostre arbre de treball des de la\n" -"Avís: comissió $orig_head." +"Avís: l'obteniment ha actualitzat el cap de la rama actual.\n" +"Avís: avançant ràpidament el vostre arbre de\n" +"Avís: treball des de la comissió $orig_head." #: git-pull.sh:294 msgid "Cannot merge multiple branches into empty head" -msgstr "No es pot fusionar múltiples rama a un cap buit" +msgstr "No es pot fusionar múltiples rames a un cap buit" #: git-pull.sh:298 msgid "Cannot rebase onto multiple branches" @@ -10370,14 +10593,14 @@ msgid "" "To check out the original branch and stop rebasing, run \"git rebase --abort" "\"." msgstr "" -"Quan heu resolt aquest problema, executeu \"git rebase --continue\".\n" +"Quan hàgiu resolt aquest problema, executeu \"git rebase --continue\".\n" "Si preferiu saltar aquest pedaç, executeu \"git rebase --skip\" en lloc.\n" -"Per agafar la rama original i deixar de rebasar, executeu \"git rebase --" +"Per a agafar la rama original i deixar de rebasar, executeu \"git rebase --" "abort\"." #: git-rebase.sh:165 msgid "Applied autostash." -msgstr "Magatzem automàtic aplicat." +msgstr "S'ha aplicat el magatzem automàtic." #: git-rebase.sh:168 #, sh-format @@ -10391,7 +10614,7 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" "L'aplicació del magatzem automàtic ha resultat en conflictes.\n" -"Els vostres canvis estan segurs el el magatzem.\n" +"Els vostres canvis estan segurs en el magatzem.\n" "Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n" #: git-rebase.sh:208 @@ -10404,16 +10627,15 @@ msgstr "Sembla que git-am està en curs. No es pot rebasar." #: git-rebase.sh:351 msgid "The --exec option must be used with the --interactive option" -msgstr "L'opció --exec s'ha d'utilitzar amb l'opció --interactive" +msgstr "L'opció --exec s'ha d'usar amb l'opció --interactive" #: git-rebase.sh:356 msgid "No rebase in progress?" -msgstr "Cap rebase en curs?" +msgstr "No hi ha rebase en curs?" #: git-rebase.sh:367 msgid "The --edit-todo action can only be used during interactive rebase." -msgstr "" -"L'acció --edit-todo només es pot utilitzar durant un rebase interactiu." +msgstr "L'acció --edit-todo només es pot usar durant una rebase interactiu." #: git-rebase.sh:374 msgid "Cannot read HEAD" @@ -10425,7 +10647,7 @@ msgid "" "mark them as resolved using git add" msgstr "" "Heu d'editar tots els conflictes de fusió i després\n" -"marcar-los com resolts utilitzant git add" +"marcar-los com a resolts per usar git add" #: git-rebase.sh:395 #, sh-format @@ -10444,8 +10666,8 @@ msgid "" "and run me again. I am stopping in case you still have something\n" "valuable there." msgstr "" -"Semla que ja hi ha altre directori $state_dir_base, i\n" -"em pregonu si esteu en el medi d'altre rebase. Si això és el\n" +"Sembla que ja hi ha un directori $state_dir_base, i\n" +"em pregono si esteu en el medi d'una altra rebase. Si això és el\n" "cas, si us plau, proveu\n" "\t$cmd_live_rebase\n" "Si no és el cas, si us plau,\n" @@ -10461,7 +10683,7 @@ msgstr "font invàlida $upstream_name" #: git-rebase.sh:489 #, sh-format msgid "$onto_name: there are more than one merge bases" -msgstr "$onto_name: ja hi ha més d'un base de fusió" +msgstr "$onto_name: ja hi ha més d'una base de fusió" #: git-rebase.sh:492 git-rebase.sh:496 #, sh-format @@ -10476,7 +10698,7 @@ msgstr "No assenyala una comissió vàlida: $onto_name" #: git-rebase.sh:524 #, sh-format msgid "fatal: no such branch: $branch_name" -msgstr "fatal: cap rama així: $branch_name" +msgstr "fatal: no hi ha tal rama: $branch_name" #: git-rebase.sh:557 msgid "Cannot autostash" @@ -10485,7 +10707,7 @@ msgstr "No es pot emmagatzemar automàticament" #: git-rebase.sh:562 #, sh-format msgid "Created autostash: $stash_abbrev" -msgstr "Magatzem automàtic creat: $stash_abbrev" +msgstr "S'ha creat un magatzem automàtic: $stash_abbrev" #: git-rebase.sh:566 msgid "Please commit or stash them." @@ -10494,12 +10716,12 @@ msgstr "Si us plau, cometeu-los o emmagatzemeu-los." #: git-rebase.sh:586 #, sh-format msgid "Current branch $branch_name is up to date." -msgstr "La rama actual $branch_name està actualitzada." +msgstr "La rama actual $branch_name està al dia." #: git-rebase.sh:590 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." -msgstr "La rama actual $branch_name està actualitzada, rebase forçat." +msgstr "La rama actual $branch_name està al dia; rebase forçada." #: git-rebase.sh:601 #, sh-format @@ -10508,12 +10730,12 @@ msgstr "Canvis de $mb a $onto:" #: git-rebase.sh:610 msgid "First, rewinding head to replay your work on top of it..." -msgstr "Primer, rebobinant el cap per reproduir el vostre treball encima..." +msgstr "Primer, rebobinant el cap per a reproduir el vostre treball encima..." #: git-rebase.sh:620 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." -msgstr "$branch_name avançada ràpidament a $onto_name" +msgstr "S'ha avançat $branch_name ràpidament a $onto_name" #: git-stash.sh:51 msgid "git stash clear with parameters is unimplemented" @@ -10533,7 +10755,7 @@ msgstr "No es pot desar l'estat d'arbre de treball actual" #: git-stash.sh:141 msgid "No changes selected" -msgstr "Cap canvi seleccionat" +msgstr "No hi ha canvis seleccionats" #: git-stash.sh:144 msgid "Cannot remove temporary index (can't happen)" @@ -10565,15 +10787,15 @@ msgid "" " To provide a message, use git stash save -- '$option'" msgstr "" "error: opció desconeguda de 'stash save': $option\n" -" Per proveir un missatge, utilitzeu git stash save -- '$option'" +" Per a proveir un missatge, useu git stash save -- '$option'" #: git-stash.sh:259 msgid "No local changes to save" -msgstr "Cap canvi local que desar" +msgstr "No hi ha canvis locals a desar" #: git-stash.sh:263 msgid "Cannot initialize stash" -msgstr "No es pot inicialitzar el magatzem." +msgstr "No es pot inicialitzar el magatzem" #: git-stash.sh:267 msgid "Cannot save the current status" @@ -10594,13 +10816,13 @@ msgstr "Massa revisions especificades: $REV" #: git-stash.sh:397 #, sh-format -msgid "$reference is not valid reference" +msgid "$reference is not a valid reference" msgstr "$reference no és referència vàlida" #: git-stash.sh:425 #, sh-format msgid "'$args' is not a stash-like commit" -msgstr "'$args' no és comissió com a un magatzem" +msgstr "'$args' no és comissió com magatzem" #: git-stash.sh:436 #, sh-format @@ -10641,11 +10863,11 @@ msgstr "${REV} ($s) descartada" msgid "${REV}: Could not drop stash entry" msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem" -#: git-stash.sh:538 +#: git-stash.sh:539 msgid "No branch name specified" msgstr "Cap nom de rama especificat" -#: git-stash.sh:610 +#: git-stash.sh:611 msgid "(To restore them type \"git stash apply\")" msgstr "(Per restaurar-les teclegeu \"git stash apply\")" @@ -10658,7 +10880,8 @@ msgstr "no es pot despullar un component de l'url '$remoteurl'" #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" -"Cap mapatge de submòdul trobada en .gitmodules per a la ruta '$sm_path'" +"No s'ha trobat una mapatge de submòdul en .gitmodules per a la ruta " +"'$sm_path'" #: git-submodule.sh:287 #, sh-format @@ -10674,14 +10897,13 @@ msgstr "" #: git-submodule.sh:406 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -"La ruta relativa només es pot utilitzar des del nivell superior de l'arbre " -"de treball" +"La ruta relativa només es pot usar des del nivell superior de l'arbre de " +"treball" #: git-submodule.sh:416 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" -msgstr "" -"URL de repositori: '$repo' ha de ser absolut o ha de començar amb ./|../" +msgstr "URL de dipòsit: '$repo' ha de ser absolut o començar amb ./|../" #: git-submodule.sh:433 #, sh-format @@ -10697,17 +10919,17 @@ msgid "" msgstr "" "La ruta següent s'ignora per un dels vostres fitxers .gitignore:\n" "$sm_path\n" -"Utilitzeu -f si realment voleu afegir-lo." +"Useu -f si realment voleu afegir-lo." #: git-submodule.sh:455 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" -msgstr "Afegint el repositori existent a '$sm_path' a l'índex" +msgstr "Afegint el dipòsit existent a '$sm_path' a l'índex" #: git-submodule.sh:457 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "'$sm_path' ja existeix i no és un repositori de git vàlid" +msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid" #: git-submodule.sh:465 #, sh-format @@ -10720,16 +10942,16 @@ msgstr "" msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "" -"Si voleu reutilitzar aquest directori de git local en lloc de clonar de nou " -"de" +"Si voleu tornar a usar aquest directori de git local en lloc de clonar de " +"nou des de" #: git-submodule.sh:469 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" -"utilitzeu l'opció '--force'. Si el directori de git local no és el " -"repositori correcte" +"useu l'opció '--force'. Si el directori de git local no és el dipòsit " +"correcte" #: git-submodule.sh:470 #, sh-format @@ -10737,7 +10959,7 @@ msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -"o esteu insegur de què vol dir això, trieu altre nom amb l'opció '--name'." +"o esteu insegur de què vol dir això, trieu un altre nom amb l'opció '--name'." #: git-submodule.sh:472 #, sh-format @@ -10752,12 +10974,12 @@ msgstr "Incapaç d'agafar el submòdul '$sm_path'" #: git-submodule.sh:489 #, sh-format msgid "Failed to add submodule '$sm_path'" -msgstr "S'ha fallat al afegir el submòdul '$sm_path'" +msgstr "S'ha fallat en afegir el submòdul '$sm_path'" #: git-submodule.sh:498 #, sh-format msgid "Failed to register submodule '$sm_path'" -msgstr "S'ha fallat al registrar el submòdul '$sm_path'" +msgstr "S'ha fallat en registrar el submòdul '$sm_path'" #: git-submodule.sh:542 #, sh-format @@ -10773,30 +10995,31 @@ msgstr "" #: git-submodule.sh:608 #, sh-format msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "Cap url trobat per a la ruta de submòdul '$displaypath' en .gitmodules" +msgstr "" +"No s'ha trobat un url per a la ruta de submòdul '$displaypath' en .gitmodules" #: git-submodule.sh:617 #, sh-format msgid "Failed to register url for submodule path '$displaypath'" msgstr "" -"S'ha fallat al registrar l'url per a la ruta de submòdul '$displaypath'" +"S'ha fallat en registrar l'url per a la ruta de submòdul '$displaypath'" #: git-submodule.sh:619 #, sh-format msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "Submòdul '$name' ($url) registrat per a la ruta '$displaypath'" +msgstr "S'ha registrat el submòdul '$name' ($url) per a la ruta '$displaypath'" #: git-submodule.sh:636 #, sh-format msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "" -"S'ha fallat al registrar el mode d'actualització per a la ruta de submòdul " +"S'ha fallat en registrar el mode d'actualització per a la ruta de submòdul " "'$displaypath'" #: git-submodule.sh:674 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "Utilitzeu '.' si realment voleu desinicialitzar tots els submòduls" +msgstr "Useu '.' si realment voleu desinicialitzar tots els submòduls" #: git-submodule.sh:691 #, sh-format @@ -10808,7 +11031,7 @@ msgstr "L'arbre de treball de submòdul '$displaypath' conté un directori .git" msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -"(utilitzeu 'rm -rf' si realment voleu treure'l inclòs tota la seva història)" +"(useu 'rm -rf' si realment voleu treure'l inclòs tota la seva història)" #: git-submodule.sh:698 #, sh-format @@ -10817,7 +11040,7 @@ msgid "" "discard them" msgstr "" "L'arbre de treball de submòdul '$displaypath' conté modificacions locals; " -"utilitzeu '-f' per descartar-les" +"useu '-f' per a descartar-les" #: git-submodule.sh:701 #, sh-format @@ -10846,7 +11069,7 @@ msgid "" "Maybe you want to use 'update --init'?" msgstr "" "Ruta de submòdul '$displaypath' no inicialitzat\n" -"Potser voleu utilitzar 'update --init'?" +"Potser voleu usar 'update --init'?" #: git-submodule.sh:843 #, sh-format @@ -10857,12 +11080,12 @@ msgstr "" #: git-submodule.sh:852 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" -msgstr "Incapaç d'agafar en la ruta de submòdul '$sm_path'" +msgstr "Incapaç d'obtenir en la ruta de submòdul '$sm_path'" #: git-submodule.sh:876 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" -msgstr "Incapaç d'agafar en la ruta de submòdul '$displaypath'" +msgstr "Incapaç d'obtenir en la ruta de submòdul '$displaypath'" #: git-submodule.sh:890 #, sh-format @@ -10872,7 +11095,7 @@ msgstr "Incapaç d'agafar '$sha1' en la ruta de submòdul '$displaypath'" #: git-submodule.sh:891 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" -msgstr "Ruta de submòdul '$displaypath': agafat '$sha1'" +msgstr "Ruta de submòdul '$displaypath': s'ha agafat '$sha1'" #: git-submodule.sh:895 #, sh-format @@ -10882,7 +11105,7 @@ msgstr "Incapaç de rebasar '$sha1' en la ruta de submòdul '$displaypath'" #: git-submodule.sh:896 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" -msgstr "Ruta de submòdul '$displaypath': rebasada en '$sha1'" +msgstr "Ruta de submòdul '$displaypath': s'ha rebasat en '$sha1'" #: git-submodule.sh:901 #, sh-format @@ -10892,7 +11115,7 @@ msgstr "Incapaç de fusionar '$sha1' en la ruta de submòdul '$displaypath'" #: git-submodule.sh:902 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" -msgstr "Ruta de submòdul '$displaypath': fusionada en '$sha1'" +msgstr "Ruta de submòdul '$displaypath': s'ha fusionat en '$sha1'" #: git-submodule.sh:907 #, sh-format @@ -10910,11 +11133,11 @@ msgstr "Ruta de submòdul '$prefix$sm_path': '$command $sha1'" #: git-submodule.sh:938 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" -msgstr "S'ha fallat al recursar a la ruta de submòdul '$displaypath'" +msgstr "S'ha fallat en recursar a la ruta de submòdul '$displaypath'" #: git-submodule.sh:1046 msgid "The --cached option cannot be used with the --files option" -msgstr "L'opció --cached no es pot utilitzar amb l'opció --files" +msgstr "L'opció --cached no es pot usar amb l'opció --files" #: git-submodule.sh:1098 #, sh-format @@ -10943,7 +11166,7 @@ msgstr "blob" #: git-submodule.sh:1267 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "S'ha fallat al recursar a la ruta de submòdul '$sm_path'" +msgstr "S'ha fallat en recursar a la ruta de submòdul '$sm_path'" #: git-submodule.sh:1331 #, sh-format @@ -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: 2014-08-04 14:48+0800\n" -"PO-Revision-Date: 2013-07-28 18:42+0200\n" +"POT-Creation-Date: 2014-11-20 09:42+0800\n" +"PO-Revision-Date: 2014-11-20 10:19+0800\n" "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" "Language-Team: German <>\n" "Language: de\n" @@ -25,106 +25,105 @@ msgstr "Hinweis: %.*s\n" #: advice.c:88 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, or use\n" -"'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" "Korrigieren Sie dies im Arbeitsverzeichnis, und benutzen Sie\n" "dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n" -"und zu committen, oder benutzen Sie 'git commit -a'." +"und zu committen." -#: archive.c:10 +#: archive.c:11 msgid "git archive [options] <tree-ish> [<path>...]" msgstr "git archive [Optionen] <Commit-Referenz> [<Pfad>...]" -#: archive.c:11 +#: archive.c:12 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:12 +#: archive.c:13 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" msgstr "" "git archive --remote <Repository> [--exec <Programm>] [Optionen] <Commit-" "Referenz> [Pfad...]" -#: archive.c:13 +#: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <Repository> [--exec <Programm>] --list" -#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" -#: archive.c:328 +#: archive.c:419 msgid "fmt" msgstr "Format" -#: archive.c:328 +#: archive.c:419 msgid "archive format" msgstr "Archivformat" -#: archive.c:329 builtin/log.c:1201 +#: archive.c:420 builtin/log.c:1204 msgid "prefix" msgstr "Präfix" -#: archive.c:330 +#: archive.c:421 msgid "prepend prefix to each pathname in the archive" -msgstr "stellt einen Präfix vor jeden Pfadnamen in dem Archiv" +msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen" -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709 -#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412 -#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151 +#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411 +#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "Datei" -#: archive.c:332 builtin/archive.c:89 +#: archive.c:423 builtin/archive.c:89 msgid "write the archive to this file" -msgstr "schreibt das Archiv in diese Datei" +msgstr "das Archiv in diese Datei schreiben" -#: archive.c:334 +#: archive.c:425 msgid "read .gitattributes in working directory" -msgstr "liest .gitattributes aus dem Arbeitsverzeichnis" +msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen" -#: archive.c:335 +#: archive.c:426 msgid "report archived files on stderr" -msgstr "gibt archivierte Dateien in der Standard-Fehlerausgabe aus" +msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben" -#: archive.c:336 +#: archive.c:427 msgid "store only" msgstr "nur speichern" -#: archive.c:337 +#: archive.c:428 msgid "compress faster" msgstr "schneller komprimieren" -#: archive.c:345 +#: archive.c:436 msgid "compress better" msgstr "besser komprimieren" -#: archive.c:348 +#: archive.c:439 msgid "list supported archive formats" -msgstr "listet unterstützte Archivformate auf" +msgstr "unterstützte Archivformate auflisten" -#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 +#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85 msgid "repo" msgstr "Repository" -#: archive.c:351 builtin/archive.c:91 +#: archive.c:442 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" -msgstr "ruft das Archiv von Remote-Repository <Repository> ab" +msgstr "Archiv vom Remote-Repository <Repository> abrufen" -#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 +#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490 msgid "command" msgstr "Programm" -#: archive.c:353 builtin/archive.c:93 +#: archive.c:444 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "Pfad zum externen \"git-upload-archive\"-Programm" -#: attr.c:259 +#: attr.c:258 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -186,33 +185,33 @@ msgstr "" "Konfiguration zum Folgen von Branch nicht eingerichtet. Referenz %s ist " "mehrdeutig." -#: branch.c:178 +#: branch.c:162 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' ist kein gültiger Branchname." -#: branch.c:183 +#: branch.c:167 #, c-format msgid "A branch named '%s' already exists." msgstr "Branch '%s' existiert bereits." -#: branch.c:191 +#: branch.c:175 msgid "Cannot force update the current branch." msgstr "Kann Aktualisierung des aktuellen Branches nicht erzwingen." -#: branch.c:211 +#: branch.c:195 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "Kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein " "Branch." -#: branch.c:213 +#: branch.c:197 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "der angeforderte Upstream-Branch '%s' existiert nicht" -#: branch.c:215 +#: branch.c:199 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -233,107 +232,105 @@ msgstr "" "\"git push -u\" verwenden, um den Upstream-Branch beim \"push\"\n" "zu konfigurieren." -#: branch.c:260 +#: branch.c:243 #, c-format msgid "Not a valid object name: '%s'." msgstr "Ungültiger Objekt-Name: '%s'" -#: branch.c:280 +#: branch.c:263 #, c-format msgid "Ambiguous object name: '%s'." msgstr "mehrdeutiger Objekt-Name: '%s'" -#: branch.c:285 +#: branch.c:268 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Ungültiger Branchpunkt: '%s'" -#: branch.c:291 -msgid "Failed to lock ref for update" -msgstr "Fehler beim Sperren der Referenz zur Aktualisierung." - -#: branch.c:309 -msgid "Failed to write ref" -msgstr "Fehler beim Schreiben der Referenz." - -#: bundle.c:33 +#: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" -#: bundle.c:60 +#: bundle.c:61 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "nicht erkannter Kopfbereich: %s%s (%d)" -#: bundle.c:86 builtin/commit.c:755 +#: bundle.c:87 builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "Konnte '%s' nicht öffnen" -#: bundle.c:138 +#: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:" -#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330 -#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357 +#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706 +#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" -#: bundle.c:184 +#: bundle.c:185 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Das Paket enthält diese Referenz:" msgstr[1] "Das Paket enthält diese %d Referenzen:" -#: bundle.c:191 +#: bundle.c:192 msgid "The bundle records a complete history." msgstr "Das Paket speichert eine komplette Historie." -#: bundle.c:193 +#: bundle.c:194 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Das Paket benötigt diese Referenz:" msgstr[1] "Das Paket benötigt diese %d Referenzen:" -#: bundle.c:289 +#: bundle.c:251 +msgid "Could not spawn pack-objects" +msgstr "Konnte Paketobjekte nicht erstellen" + +#: bundle.c:269 +msgid "pack-objects died" +msgstr "Erstellung der Paketobjekte abgebrochen" + +#: bundle.c:309 msgid "rev-list died" msgstr "\"rev-list\" abgebrochen" -#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261 -#, c-format -msgid "unrecognized argument: %s" -msgstr "nicht erkanntes Argument: %s" - -#: bundle.c:330 +#: bundle.c:358 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen" -#: bundle.c:375 +#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#, c-format +msgid "unrecognized argument: %s" +msgstr "nicht erkanntes Argument: %s" + +#: bundle.c:444 msgid "Refusing to create empty bundle." msgstr "Erstellung eines leeren Pakets zurückgewiesen." -#: bundle.c:390 -msgid "Could not spawn pack-objects" -msgstr "Konnte Paketobjekte nicht erstellen" - -#: bundle.c:408 -msgid "pack-objects died" -msgstr "Erstellung der Paketobjekte abgebrochen" - -#: bundle.c:411 +#: bundle.c:454 #, c-format msgid "cannot create '%s'" msgstr "kann '%s' nicht erstellen" -#: bundle.c:433 +#: bundle.c:475 msgid "index-pack died" msgstr "Erstellung der Paketindexdatei abgebrochen" +#: color.c:157 +#, c-format +msgid "invalid color value: %.*s" +msgstr "Ungültiger Farbwert: %.*s" + #: commit.c:40 #, c-format msgid "could not parse %s" @@ -348,16 +345,73 @@ msgstr "%s %s ist kein Commit!" msgid "memory exhausted" msgstr "Speicher verbraucht" -#: connected.c:70 +#: config.c:469 config.c:471 +#, c-format +msgid "bad config file line %d in %s" +msgstr "Zeile %d in Konfigurationsdatei %s ist ungültig." + +#: config.c:587 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s" + +#: config.c:589 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s" + +#: config.c:674 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'" + +#: config.c:752 config.c:763 +#, c-format +msgid "bad zlib compression level %d" +msgstr "ungültiger zlib Komprimierungsgrad %d" + +#: config.c:885 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "Ungültiger Modus für Objekterstellung: %s" + +#: config.c:1201 +msgid "unable to parse command-line config" +msgstr "" +"Konnte die über die Kommandozeile angegebene Konfiguration nicht parsen." + +#: config.c:1262 +msgid "unknown error occured while reading the configuration files" +msgstr "" +"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf." + +#: config.c:1586 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "" +"Konnte Wert '%s' aus der über die Kommandozeile angegebenen\n" +"Konfiguration nicht parsen." + +#: config.c:1588 +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d" + +#: config.c:1647 +#, c-format +msgid "%s has multiple values" +msgstr "%s hat mehrere Werte" + +#: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Konnte 'git rev-list' nicht ausführen" -#: connected.c:90 +#: connected.c:89 #, c-format msgid "failed write to rev-list: %s" msgstr "Fehler beim Schreiben nach rev-list: %s" -#: connected.c:98 +#: connected.c:97 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe: %s" @@ -435,7 +489,7 @@ msgstr[1] "vor %lu Jahren" msgid "failed to read orderfile '%s'" msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'." -#: diffcore-rename.c:514 +#: diffcore-rename.c:516 msgid "Performing inexact rename detection" msgstr "Führe Erkennung für ungenaue Umbenennung aus" @@ -455,7 +509,7 @@ msgstr " Unbekannter \"dirstat\" Parameter '%s'\n" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'" -#: diff.c:267 +#: diff.c:266 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -464,16 +518,16 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:2934 +#: diff.c:2957 #, c-format msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" -#: diff.c:3329 +#: diff.c:3352 msgid "--follow requires exactly one pathspec" msgstr "--follow erfordert genau eine Pfadspezifikation" -#: diff.c:3492 +#: diff.c:3515 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -482,44 +536,44 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:3506 +#: diff.c:3529 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" -#: gpg-interface.c:73 gpg-interface.c:145 +#: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "konnte gpg nicht ausführen" -#: gpg-interface.c:85 +#: gpg-interface.c:141 msgid "gpg did not accept the data" msgstr "gpg hat die Daten nicht akzeptiert" -#: gpg-interface.c:96 +#: gpg-interface.c:152 msgid "gpg failed to sign the data" msgstr "gpg beim Signieren der Daten fehlgeschlagen" -#: gpg-interface.c:129 +#: gpg-interface.c:185 #, c-format msgid "could not create temporary file '%s': %s" msgstr "konnte temporäre Datei '%s' nicht erstellen: %s" -#: gpg-interface.c:132 +#: gpg-interface.c:188 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "Fehler beim Schreiben der Signatur nach '%s': %s" -#: grep.c:1703 +#: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': konnte nicht lesen %s" -#: grep.c:1720 +#: grep.c:1735 #, c-format msgid "'%s': %s" msgstr "'%s': %s" -#: grep.c:1731 +#: grep.c:1746 #, c-format msgid "'%s': short read %s" msgstr "'%s': read() zu kurz %s" @@ -588,87 +642,95 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: merge.c:40 +#: lockfile.c:275 +msgid "BUG: reopen a lockfile that is still open" +msgstr "FEHLER: Wiederöffnen einer bereits geöffneten Lock-Datei" + +#: lockfile.c:277 +msgid "BUG: reopen a lockfile that has been committed" +msgstr "FEHLER: Wiederöffnen einer bereits committeten Lock-Datei" + +#: merge.c:41 msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" -#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556 -#: builtin/clone.c:661 +#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562 +#: builtin/clone.c:659 msgid "unable to write new index file" msgstr "Konnte neue Staging-Area-Datei nicht schreiben." -#: merge-recursive.c:190 +#: merge-recursive.c:189 #, c-format msgid "(bad commit)\n" msgstr "(ungültiger Commit)\n" -#: merge-recursive.c:210 +#: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen" -#: merge-recursive.c:271 +#: merge-recursive.c:270 msgid "error building trees" msgstr "Fehler beim Erstellen der \"Tree\"-Objekte" -#: merge-recursive.c:692 +#: merge-recursive.c:691 #, c-format msgid "failed to create path '%s'%s" msgstr "Fehler beim Erstellen des Pfades '%s'%s" -#: merge-recursive.c:703 +#: merge-recursive.c:702 #, 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:717 merge-recursive.c:738 +#: merge-recursive.c:716 merge-recursive.c:737 msgid ": perhaps a D/F conflict?" msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?" -#: merge-recursive.c:728 +#: merge-recursive.c:727 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "verweigere, da unbeobachtete Dateien in '%s' verloren gehen würden" -#: merge-recursive.c:768 +#: merge-recursive.c:767 #, c-format msgid "cannot read object %s '%s'" msgstr "kann Objekt %s '%s' nicht lesen" -#: merge-recursive.c:770 +#: merge-recursive.c:769 #, c-format msgid "blob expected for %s '%s'" msgstr "Blob erwartet für %s '%s'" -#: merge-recursive.c:793 builtin/clone.c:317 +#: merge-recursive.c:792 builtin/clone.c:318 #, c-format msgid "failed to open '%s'" msgstr "Fehler beim Öffnen von '%s'" -#: merge-recursive.c:801 +#: merge-recursive.c:800 #, c-format msgid "failed to symlink '%s'" msgstr "Fehler beim Erstellen eines symbolischen Verweises für '%s'" -#: merge-recursive.c:804 +#: merge-recursive.c:803 #, 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:942 +#: merge-recursive.c:941 msgid "Failed to execute internal merge" msgstr "Fehler bei Ausführung des internen Merges" -#: merge-recursive.c:946 +#: merge-recursive.c:945 #, c-format msgid "Unable to add %s to database" msgstr "Konnte %s nicht zur Datenbank hinzufügen" -#: merge-recursive.c:962 +#: merge-recursive.c:961 msgid "unsupported object type in the tree" msgstr "nicht unterstützter Objekttyp im Verzeichnis" -#: merge-recursive.c:1037 merge-recursive.c:1051 +#: merge-recursive.c:1036 merge-recursive.c:1050 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -677,7 +739,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:1043 merge-recursive.c:1056 +#: merge-recursive.c:1042 merge-recursive.c:1055 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -686,20 +748,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:1097 +#: merge-recursive.c:1096 msgid "rename" msgstr "umbenennen" -#: merge-recursive.c:1097 +#: merge-recursive.c:1096 msgid "renamed" msgstr "umbenannt" -#: merge-recursive.c:1153 +#: merge-recursive.c:1152 #, 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:1175 +#: merge-recursive.c:1174 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -708,148 +770,148 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" " "und \"%s\"->\"%s\" in Branch \"%s\"%s" -#: merge-recursive.c:1180 +#: merge-recursive.c:1179 msgid " (left unresolved)" msgstr " (bleibt unaufgelöst)" -#: merge-recursive.c:1234 +#: merge-recursive.c:1233 #, 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:1264 +#: merge-recursive.c:1263 #, 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:1463 +#: merge-recursive.c:1462 #, 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:1473 +#: merge-recursive.c:1472 #, c-format msgid "Adding merged %s" msgstr "Füge zusammengeführte Datei %s hinzu" -#: merge-recursive.c:1478 merge-recursive.c:1676 +#: merge-recursive.c:1477 merge-recursive.c:1675 #, c-format msgid "Adding as %s instead" msgstr "Füge stattdessen als %s hinzu" -#: merge-recursive.c:1529 +#: merge-recursive.c:1528 #, c-format msgid "cannot read object %s" msgstr "kann Objekt %s nicht lesen" -#: merge-recursive.c:1532 +#: merge-recursive.c:1531 #, c-format msgid "object %s is not a blob" msgstr "Objekt %s ist kein Blob" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modify" msgstr "ändern" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modified" msgstr "geändert" -#: merge-recursive.c:1590 +#: merge-recursive.c:1589 msgid "content" msgstr "Inhalt" -#: merge-recursive.c:1597 +#: merge-recursive.c:1596 msgid "add/add" msgstr "hinzufügen/hinzufügen" -#: merge-recursive.c:1631 +#: merge-recursive.c:1630 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)" -#: merge-recursive.c:1645 +#: merge-recursive.c:1644 #, c-format msgid "Auto-merging %s" msgstr "automatischer Merge von %s" -#: merge-recursive.c:1649 git-submodule.sh:1150 +#: merge-recursive.c:1648 git-submodule.sh:1150 msgid "submodule" msgstr "Submodul" -#: merge-recursive.c:1650 +#: merge-recursive.c:1649 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Merge-Konflikt in %s" -#: merge-recursive.c:1740 +#: merge-recursive.c:1735 #, c-format msgid "Removing %s" msgstr "Entferne %s" -#: merge-recursive.c:1765 +#: merge-recursive.c:1760 msgid "file/directory" msgstr "Datei/Verzeichnis" -#: merge-recursive.c:1771 +#: merge-recursive.c:1766 msgid "directory/file" msgstr "Verzeichnis/Datei" -#: merge-recursive.c:1776 +#: merge-recursive.c:1771 #, 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:1786 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Füge %s hinzu" -#: merge-recursive.c:1803 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Fataler Merge-Fehler. Sollte nicht passieren." -#: merge-recursive.c:1822 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Bereits aktuell!" -#: merge-recursive.c:1831 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen" -#: merge-recursive.c:1861 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "unverarbeiteter Pfad??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "Merge:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden" msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden" -#: merge-recursive.c:1956 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "Merge hat keinen Commit zurückgegeben" -#: merge-recursive.c:2013 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:2024 builtin/merge.c:666 +#: merge-recursive.c:2019 builtin/merge.c:666 msgid "Unable to write index." msgstr "Konnte Staging-Area nicht schreiben." @@ -876,33 +938,33 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "Ungültiger %s Wert: '%s'" -#: object.c:234 +#: object.c:241 #, c-format msgid "unable to parse object: %s" msgstr "Konnte Objekt '%s' nicht parsen." -#: parse-options.c:534 +#: parse-options.c:546 msgid "..." msgstr "..." -#: parse-options.c:552 +#: parse-options.c:564 #, c-format msgid "usage: %s" msgstr "Verwendung: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:556 +#: parse-options.c:568 #, c-format msgid " or: %s" msgstr " oder: %s" -#: parse-options.c:559 +#: parse-options.c:571 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:593 +#: parse-options.c:605 msgid "-NUM" msgstr "-NUM" @@ -973,11 +1035,15 @@ msgstr "" ":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n" "Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?" +#: pretty.c:968 +msgid "unable to parse --pretty format" +msgstr "Konnte --pretty Format nicht parsen." + #: progress.c:225 msgid "done" msgstr "Fertig" -#: read-cache.c:1260 +#: read-cache.c:1261 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -986,7 +1052,7 @@ msgstr "" "index.version gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:1270 +#: read-cache.c:1271 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -995,51 +1061,51 @@ msgstr "" "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: remote.c:753 +#: remote.c:782 #, 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:757 +#: remote.c:786 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s folgt üblicherweise %s, nicht %s" -#: remote.c:761 +#: remote.c:790 #, c-format msgid "%s tracks both %s and %s" msgstr "%s folgt sowohl %s als auch %s" -#: remote.c:769 +#: remote.c:798 msgid "Internal error" msgstr "Interner Fehler" -#: remote.c:1943 +#: remote.c:1968 #, 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" -#: remote.c:1947 +#: remote.c:1972 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n" -#: remote.c:1950 +#: remote.c:1975 #, 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:1954 +#: remote.c:1979 #, 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:1960 +#: remote.c:1985 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n" -#: remote.c:1963 +#: remote.c:1988 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1049,12 +1115,12 @@ msgstr[0] "" msgstr[1] "" "Ihr Branch ist zu '%s' um %d Commits hinterher, und kann vorgespult werden.\n" -#: remote.c:1971 +#: remote.c:1996 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n" -#: remote.c:1974 +#: remote.c:1999 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1069,34 +1135,43 @@ msgstr[1] "" "Ihr Branch und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Commits.\n" -#: remote.c:1984 +#: remote.c:2009 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" -#: run-command.c:80 +#: run-command.c:87 msgid "open /dev/null failed" msgstr "Öffnen von /dev/null fehlgeschlagen" -#: run-command.c:82 +#: run-command.c:89 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) fehlgeschlagen" -#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893 -#: builtin/merge.c:1003 builtin/merge.c:1013 +#: send-pack.c:265 +msgid "failed to sign the push certificate" +msgstr "Fehler beim Signieren des \"push\"-Zertifikates" + +#: send-pack.c:322 +msgid "the receiving end does not support --signed push" +msgstr "" +"die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")" + +#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892 +#: builtin/merge.c:1002 builtin/merge.c:1012 #, c-format msgid "Could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785 -#: builtin/merge.c:1005 builtin/merge.c:1018 +#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784 +#: builtin/merge.c:1004 builtin/merge.c:1017 #, c-format msgid "Could not write to '%s'" msgstr "Konnte nicht nach '%s' schreiben." -#: sequencer.c:194 +#: sequencer.c:195 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1104,7 +1179,7 @@ msgstr "" "nach Auflösung der Konflikte, markieren Sie die korrigierten Pfade\n" "mit 'git add <Pfade>' oder 'git rm <Pfade>'" -#: sequencer.c:197 +#: sequencer.c:198 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1114,230 +1189,226 @@ msgstr "" "mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n" "'git commit' ein" -#: sequencer.c:210 sequencer.c:841 sequencer.c:924 +#: sequencer.c:211 sequencer.c:852 sequencer.c:935 #, c-format msgid "Could not write to %s" msgstr "Konnte nicht nach %s schreiben" -#: sequencer.c:213 +#: sequencer.c:214 #, c-format msgid "Error wrapping up %s" msgstr "Fehler bei Nachbereitung von %s" -#: sequencer.c:228 +#: sequencer.c:229 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" "Ihre lokalen Änderungen würden von \"cherry-pick\" überschrieben werden." -#: sequencer.c:230 +#: sequencer.c:231 msgid "Your local changes would be overwritten by revert." msgstr "Ihre lokalen Änderungen würden von \"revert\" überschrieben werden." -#: sequencer.c:233 +#: sequencer.c:234 msgid "Commit your changes or stash them to proceed." msgstr "" "Tragen Sie Ihre Änderungen ein oder benutzen Sie \"stash\", um fortzufahren." -#: sequencer.c:250 -msgid "Failed to lock HEAD during fast_forward_to" -msgstr "Fehler beim Sperren von HEAD während fast_forward_to" - #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:293 +#: sequencer.c:304 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Konnte neue Staging-Area-Datei nicht schreiben" -#: sequencer.c:324 +#: sequencer.c:335 msgid "Could not resolve HEAD commit\n" msgstr "Konnte Commit von HEAD nicht auflösen\n" -#: sequencer.c:344 +#: sequencer.c:355 msgid "Unable to update cache tree\n" msgstr "Konnte Cache-Verzeichnis nicht aktualisieren\n" -#: sequencer.c:391 +#: sequencer.c:402 #, c-format msgid "Could not parse commit %s\n" msgstr "Konnte Commit %s nicht parsen\n" -#: sequencer.c:396 +#: sequencer.c:407 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Konnte Eltern-Commit %s nicht parsen\n" -#: sequencer.c:462 +#: sequencer.c:473 msgid "Your index file is unmerged." msgstr "Ihre Staging-Area-Datei ist nicht zusammengeführt." -#: sequencer.c:481 +#: sequencer.c:492 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben." -#: sequencer.c:489 +#: sequencer.c:500 #, c-format msgid "Commit %s does not have parent %d" msgstr "Commit %s hat keinen Elternteil %d" -#: sequencer.c:493 +#: sequencer.c:504 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge." #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:506 +#: sequencer.c:517 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kann Eltern-Commit %s nicht parsen" -#: sequencer.c:510 +#: sequencer.c:521 #, c-format msgid "Cannot get commit message for %s" msgstr "Kann keine Commit-Beschreibung für %s bekommen" -#: sequencer.c:596 +#: sequencer.c:607 #, c-format msgid "could not revert %s... %s" msgstr "Konnte \"revert\" nicht auf %s ausführen... %s" -#: sequencer.c:597 +#: sequencer.c:608 #, c-format msgid "could not apply %s... %s" msgstr "Konnte %s nicht anwenden... %s" -#: sequencer.c:633 +#: sequencer.c:644 msgid "empty commit set passed" msgstr "leere Menge von Commits übergeben" -#: sequencer.c:641 +#: sequencer.c:652 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Fehler beim Lesen der Staging-Area" -#: sequencer.c:645 +#: sequencer.c:656 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren der Staging-Area" -#: sequencer.c:705 +#: sequencer.c:716 #, c-format msgid "Cannot %s during a %s" msgstr "Kann %s nicht während eines %s durchführen" -#: sequencer.c:727 +#: sequencer.c:738 #, c-format msgid "Could not parse line %d." msgstr "Konnte Zeile %d nicht parsen." -#: sequencer.c:732 +#: sequencer.c:743 msgid "No commits parsed." msgstr "Keine Commits geparst." -#: sequencer.c:745 +#: sequencer.c:756 #, c-format msgid "Could not open %s" msgstr "Konnte %s nicht öffnen" -#: sequencer.c:749 +#: sequencer.c:760 #, c-format msgid "Could not read %s." msgstr "Konnte %s nicht lesen." -#: sequencer.c:756 +#: sequencer.c:767 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Unbenutzbares Instruktionsblatt: %s" -#: sequencer.c:786 +#: sequencer.c:797 #, c-format msgid "Invalid key: %s" msgstr "Ungültiger Schlüssel: %s" -#: sequencer.c:789 +#: sequencer.c:800 #, c-format msgid "Invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: sequencer.c:801 +#: sequencer.c:812 #, c-format msgid "Malformed options sheet: %s" msgstr "Fehlerhaftes Optionsblatt: %s" -#: sequencer.c:822 +#: sequencer.c:833 msgid "a cherry-pick or revert is already in progress" msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang" -#: sequencer.c:823 +#: sequencer.c:834 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:827 +#: sequencer.c:838 #, c-format msgid "Could not create sequencer directory %s" msgstr "Konnte \"sequencer\"-Verzeichnis %s nicht erstellen" -#: sequencer.c:843 sequencer.c:928 +#: sequencer.c:854 sequencer.c:939 #, c-format msgid "Error wrapping up %s." msgstr "Fehler beim Einpacken von %s." -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:873 sequencer.c:1009 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" -#: sequencer.c:864 +#: sequencer.c:875 msgid "cannot resolve HEAD" msgstr "kann HEAD nicht auflösen" -#: sequencer.c:866 +#: sequencer.c:877 msgid "cannot abort from a branch yet to be born" msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird" -#: sequencer.c:888 builtin/apply.c:4062 +#: sequencer.c:899 builtin/apply.c:4128 #, c-format msgid "cannot open %s: %s" msgstr "Kann %s nicht öffnen: %s" -#: sequencer.c:891 +#: sequencer.c:902 #, c-format msgid "cannot read %s: %s" msgstr "Kann %s nicht lesen: %s" -#: sequencer.c:892 +#: sequencer.c:903 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:898 +#: sequencer.c:909 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt" -#: sequencer.c:921 +#: sequencer.c:932 #, c-format msgid "Could not format %s." msgstr "Konnte %s nicht formatieren." -#: sequencer.c:1066 +#: sequencer.c:1077 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden" -#: sequencer.c:1069 +#: sequencer.c:1080 #, c-format msgid "%s: bad revision" msgstr "%s: ungültiger Commit" -#: sequencer.c:1103 +#: sequencer.c:1114 msgid "Can't revert as initial commit" msgstr "Kann nicht als allerersten Commit einen Revert ausführen." -#: sequencer.c:1104 +#: sequencer.c:1115 msgid "Can't cherry-pick into empty head" msgstr "Kann nicht als allerersten Commit einen Cherry-Pick ausführen." -#: sha1_name.c:439 +#: sha1_name.c:440 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" @@ -1362,21 +1433,21 @@ msgstr "" "indem Sie \"git config advice.objectNameWarning false\"\n" "ausführen." -#: sha1_name.c:1060 +#: sha1_name.c:1068 msgid "HEAD does not point to a branch" msgstr "HEAD zeigt auf keinen Branch" -#: sha1_name.c:1063 +#: sha1_name.c:1071 #, c-format msgid "No such branch: '%s'" msgstr "Kein solcher Branch '%s'" -#: sha1_name.c:1065 +#: 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:1069 +#: 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" @@ -1406,16 +1477,41 @@ msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen" msgid "staging updated .gitmodules failed" msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken" -#: submodule.c:1118 builtin/init-db.c:363 +#: submodule.c:1111 builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "Konnte git-Verweis %s nicht erstellen" -#: submodule.c:1129 +#: submodule.c:1122 #, c-format msgid "Could not set core.worktree in %s" msgstr "Konnte core.worktree in '%s' nicht setzen." +#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565 +#: trailer.c:569 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "unbekannter Wert '%s' für Schlüssel %s" + +#: trailer.c:551 trailer.c:556 builtin/remote.c:288 +#, c-format +msgid "more than one %s" +msgstr "mehr als ein %s" + +#: trailer.c:589 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "leerer Anhang-Token in Anhang '%.*s'" + +#: trailer.c:709 +#, c-format +msgid "could not read input file '%s'" +msgstr "Konnte Eingabe-Datei '%s' nicht lesen" + +#: trailer.c:712 +msgid "could not read from stdin" +msgstr "konnte nicht von der Standard-Eingabe lesen" + #: unpack-trees.c:202 msgid "Checking out files" msgstr "Checke Dateien aus" @@ -1449,25 +1545,29 @@ msgstr "ungültige Portnummer" msgid "invalid '..' path segment" msgstr "ungültiges '..' Pfadsegment" -#: wrapper.c:460 +#: wrapper.c:509 #, c-format msgid "unable to access '%s': %s" msgstr "konnte nicht auf '%s' zugreifen: %s" -#: wrapper.c:481 +#: wrapper.c:530 #, c-format msgid "unable to access '%s'" msgstr "konnte nicht auf '%s' zugreifen" -#: wrapper.c:492 +#: wrapper.c:541 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "konnte aktuellen Benutzer nicht in Passwort-Datei finden: %s" -#: wrapper.c:493 +#: wrapper.c:542 msgid "no such user" msgstr "kein solcher Benutzer" +#: wrapper.c:550 +msgid "unable to get current working directory" +msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen." + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Nicht zusammengeführte Pfade:" @@ -1623,15 +1723,15 @@ msgstr "unbeobachteter Inhalt, " msgid "bug: unhandled diff status %c" msgstr "Fehler: unbehandelter Differenz-Status %c" -#: wt-status.c:764 +#: wt-status.c:761 msgid "Submodules changed but not updated:" msgstr "Submodule geändert, aber nicht aktualisiert:" -#: wt-status.c:766 +#: wt-status.c:763 msgid "Submodule changes to be committed:" msgstr "Änderungen in Submodul zum Committen:" -#: wt-status.c:845 +#: wt-status.c:842 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1639,75 +1739,75 @@ msgstr "" "Ändern Sie nicht die obige Zeile.\n" "Alles unterhalb von ihr wird entfernt." -#: wt-status.c:936 +#: wt-status.c:933 msgid "You have unmerged paths." msgstr "Sie haben nicht zusammengeführte Pfade." -#: wt-status.c:939 +#: wt-status.c:936 msgid " (fix conflicts and run \"git commit\")" msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)" -#: wt-status.c:942 +#: wt-status.c:939 msgid "All conflicts fixed but you are still merging." msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge." -#: wt-status.c:945 +#: wt-status.c:942 msgid " (use \"git commit\" to conclude merge)" msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)" -#: wt-status.c:955 +#: wt-status.c:952 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:958 +#: wt-status.c:955 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:962 +#: wt-status.c:959 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:964 +#: wt-status.c:961 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)" -#: wt-status.c:966 +#: wt-status.c:963 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:1026 wt-status.c:1043 +#: wt-status.c:1023 wt-status.c:1040 #, 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:1031 wt-status.c:1048 +#: wt-status.c:1028 wt-status.c:1045 msgid "You are currently rebasing." msgstr "Sie sind gerade beim Rebase." -#: wt-status.c:1034 +#: wt-status.c:1031 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:1036 +#: wt-status.c:1033 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1038 +#: wt-status.c:1035 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:1051 +#: wt-status.c:1048 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)" -#: wt-status.c:1055 +#: wt-status.c:1052 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1715,129 +1815,130 @@ msgstr "" "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf " "'%s' im Gange ist." -#: wt-status.c:1060 +#: wt-status.c:1057 msgid "You are currently splitting a commit during a rebase." msgstr "Sie teilen gerade einen Commit während eines Rebase auf." -#: wt-status.c:1063 +#: wt-status.c:1060 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:1067 +#: wt-status.c:1064 #, 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:1072 +#: wt-status.c:1069 msgid "You are currently editing a commit during a rebase." msgstr "Sie editieren gerade einen Commit während eines Rebase." -#: wt-status.c:1075 +#: wt-status.c:1072 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -" (benutzen Sie \"git commit --amend\", um den aktuellen Commit nachzubessern)" +" (benutzen Sie \"git commit --amend\", um den aktuellen Commit " +"nachzubessern)" -#: wt-status.c:1077 +#: wt-status.c:1074 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:1087 +#: wt-status.c:1084 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus." -#: wt-status.c:1092 +#: wt-status.c:1089 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:1095 +#: wt-status.c:1092 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)" -#: wt-status.c:1097 +#: wt-status.c:1094 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:1106 +#: wt-status.c:1103 #, c-format msgid "You are currently reverting commit %s." msgstr "Sie sind gerade an einem Revert von Commit '%s'." -#: wt-status.c:1111 +#: wt-status.c:1108 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:1114 +#: wt-status.c:1111 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)" -#: wt-status.c:1116 +#: wt-status.c:1113 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)" -#: wt-status.c:1127 +#: wt-status.c:1124 #, 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:1131 +#: wt-status.c:1128 msgid "You are currently bisecting." msgstr "Sie sind gerade bei einer binären Suche." -#: wt-status.c:1134 +#: wt-status.c:1131 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:1309 +#: wt-status.c:1306 msgid "On branch " msgstr "Auf Branch " -#: wt-status.c:1316 +#: wt-status.c:1313 msgid "rebase in progress; onto " msgstr "Rebase im Gange; auf " -#: wt-status.c:1323 +#: wt-status.c:1320 msgid "HEAD detached at " msgstr "HEAD losgelöst bei " -#: wt-status.c:1325 +#: wt-status.c:1322 msgid "HEAD detached from " msgstr "HEAD losgelöst von " -#: wt-status.c:1328 +#: wt-status.c:1325 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Branch." -#: wt-status.c:1345 +#: wt-status.c:1342 msgid "Initial commit" msgstr "Initialer Commit" -#: wt-status.c:1359 +#: wt-status.c:1356 msgid "Untracked files" msgstr "Unbeobachtete Dateien" -#: wt-status.c:1361 +#: wt-status.c:1358 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1365 +#: wt-status.c:1362 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1848,32 +1949,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:1371 +#: wt-status.c:1368 #, c-format msgid "Untracked files not listed%s" msgstr "Unbeobachtete Dateien nicht aufgelistet%s" -#: wt-status.c:1373 +#: wt-status.c:1370 msgid " (use -u option to show untracked files)" -msgstr " (benutzen Sie die Option -u, um unbeobachteten Dateien anzuzeigen)" +msgstr " (benutzen Sie die Option -u, um unbeobachtete Dateien anzuzeigen)" -#: wt-status.c:1379 +#: wt-status.c:1376 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:1384 +#: wt-status.c:1381 #, 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:1387 +#: wt-status.c:1384 #, c-format msgid "no changes added to commit\n" msgstr "keine Änderungen zum Commit vorgemerkt\n" -#: wt-status.c:1390 +#: wt-status.c:1387 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1882,98 +1983,98 @@ msgstr "" "nichts zum Commit vorgemerkt, aber es gibt unbeobachtete Dateien (benutzen " "Sie \"git add\" zum Beobachten)\n" -#: wt-status.c:1393 +#: wt-status.c:1390 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "nichts zum Commit vorgemerkt, aber es gibt unbeobachtete Dateien\n" -#: wt-status.c:1396 +#: wt-status.c:1393 #, 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 Beobachten)\n" -#: wt-status.c:1399 wt-status.c:1404 +#: wt-status.c:1396 wt-status.c:1401 #, c-format msgid "nothing to commit\n" msgstr "nichts zu committen\n" -#: wt-status.c:1402 +#: wt-status.c:1399 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nichts zu committen (benutzen Sie die Option -u, um unbeobachtete Dateien " "anzuzeigen)\n" -#: wt-status.c:1406 +#: wt-status.c:1403 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n" -#: wt-status.c:1515 +#: wt-status.c:1512 msgid "HEAD (no branch)" msgstr "HEAD (kein Branch)" -#: wt-status.c:1521 +#: wt-status.c:1518 msgid "Initial commit on " msgstr "Initialer Commit auf " -#: wt-status.c:1553 +#: wt-status.c:1550 msgid "gone" msgstr "entfernt" -#: wt-status.c:1555 wt-status.c:1563 +#: wt-status.c:1552 wt-status.c:1560 msgid "behind " msgstr "hinterher " -#: compat/precompose_utf8.c:55 builtin/clone.c:356 +#: compat/precompose_utf8.c:55 builtin/clone.c:357 #, c-format msgid "failed to unlink '%s'" msgstr "Konnte '%s' nicht entfernen." -#: builtin/add.c:21 +#: builtin/add.c:22 msgid "git add [options] [--] <pathspec>..." msgstr "git add [Optionen] [--] [<Pfadspezifikation>...]" -#: builtin/add.c:64 +#: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "unerwarteter Differenz-Status %c" -#: builtin/add.c:69 builtin/commit.c:261 +#: builtin/add.c:70 builtin/commit.c:275 msgid "updating files failed" msgstr "Aktualisierung der Dateien fehlgeschlagen" -#: builtin/add.c:79 +#: builtin/add.c:80 #, c-format msgid "remove '%s'\n" msgstr "lösche '%s'\n" -#: builtin/add.c:133 +#: builtin/add.c:134 msgid "Unstaged changes after refreshing the index:" msgstr "" "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:" -#: builtin/add.c:193 builtin/rev-parse.c:781 +#: builtin/add.c:194 builtin/rev-parse.c:785 msgid "Could not read the index" msgstr "Konnte die Staging-Area nicht lesen" -#: builtin/add.c:204 +#: builtin/add.c:205 #, c-format msgid "Could not open '%s' for writing." msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: builtin/add.c:208 +#: builtin/add.c:209 msgid "Could not write patch" msgstr "Konnte Patch nicht schreiben" -#: builtin/add.c:213 +#: builtin/add.c:214 #, c-format msgid "Could not stat '%s'" msgstr "Konnte Verzeichnis '%s' nicht lesen" -#: builtin/add.c:215 +#: builtin/add.c:216 msgid "Empty patch. Aborted." msgstr "Leerer Patch. Abgebrochen." @@ -1988,15 +2089,15 @@ msgstr "" "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien " "ignoriert:\n" -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70 -#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375 #: builtin/rm.c:269 msgid "dry run" msgstr "Probelauf" -#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19 -#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606 -#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113 +#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 +#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "erweiterte Ausgaben" @@ -2004,7 +2105,7 @@ msgstr "erweiterte Ausgaben" msgid "interactive picking" msgstr "interaktives Auswählen" -#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286 msgid "select hunks interactively" msgstr "Blöcke interaktiv auswählen" @@ -2014,38 +2115,38 @@ msgstr "aktuelle Unterschiede editieren und anwenden" #: builtin/add.c:254 msgid "allow adding otherwise ignored files" -msgstr "erlaubt das Hinzufügen andernfalls ignorierter Dateien" +msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben" #: builtin/add.c:255 msgid "update tracked files" -msgstr "aktualisiert beobachtete Dateien" +msgstr "beobachtete Dateien aktualisieren" #: builtin/add.c:256 msgid "record only the fact that the path will be added later" -msgstr "speichert nur, dass der Pfad später hinzugefügt werden soll" +msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll" #: builtin/add.c:257 msgid "add changes from all tracked and untracked files" msgstr "" -"fügt Änderungen von allen beobachteten und unbeobachteten Dateien hinzu" +"Änderungen von allen beobachteten und unbeobachteten Dateien hinzufügen" #: builtin/add.c:260 msgid "ignore paths removed in the working tree (same as --no-all)" -msgstr "ignoriert gelöschte Pfade im Arbeitsverzeichnis (genau wie --no-all)" +msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)" #: builtin/add.c:262 msgid "don't add, only refresh the index" -msgstr "fügt nichts hinzu, aktualisiert nur die Staging-Area" +msgstr "nichts hinzufügen, nur die Staging-Area aktualisieren" #: builtin/add.c:263 msgid "just skip files which cannot be added because of errors" msgstr "" -"überspringt Dateien, die aufgrund von Fehlern nicht hinzugefügt werden " +"Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden " "konnten" #: builtin/add.c:264 msgid "check if - even missing - files are ignored in dry run" -msgstr "prüft ob - auch fehlende - Dateien im Probelauf ignoriert werden" +msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden" #: builtin/add.c:286 #, c-format @@ -2080,78 +2181,78 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Wollten Sie vielleicht 'git add .' sagen?\n" #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "Staging-Area-Datei beschädigt" -#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Konnte neue Staging-Area-Datei nicht schreiben." -#: builtin/apply.c:57 +#: builtin/apply.c:58 msgid "git apply [options] [<patch>...]" msgstr "git apply [Optionen] [<Patch>...]" -#: builtin/apply.c:110 +#: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "nicht erkannte Whitespace-Option: '%s'" -#: builtin/apply.c:125 +#: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'" -#: builtin/apply.c:825 +#: builtin/apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten" -#: builtin/apply.c:834 +#: builtin/apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s" -#: builtin/apply.c:915 +#: builtin/apply.c:916 #, c-format msgid "unable to find filename in patch at line %d" msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden." -#: builtin/apply.c:947 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile " "%d" -#: builtin/apply.c:951 +#: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d" -#: builtin/apply.c:952 +#: builtin/apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d" -#: builtin/apply.c:959 +#: builtin/apply.c:960 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d" -#: builtin/apply.c:1422 +#: builtin/apply.c:1423 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: unerwartete Zeile: %.*s" -#: builtin/apply.c:1479 +#: builtin/apply.c:1480 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" -#: builtin/apply.c:1496 +#: builtin/apply.c:1497 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2166,65 +2267,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:1657 msgid "new file depends on old contents" msgstr "neue Datei hängt von alten Inhalten ab" -#: builtin/apply.c:1658 +#: builtin/apply.c:1659 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: builtin/apply.c:1684 +#: builtin/apply.c:1685 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: builtin/apply.c:1720 +#: builtin/apply.c:1721 #, 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:1723 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: builtin/apply.c:1725 +#: builtin/apply.c:1726 #, 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:1872 #, 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:1901 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter Binär-Patch bei Zeile %d" -#: builtin/apply.c:1986 +#: builtin/apply.c:2052 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: builtin/apply.c:2076 +#: builtin/apply.c:2142 #, c-format msgid "unable to read symlink %s" msgstr "konnte symbolischen Verweis %s nicht lesen" -#: builtin/apply.c:2080 +#: builtin/apply.c:2146 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht öffnen oder lesen" -#: builtin/apply.c:2688 +#: builtin/apply.c:2754 #, c-format msgid "invalid start of line: '%c'" msgstr "Ungültiger Zeilenanfang: '%c'" -#: builtin/apply.c:2806 +#: builtin/apply.c:2872 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -2232,12 +2333,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:2818 +#: builtin/apply.c:2884 #, 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:2824 +#: builtin/apply.c:2890 #, c-format msgid "" "while searching for:\n" @@ -2246,335 +2347,335 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: builtin/apply.c:2843 +#: builtin/apply.c:2909 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in Binär-Patch für '%s'" -#: builtin/apply.c:2944 +#: builtin/apply.c:3010 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" -#: builtin/apply.c:2950 +#: builtin/apply.c:3016 #, 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:2971 +#: builtin/apply.c:3037 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: builtin/apply.c:3095 +#: builtin/apply.c:3161 #, c-format msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 +#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 #, c-format msgid "read of %s failed" msgstr "Konnte %s nicht lesen" -#: builtin/apply.c:3174 builtin/apply.c:3396 +#: builtin/apply.c:3240 builtin/apply.c:3462 #, c-format msgid "path %s has been renamed/deleted" msgstr "Pfad %s wurde umbenannt/gelöscht" -#: builtin/apply.c:3255 builtin/apply.c:3410 +#: builtin/apply.c:3321 builtin/apply.c:3476 #, c-format msgid "%s: does not exist in index" msgstr "%s ist nicht in der Staging-Area" -#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 +#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3264 builtin/apply.c:3418 +#: builtin/apply.c:3330 builtin/apply.c:3484 #, c-format msgid "%s: does not match index" msgstr "%s entspricht nicht der Version in der Staging-Area" -#: builtin/apply.c:3366 +#: builtin/apply.c:3432 msgid "removal patch leaves file contents" msgstr "Lösch-Patch hinterlässt Dateiinhalte" -#: builtin/apply.c:3435 +#: builtin/apply.c:3501 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: builtin/apply.c:3437 +#: builtin/apply.c:3503 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: builtin/apply.c:3538 +#: builtin/apply.c:3604 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: builtin/apply.c:3541 +#: builtin/apply.c:3607 #, c-format msgid "%s: already exists in working directory" msgstr "%s existiert bereits im Arbeitsverzeichnis" -#: builtin/apply.c:3561 +#: builtin/apply.c:3627 #, 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:3566 +#: builtin/apply.c:3632 #, 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:3574 +#: builtin/apply.c:3640 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: builtin/apply.c:3587 +#: builtin/apply.c:3653 #, c-format msgid "Checking patch %s..." msgstr "Prüfe Patch %s..." -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134 +#: builtin/apply.c:3746 builtin/checkout.c:213 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:3823 +#: builtin/apply.c:3889 #, c-format msgid "unable to remove %s from index" msgstr "konnte %s nicht aus der Staging-Area entfernen" -#: builtin/apply.c:3852 +#: builtin/apply.c:3918 #, c-format msgid "corrupt patch for submodule %s" msgstr "fehlerhafter Patch für Submodul %s" -#: builtin/apply.c:3856 +#: builtin/apply.c:3922 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: builtin/apply.c:3861 +#: builtin/apply.c:3927 #, 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:3864 builtin/apply.c:3972 +#: builtin/apply.c:3930 builtin/apply.c:4038 #, 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:3897 +#: builtin/apply.c:3963 #, c-format msgid "closing file '%s'" msgstr "schließe Datei '%s'" -#: builtin/apply.c:3946 +#: builtin/apply.c:4012 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: builtin/apply.c:4033 +#: builtin/apply.c:4099 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: builtin/apply.c:4041 +#: builtin/apply.c:4107 msgid "internal error" msgstr "interner Fehler" -#: builtin/apply.c:4044 +#: builtin/apply.c:4110 #, 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:4054 +#: builtin/apply.c:4120 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: builtin/apply.c:4075 +#: builtin/apply.c:4141 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: builtin/apply.c:4078 +#: builtin/apply.c:4144 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Block #%d zurückgewiesen." -#: builtin/apply.c:4228 +#: builtin/apply.c:4234 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: builtin/apply.c:4239 +#: builtin/apply.c:4245 msgid "unable to read index file" msgstr "Konnte Staging-Area-Datei nicht lesen" -#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91 #: builtin/fetch.c:93 msgid "path" msgstr "Pfad" -#: builtin/apply.c:4359 +#: builtin/apply.c:4363 msgid "don't apply changes matching the given path" -msgstr "wendet keine Änderungen im angegebenen Pfad an" +msgstr "keine Änderungen im angegebenen Pfad anwenden" -#: builtin/apply.c:4362 +#: builtin/apply.c:4366 msgid "apply changes matching the given path" -msgstr "wendet Änderungen nur im angegebenen Pfad an" +msgstr "Änderungen nur im angegebenen Pfad anwenden" -#: builtin/apply.c:4364 +#: builtin/apply.c:4368 msgid "num" msgstr "Anzahl" -#: builtin/apply.c:4365 +#: builtin/apply.c:4369 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -"entfernt <Anzahl> vorangestellte Schrägstriche von herkömmlichen " -"Differenzpfaden" +"<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden " +"entfernen" -#: builtin/apply.c:4368 +#: builtin/apply.c:4372 msgid "ignore additions made by the patch" -msgstr "ignoriert hinzugefügte Zeilen des Patches" +msgstr "hinzugefügte Zeilen des Patches ignorieren" -#: builtin/apply.c:4370 +#: builtin/apply.c:4374 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -"anstatt der Anwendung des Patches, wird der \"diffstat\" für die Eingabe " +"anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe " "ausgegeben" -#: builtin/apply.c:4374 +#: builtin/apply.c:4378 msgid "show number of added and deleted lines in decimal notation" msgstr "" -"zeigt die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation" +"die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen" -#: builtin/apply.c:4376 +#: builtin/apply.c:4380 msgid "instead of applying the patch, output a summary for the input" msgstr "" -"anstatt der Anwendung des Patches, wird eine Zusammenfassung für die Eingabe " -"ausgegeben" +"anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe " +"ausgeben" -#: builtin/apply.c:4378 +#: builtin/apply.c:4382 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:4380 +#: builtin/apply.c:4384 msgid "make sure the patch is applicable to the current index" msgstr "" -"stellt sicher, dass der Patch in der aktuellen Staging-Area angewendet " +"sicherstellen, dass der Patch in der aktuellen Staging-Area angewendet " "werden kann" -#: builtin/apply.c:4382 +#: builtin/apply.c:4386 msgid "apply a patch without touching the working tree" -msgstr "" -"wendet einen Patch an, ohne Änderungen im Arbeitsverzeichnis vorzunehmen" +msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen" -#: builtin/apply.c:4384 +#: builtin/apply.c:4388 msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "wendet den Patch an (Benutzung mit --stat/--summary/--check)" +msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)" -#: builtin/apply.c:4386 +#: builtin/apply.c:4390 msgid "attempt three-way merge if a patch does not apply" -msgstr "versucht 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte" +msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte" -#: builtin/apply.c:4388 +#: builtin/apply.c:4392 msgid "build a temporary index based on embedded index information" msgstr "" -"erstellt eine temporäre Staging-Area basierend auf den integrierten Staging-" -"Area-Informationen" +"eine temporäre Staging-Area, basierend auf den integrierten Staging-Area-" +"Informationen, erstellen" -#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: builtin/apply.c:4393 +#: builtin/apply.c:4397 msgid "ensure at least <n> lines of context match" -msgstr "stellt sicher, dass mindestens <n> Zeilen des Kontextes übereinstimmen" +msgstr "" +"sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen" -#: builtin/apply.c:4394 +#: builtin/apply.c:4398 msgid "action" msgstr "Aktion" -#: builtin/apply.c:4395 +#: builtin/apply.c:4399 msgid "detect new or modified lines that have whitespace errors" -msgstr "ermittelt neue oder geänderte Zeilen die Whitespace-Fehler haben" +msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln" -#: builtin/apply.c:4398 builtin/apply.c:4401 +#: builtin/apply.c:4402 builtin/apply.c:4405 msgid "ignore changes in whitespace when finding context" -msgstr "ignoriert Änderungen im Whitespace bei der Suche des Kontextes" +msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren" -#: builtin/apply.c:4404 +#: builtin/apply.c:4408 msgid "apply the patch in reverse" -msgstr "wendet den Patch in umgekehrter Reihenfolge an" +msgstr "den Patch in umgekehrter Reihenfolge anwenden" -#: builtin/apply.c:4406 +#: builtin/apply.c:4410 msgid "don't expect at least one line of context" -msgstr "erwartet keinen Kontext" +msgstr "keinen Kontext erwarten" -#: builtin/apply.c:4408 +#: builtin/apply.c:4412 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -"hinterlässt zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien" +"zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen" -#: builtin/apply.c:4410 +#: builtin/apply.c:4414 msgid "allow overlapping hunks" -msgstr "erlaubt sich überlappende Patch-Blöcke" +msgstr "sich überlappende Patch-Blöcke erlauben" -#: builtin/apply.c:4413 +#: builtin/apply.c:4417 msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "toleriert fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende" +msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren" -#: builtin/apply.c:4416 +#: builtin/apply.c:4420 msgid "do not trust the line counts in the hunk headers" -msgstr "vertraut nicht den Zeilennummern im Kopf des Patch-Blocks" +msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen" -#: builtin/apply.c:4418 +#: builtin/apply.c:4422 msgid "root" msgstr "Wurzelverzeichnis" -#: builtin/apply.c:4419 +#: builtin/apply.c:4423 msgid "prepend <root> to all filenames" -msgstr "stellt <Wurzelverzeichnis> vor alle Dateinamen" +msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen" -#: builtin/apply.c:4441 +#: builtin/apply.c:4445 msgid "--3way outside a repository" msgstr "" "Die Option --3way kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4449 +#: builtin/apply.c:4453 msgid "--index outside a repository" msgstr "" "Die Option --index kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4452 +#: builtin/apply.c:4456 msgid "--cached outside a repository" msgstr "" "Die Option --cached kann nicht außerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4468 +#: builtin/apply.c:4472 #, c-format msgid "can't open patch '%s'" msgstr "kann Patch '%s' nicht öffnen" -#: builtin/apply.c:4482 +#: builtin/apply.c:4486 #, 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:4488 builtin/apply.c:4498 +#: builtin/apply.c:4492 builtin/apply.c:4502 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2622,11 +2723,11 @@ msgstr "git bisect--helper --next-all [--no-checkout]" #: builtin/bisect--helper.c:17 msgid "perform 'git bisect next'" -msgstr "führt 'git bisect next' aus" +msgstr "'git bisect next' ausführen" #: builtin/bisect--helper.c:19 msgid "update BISECT_HEAD instead of checking out the current commit" -msgstr "aktualisiert BISECT_HEAD, anstatt den aktuellen Commit auszuchecken" +msgstr "BISECT_HEAD aktualisieren, anstatt den aktuellen Commit auszuchecken" #: builtin/blame.c:30 msgid "git blame [options] [rev-opts] [rev] [--] file" @@ -2638,31 +2739,31 @@ msgstr "[rev-opts] sind dokumentiert in git-rev-list(1)" #: builtin/blame.c:2501 msgid "Show blame entries as we find them, incrementally" -msgstr "Zeigt \"blame\"-Einträge schrittweise, während wir sie generieren" +msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren" #: builtin/blame.c:2502 msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "Zeigt leere SHA-1 für Grenz-Commits (Standard: aus)" +msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)" #: builtin/blame.c:2503 msgid "Do not treat root commits as boundaries (Default: off)" -msgstr "Behandelt Ursprungs-Commit nicht als Grenzen (Standard: aus)" +msgstr "Ursprungs-Commit nicht als Grenzen behandeln (Standard: aus)" #: builtin/blame.c:2504 msgid "Show work cost statistics" -msgstr "Zeigt Statistiken zum Arbeitsaufwand" +msgstr "Statistiken zum Arbeitsaufwand anzeigen" #: builtin/blame.c:2505 msgid "Show output score for blame entries" -msgstr "Zeigt Ausgabebewertung für \"blame\"-Einträge" +msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen" #: builtin/blame.c:2506 msgid "Show original filename (Default: auto)" -msgstr "Zeigt ursprünglichen Dateinamen (Standard: auto)" +msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)" #: builtin/blame.c:2507 msgid "Show original linenumber (Default: off)" -msgstr "Zeigt ursprüngliche Zeilennummer (Standard: aus)" +msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)" #: builtin/blame.c:2508 msgid "Show in a format designed for machine consumption" @@ -2675,39 +2776,41 @@ msgstr "" #: builtin/blame.c:2510 msgid "Use the same output mode as git-annotate (Default: off)" -msgstr "Benutzt den gleichen Ausgabemodus wie \"git-annotate\" (Standard: aus)" +msgstr "" +"Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)" #: builtin/blame.c:2511 msgid "Show raw timestamp (Default: off)" -msgstr "Zeigt unbearbeiteten Zeitstempel (Standard: aus)" +msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)" #: builtin/blame.c:2512 msgid "Show long commit SHA1 (Default: off)" -msgstr "Zeigt langen Commit-SHA1 (Standard: aus)" +msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)" #: builtin/blame.c:2513 msgid "Suppress author name and timestamp (Default: off)" -msgstr "Unterdrückt den Namen des Autors und den Zeitstempel (Standard: aus)" +msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)" #: builtin/blame.c:2514 msgid "Show author email instead of name (Default: off)" -msgstr "Zeigt anstatt des Namens die E-Mail-Adresse des Autors (Standard: aus)" +msgstr "" +"Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)" #: builtin/blame.c:2515 msgid "Ignore whitespace differences" -msgstr "Ignoriert Unterschiede im Whitespace" +msgstr "Unterschiede im Whitespace ignorieren" #: builtin/blame.c:2516 msgid "Spend extra cycles to find better match" -msgstr "arbeite länger, um bessere Übereinstimmungen zu finden" +msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden" #: builtin/blame.c:2517 msgid "Use revisions from <file> instead of calling git-rev-list" -msgstr "Benutzt Commits von <Datei> anstatt \"git-rev-list\" aufzurufen" +msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen" #: builtin/blame.c:2518 msgid "Use <file>'s contents as the final image" -msgstr "Benutzt Inhalte der <Datei>en als entgültiges Abbild" +msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen" #: builtin/blame.c:2519 builtin/blame.c:2520 msgid "score" @@ -2715,11 +2818,11 @@ msgstr "Bewertung" #: builtin/blame.c:2519 msgid "Find line copies within and across files" -msgstr "Findet kopierte Zeilen innerhalb oder zwischen Dateien" +msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden" #: builtin/blame.c:2520 msgid "Find line movements within and across files" -msgstr "Findet verschobene Zeilen innerhalb oder zwischen Dateien" +msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden" #: builtin/blame.c:2521 msgid "n,m" @@ -2727,7 +2830,7 @@ msgstr "n,m" #: builtin/blame.c:2521 msgid "Process only line range n,m, counting from 1" -msgstr "Verarbeitet nur Zeilen im Bereich n,m, gezählt von 1" +msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1" #. TRANSLATORS: This string is used to tell us the maximum #. display width for a relative timestamp in "git blame" @@ -2735,7 +2838,7 @@ msgstr "Verarbeitet nur Zeilen im Bereich n,m, gezählt von 1" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2599 +#: builtin/blame.c:2602 msgid "4 years, 11 months ago" msgstr "vor 4 Jahren, und 11 Monaten" @@ -2755,7 +2858,7 @@ msgstr "git branch [Optionen] [-r] (-d | -D) <Branchname>..." msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "git branch [Optionen] (-m | -M) [<alterBranch>] <neuerBranch>" -#: builtin/branch.c:150 +#: builtin/branch.c:152 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2764,7 +2867,7 @@ msgstr "" "entferne Branch '%s', der zusammengeführt wurde mit\n" " '%s', aber noch nicht mit HEAD zusammengeführt wurde." -#: builtin/branch.c:154 +#: builtin/branch.c:156 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2773,12 +2876,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:168 +#: builtin/branch.c:170 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen." -#: builtin/branch.c:172 +#: builtin/branch.c:174 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2788,306 +2891,306 @@ msgstr "" "Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D " "%s' aus." -#: builtin/branch.c:185 +#: builtin/branch.c:187 msgid "Update of config-file failed" msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen." -#: builtin/branch.c:213 +#: builtin/branch.c:215 msgid "cannot use -a with -d" msgstr "kann -a nicht mit -d benutzen" -#: builtin/branch.c:219 +#: builtin/branch.c:221 msgid "Couldn't look up commit object for HEAD" msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen." -#: builtin/branch.c:227 +#: builtin/branch.c:229 #, 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:240 +#: builtin/branch.c:245 #, c-format msgid "remote branch '%s' not found." msgstr "Remote-Branch '%s' nicht gefunden" -#: builtin/branch.c:241 +#: builtin/branch.c:246 #, c-format msgid "branch '%s' not found." msgstr "Branch '%s' nicht gefunden." -#: builtin/branch.c:255 +#: builtin/branch.c:260 #, c-format msgid "Error deleting remote branch '%s'" msgstr "Fehler beim Entfernen des Remote-Branches '%s'" -#: builtin/branch.c:256 +#: builtin/branch.c:261 #, c-format msgid "Error deleting branch '%s'" msgstr "Fehler beim Entfernen des Branches '%s'" -#: builtin/branch.c:263 +#: builtin/branch.c:268 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "Remote-Branch %s entfernt (war %s).\n" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branch %s entfernt (war %s).\n" -#: builtin/branch.c:366 +#: builtin/branch.c:370 #, c-format msgid "branch '%s' does not point at a commit" msgstr "Branch '%s' zeigt auf keinen Commit" -#: builtin/branch.c:454 +#: builtin/branch.c:459 #, c-format msgid "[%s: gone]" msgstr "[%s: entfernt]" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:464 +#: builtin/branch.c:469 #, c-format msgid "[%s: behind %d]" msgstr "[%s: %d hinterher]" -#: builtin/branch.c:466 +#: builtin/branch.c:471 #, c-format msgid "[behind %d]" msgstr "[%d hinterher]" -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: %d voraus]" -#: builtin/branch.c:472 +#: builtin/branch.c:477 #, c-format msgid "[ahead %d]" msgstr "[%d voraus]" -#: builtin/branch.c:475 +#: builtin/branch.c:480 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: %d voraus, %d hinterher]" -#: builtin/branch.c:478 +#: builtin/branch.c:483 #, c-format msgid "[ahead %d, behind %d]" msgstr "[%d voraus, %d hinterher]" -#: builtin/branch.c:502 +#: builtin/branch.c:496 msgid " **** invalid ref ****" msgstr " **** ungültige Referenz ****" -#: builtin/branch.c:594 +#: builtin/branch.c:587 #, c-format msgid "(no branch, rebasing %s)" msgstr "(kein Branch, Rebase von Branch %s im Gange)" -#: builtin/branch.c:597 +#: builtin/branch.c:590 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(kein Branch, binäre Suche begonnen bei %s)" -#: builtin/branch.c:600 +#: builtin/branch.c:593 #, c-format msgid "(detached from %s)" msgstr "(losgelöst von %s)" -#: builtin/branch.c:603 +#: builtin/branch.c:596 msgid "(no branch)" msgstr "(kein Branch)" -#: builtin/branch.c:649 +#: builtin/branch.c:643 #, c-format msgid "object '%s' does not point to a commit" msgstr "Objekt '%s' zeigt auf keinen Commit" -#: builtin/branch.c:681 +#: builtin/branch.c:691 msgid "some refs could not be read" msgstr "Konnte einige Referenzen nicht lesen" -#: builtin/branch.c:694 +#: builtin/branch.c:704 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:704 +#: builtin/branch.c:714 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Branchname: '%s'" -#: builtin/branch.c:719 +#: builtin/branch.c:729 msgid "Branch rename failed" msgstr "Umbenennung des Branches fehlgeschlagen" -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Branch '%s' umbenannt" -#: builtin/branch.c:727 +#: builtin/branch.c:737 #, 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:734 +#: builtin/branch.c:744 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:749 +#: builtin/branch.c:759 #, c-format msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" -#: builtin/branch.c:773 +#: builtin/branch.c:783 #, c-format msgid "could not write branch description template: %s" msgstr "Konnte Beschreibungsvorlage für Branch nicht schreiben: %s" -#: builtin/branch.c:803 +#: builtin/branch.c:813 msgid "Generic options" msgstr "Allgemeine Optionen" -#: builtin/branch.c:805 +#: builtin/branch.c:815 msgid "show hash and subject, give twice for upstream branch" -msgstr "Zeigt Hash und Betreff; -vv: zusätzlich Upstream-Branch" +msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch" -#: builtin/branch.c:806 +#: builtin/branch.c:816 msgid "suppress informational messages" -msgstr "unterdrückt Informationsmeldungen" +msgstr "Informationsmeldungen unterdrücken" -#: builtin/branch.c:807 +#: builtin/branch.c:817 msgid "set up tracking mode (see git-pull(1))" -msgstr "stellt den Übernahmemodus ein (siehe git-pull(1))" +msgstr "den Übernahmemodus einstellen (siehe git-pull(1))" -#: builtin/branch.c:809 +#: builtin/branch.c:819 msgid "change upstream info" -msgstr "ändert Informationen zum Upstream-Branch" +msgstr "Informationen zum Upstream-Branch ändern" -#: builtin/branch.c:813 +#: builtin/branch.c:823 msgid "use colored output" -msgstr "verwendet farbliche Ausgaben" +msgstr "farbige Ausgaben verwenden" -#: builtin/branch.c:814 +#: builtin/branch.c:824 msgid "act on remote-tracking branches" -msgstr "wirkt auf Remote-Tracking-Branches" +msgstr "auf Remote-Tracking-Branches wirken" -#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 -#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574 -#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615 -#: builtin/tag.c:621 +#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 +#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623 +#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616 +#: builtin/tag.c:622 msgid "commit" msgstr "Commit" -#: builtin/branch.c:818 builtin/branch.c:824 +#: builtin/branch.c:828 builtin/branch.c:834 msgid "print only branches that contain the commit" -msgstr "gibt nur Branches aus, welche diesen Commit beinhalten" +msgstr "nur Branches ausgeben, welche diesen Commit beinhalten" -#: builtin/branch.c:830 +#: builtin/branch.c:840 msgid "Specific git-branch actions:" msgstr "spezifische Aktionen für \"git-branch\":" -#: builtin/branch.c:831 +#: builtin/branch.c:841 msgid "list both remote-tracking and local branches" -msgstr "listet Remote-Tracking und lokale Branches auf" +msgstr "Remote-Tracking und lokale Branches auflisten" -#: builtin/branch.c:833 +#: builtin/branch.c:843 msgid "delete fully merged branch" -msgstr "entfernt vollständig zusammengeführten Branch" +msgstr "vollständig zusammengeführten Branch entfernen" -#: builtin/branch.c:834 +#: builtin/branch.c:844 msgid "delete branch (even if not merged)" -msgstr "löscht Branch (auch wenn nicht zusammengeführt)" +msgstr "Branch löschen (auch wenn nicht zusammengeführt)" -#: builtin/branch.c:835 +#: builtin/branch.c:845 msgid "move/rename a branch and its reflog" -msgstr "verschiebt/benennt einen Branch und dessen Reflog um" +msgstr "einen Branch und dessen Reflog verschieben/umbenennen" -#: builtin/branch.c:836 +#: builtin/branch.c:846 msgid "move/rename a branch, even if target exists" msgstr "" -"verschiebt/benennt einen Branch um, auch wenn das Ziel bereits existiert" +"einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:837 +#: builtin/branch.c:847 msgid "list branch names" -msgstr "listet Branchnamen auf" +msgstr "Branchnamen auflisten" -#: builtin/branch.c:838 +#: builtin/branch.c:848 msgid "create the branch's reflog" -msgstr "erzeugt das Reflog des Branches" +msgstr "das Reflog des Branches erzeugen" -#: builtin/branch.c:840 +#: builtin/branch.c:850 msgid "edit the description for the branch" -msgstr "bearbeitet die Beschreibung für den Branch" +msgstr "die Beschreibung für den Branch bearbeiten" -#: builtin/branch.c:841 +#: builtin/branch.c:851 msgid "force creation (when already exists)" -msgstr "erzeuge auch, wenn der Branch bereits existiert" +msgstr "Branch auch erzeugen, wenn dieser bereits existiert" -#: builtin/branch.c:844 +#: builtin/branch.c:854 msgid "print only not merged branches" -msgstr "gibt nur Branches aus, die nicht zusammengeführt sind" +msgstr "nur Branches ausgeben, die nicht zusammengeführt sind" -#: builtin/branch.c:850 +#: builtin/branch.c:860 msgid "print only merged branches" -msgstr "gibt nur Branches aus, die zusammengeführt sind" +msgstr "nur Branches ausgeben, die zusammengeführt sind" -#: builtin/branch.c:854 +#: builtin/branch.c:864 msgid "list branches in columns" -msgstr "listet Branches in Spalten auf" +msgstr "Branches in Spalten auflisten" -#: builtin/branch.c:867 +#: builtin/branch.c:877 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenz auflösen." -#: builtin/branch.c:872 builtin/clone.c:636 +#: builtin/branch.c:881 builtin/clone.c:634 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:896 +#: builtin/branch.c:903 msgid "--column and --verbose are incompatible" msgstr "Die Optionen --column und --verbose sind inkompatibel." -#: builtin/branch.c:902 builtin/branch.c:941 +#: builtin/branch.c:909 builtin/branch.c:948 msgid "branch name required" msgstr "Branchname erforderlich" -#: builtin/branch.c:917 +#: builtin/branch.c:924 msgid "Cannot give description to detached HEAD" msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden" -#: builtin/branch.c:922 +#: builtin/branch.c:929 msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#: builtin/branch.c:929 +#: builtin/branch.c:936 #, c-format msgid "No commit on branch '%s' yet." msgstr "Noch kein Commit in Branch '%s'." -#: builtin/branch.c:932 +#: builtin/branch.c:939 #, c-format msgid "No branch named '%s'." msgstr "Branch '%s' nicht vorhanden." -#: builtin/branch.c:947 +#: builtin/branch.c:954 msgid "too many branches for a rename operation" msgstr "zu viele Branches für eine Umbenennen-Operation angegeben" -#: builtin/branch.c:952 +#: builtin/branch.c:959 msgid "too many branches to set new upstream" msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen" -#: builtin/branch.c:956 +#: builtin/branch.c:963 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3095,43 +3198,43 @@ msgstr "" "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n" "keinen Branch zeigt." -#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 +#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009 #, c-format msgid "no such branch '%s'" msgstr "Kein solcher Branch '%s'" -#: builtin/branch.c:963 +#: builtin/branch.c:970 #, c-format msgid "branch '%s' does not exist" msgstr "Branch '%s' existiert nicht" -#: builtin/branch.c:975 +#: builtin/branch.c:982 msgid "too many branches to unset upstream" msgstr "" "zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen" -#: builtin/branch.c:979 +#: builtin/branch.c:986 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:985 +#: builtin/branch.c:992 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: builtin/branch.c:999 +#: builtin/branch.c:1006 msgid "it does not make sense to create 'HEAD' manually" msgstr "'HEAD' darf nicht manuell erstellt werden" -#: builtin/branch.c:1005 +#: builtin/branch.c:1012 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:1008 +#: builtin/branch.c:1015 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3140,7 +3243,7 @@ msgstr "" "Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --" "track oder --set-upstream-to\n" -#: builtin/branch.c:1025 +#: builtin/branch.c:1032 #, c-format msgid "" "\n" @@ -3151,12 +3254,12 @@ msgstr "" "Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, führen " "Sie aus:\n" -#: builtin/branch.c:1026 +#: builtin/branch.c:1033 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1027 +#: builtin/branch.c:1034 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3174,45 +3277,45 @@ msgstr "Um ein Paket zu erstellen wird ein Repository benötigt." msgid "Need a repository to unbundle." msgstr "Zum Entpacken wird ein Repository benötigt." -#: builtin/cat-file.c:331 +#: builtin/cat-file.c:332 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:332 +#: builtin/cat-file.c:333 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <Liste_von_Objekten>" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:370 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<Art> kann sein: blob, tree, commit, tag" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:371 msgid "show object type" -msgstr "zeigt Objektart" +msgstr "Objektart anzeigen" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:372 msgid "show object size" -msgstr "zeigt Objektgröße" +msgstr "Objektgröße anzeigen" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:374 msgid "exit with zero when there's no error" -msgstr "beendet mit Rückgabewert 0, wenn kein Fehler aufgetreten ist" +msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist" -#: builtin/cat-file.c:374 +#: builtin/cat-file.c:375 msgid "pretty-print object's content" msgstr "ansprechende Anzeige des Objektinhaltes" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:377 msgid "for blob objects, run textconv on object's content" -msgstr "führt eine Textkonvertierung auf den Inhalt von Blob-Objekten aus" +msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:379 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:381 +#: builtin/cat-file.c:382 msgid "show info about objects fed from the standard input" msgstr "" "Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe" @@ -3228,31 +3331,31 @@ msgstr "" #: builtin/check-attr.c:19 msgid "report all attributes set on file" -msgstr "gibt alle Attribute einer Datei aus" +msgstr "alle Attribute einer Datei ausgeben" #: builtin/check-attr.c:20 msgid "use .gitattributes only from the index" -msgstr "verwendet .gitattributes nur von der Staging-Area" +msgstr ".gitattributes nur von der Staging-Area verwenden" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" -msgstr "liest Dateinamen von der Standard-Eingabe" +msgstr "Dateinamen von der Standard-Eingabe lesen" #: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid "terminate input and output records by a NUL character" -msgstr "schließt Einträge von Ein- und Ausgabe mit NUL-Zeichen ab" +msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen" -#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274 msgid "suppress progress reporting" -msgstr "unterdrückt Fortschrittsanzeige" +msgstr "Fortschrittsanzeige unterdrücken" #: builtin/check-ignore.c:26 msgid "show non-matching input paths" -msgstr "zeigt Eingabe-Pfade ohne Übereinstimmungen" +msgstr "Eingabe-Pfade ohne Übereinstimmungen anzeigen" #: builtin/check-ignore.c:28 msgid "ignore index when checking" -msgstr "ignoriert Staging-Area bei der Prüfung" +msgstr "Staging-Area bei der Prüfung ignorieren" #: builtin/check-ignore.c:154 msgid "cannot specify pathnames with --stdin" @@ -3285,7 +3388,7 @@ msgstr "git check-mailmap [Optionen] <Kontakt>..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" -msgstr "liest ebenfalls Kontakte von der Standard-Eingabe" +msgstr "ebenfalls Kontakte von der Standard-Eingabe lesen" #: builtin/check-mailmap.c:24 #, c-format @@ -3302,11 +3405,11 @@ msgstr "git checkout-index [Optionen] [--] [<Datei>...]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" -msgstr "checkt alle Dateien in der Staging-Area aus" +msgstr "alle Dateien in der Staging-Area auschecken" #: builtin/checkout-index.c:189 msgid "force overwrite of existing files" -msgstr "erzwingt das Überschreiben bereits existierender Dateien" +msgstr "das Überschreiben bereits existierender Dateien erzwingen" #: builtin/checkout-index.c:191 msgid "no warning for existing files and files not in index" @@ -3316,19 +3419,19 @@ msgstr "" #: builtin/checkout-index.c:193 msgid "don't checkout new files" -msgstr "checkt keine neuen Dateien aus" +msgstr "keine neuen Dateien auschecken" #: builtin/checkout-index.c:195 msgid "update stat information in the index file" -msgstr "aktualisiert Dateiinformationen in der Staging-Area-Datei" +msgstr "Dateiinformationen in der Staging-Area-Datei aktualisieren" #: builtin/checkout-index.c:201 msgid "read list of paths from the standard input" -msgstr "liest eine Liste von Pfaden von der Standard-Eingabe" +msgstr "eine Liste von Pfaden von der Standard-Eingabe lesen" #: builtin/checkout-index.c:203 msgid "write the content to temporary files" -msgstr "schreibt den Inhalt in temporäre Dateien" +msgstr "den Inhalt in temporäre Dateien schreiben" #: builtin/checkout-index.c:204 builtin/column.c:30 msgid "string" @@ -3341,7 +3444,7 @@ msgstr "" #: builtin/checkout-index.c:208 msgid "copy out the files from named stage" -msgstr "kopiert Dateien von dem benannten Stand" +msgstr "Dateien von dem benannten Stand kopieren" #: builtin/checkout.c:25 msgid "git checkout [options] <branch>" @@ -3411,46 +3514,46 @@ msgstr "Pfad '%s' ist nicht zusammengeführt." msgid "you need to resolve your current index first" msgstr "Sie müssen zuerst Ihre aktuelle Staging-Area auflösen." -#: builtin/checkout.c:591 +#: builtin/checkout.c:597 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Konnte \"reflog\" für '%s' nicht durchführen\n" -#: builtin/checkout.c:629 +#: builtin/checkout.c:635 msgid "HEAD is now at" msgstr "HEAD ist jetzt bei" -#: builtin/checkout.c:636 +#: builtin/checkout.c:642 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Branch '%s' neu\n" -#: builtin/checkout.c:639 +#: builtin/checkout.c:645 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:643 +#: builtin/checkout.c:649 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Zu umgesetztem Branch '%s' gewechselt\n" -#: builtin/checkout.c:645 builtin/checkout.c:1026 +#: builtin/checkout.c:651 builtin/checkout.c:1032 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Zu neuem Branch '%s' gewechselt\n" -#: builtin/checkout.c:647 +#: builtin/checkout.c:653 #, c-format msgid "Switched to branch '%s'\n" msgstr "Zu Branch '%s' gewechselt\n" -#: builtin/checkout.c:699 +#: builtin/checkout.c:705 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" -#: builtin/checkout.c:705 +#: builtin/checkout.c:711 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3463,17 +3566,17 @@ msgid_plural "" "\n" "%s\n" msgstr[0] "" -"Warnung: Sie sind um %d Commit hinterher, nicht verbunden zu\n" -"einem Ihrer Branches:\n" +"Warnung: Sie sind um %d Commit hinterher. Folgende Commits sind in\n" +"keinem Ihrer Branches enthalten:\n" "\n" "%s\n" msgstr[1] "" -"Warnung: Sie sind um %d Commits hinterher, nicht verbunden zu\n" -"einem Ihrer Branches:\n" +"Warnung: Sie sind um %d Commits hinterher. Folgende Commits sind in\n" +"keinem Ihrer Branches enthalten:\n" "\n" "%s\n" -#: builtin/checkout.c:723 +#: builtin/checkout.c:729 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3488,139 +3591,139 @@ msgstr "" " git branch neuer_branch_name %s\n" "\n" -#: builtin/checkout.c:753 +#: builtin/checkout.c:759 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:757 +#: builtin/checkout.c:763 msgid "Previous HEAD position was" msgstr "Vorherige Position von HEAD war" -#: builtin/checkout.c:784 builtin/checkout.c:1021 +#: builtin/checkout.c:790 builtin/checkout.c:1027 msgid "You are on a branch yet to be born" msgstr "Sie sind auf einem Branch, der noch geboren wird" -#: builtin/checkout.c:928 +#: builtin/checkout.c:934 #, c-format msgid "only one reference expected, %d given." msgstr "nur eine Referenz erwartet, %d gegeben." -#: builtin/checkout.c:967 +#: builtin/checkout.c:973 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1002 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein \"Tree\"-Objekt: %s" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1041 msgid "paths cannot be used with switching branches" msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1038 builtin/checkout.c:1042 +#: builtin/checkout.c:1044 builtin/checkout.c:1048 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054 -#: builtin/checkout.c:1057 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 +#: builtin/checkout.c:1063 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1068 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln" -#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "Branch" -#: builtin/checkout.c:1085 +#: builtin/checkout.c:1091 msgid "create and checkout a new branch" -msgstr "erzeugt und checkt einen neuen Branch aus" +msgstr "einen neuen Branch erzeugen und auschecken" -#: builtin/checkout.c:1087 +#: builtin/checkout.c:1093 msgid "create/reset and checkout a branch" -msgstr "erzeugt/setzt um und checkt einen Branch aus" +msgstr "einen Branch erstellen/umsetzen und auschecken" -#: builtin/checkout.c:1088 +#: builtin/checkout.c:1094 msgid "create reflog for new branch" -msgstr "erzeugt das Reflog für den neuen Branch" +msgstr "das Reflog für den neuen Branch erzeugen" -#: builtin/checkout.c:1089 +#: builtin/checkout.c:1095 msgid "detach the HEAD at named commit" -msgstr "setzt HEAD zu benanntem Commit" +msgstr "HEAD zu benanntem Commit setzen" -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1096 msgid "set upstream info for new branch" -msgstr "setzt Informationen zum Upstream-Branch für den neuen Branch" +msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new-branch" msgstr "neuer Branch" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new unparented branch" msgstr "neuer Branch ohne Eltern-Commit" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1099 msgid "checkout our version for unmerged files" -msgstr "checkt unsere Variante für nicht zusammengeführte Dateien aus" +msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1101 msgid "checkout their version for unmerged files" -msgstr "checkt ihre Variante für nicht zusammengeführte Dateien aus" +msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1097 +#: builtin/checkout.c:1103 msgid "force checkout (throw away local modifications)" -msgstr "erzwingt Auschecken (verwirft lokale Änderungen)" +msgstr "Auschecken erzwingen (verwirft lokale Änderungen)" -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1104 msgid "perform a 3-way merge with the new branch" -msgstr "führt einen 3-Wege-Merge mit dem neuen Branch aus" +msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen" -#: builtin/checkout.c:1099 builtin/merge.c:225 +#: builtin/checkout.c:1105 builtin/merge.c:226 msgid "update ignored files (default)" -msgstr "aktualisiert ignorierte Dateien (Standard)" +msgstr "ignorierte Dateien aktualisieren (Standard)" -#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245 +#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245 msgid "style" msgstr "Stil" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1107 msgid "conflict style (merge or diff3)" msgstr "Konfliktstil (merge oder diff3)" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1110 msgid "do not limit pathspecs to sparse entries only" -msgstr "Pfadspezifikationen ignorieren Einstellungen zum partiellen Auschecken" +msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken" -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1112 msgid "second guess 'git checkout no-such-branch'" msgstr "second guess 'git checkout no-such-branch'" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1135 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus." -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1152 msgid "--track needs a branch name" msgstr "Bei der Option --track muss ein Branchname angegeben werden." -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1157 msgid "Missing branch name; try -b" msgstr "Vermisse Branchnamen; versuchen Sie -b" -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1194 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1201 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3630,12 +3733,12 @@ msgstr "" "Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelöst " "werden kann?" -#: builtin/checkout.c:1202 +#: builtin/checkout.c:1206 #, 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:1206 +#: builtin/checkout.c:1210 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3772,11 +3875,11 @@ msgstr "Keine Dateien mehr zum Löschen, beende." #: builtin/clean.c:874 msgid "do not print names of files removed" -msgstr "gibt keine Namen von gelöschten Dateien aus" +msgstr "keine Namen von gelöschten Dateien ausgeben" #: builtin/clean.c:876 msgid "force" -msgstr "erzwingt Aktion" +msgstr "Aktion erzwingen" #: builtin/clean.c:877 msgid "interactive cleaning" @@ -3784,24 +3887,24 @@ msgstr "interaktives Clean" #: builtin/clean.c:879 msgid "remove whole directories" -msgstr "löscht ganze Verzeichnisse" +msgstr "ganze Verzeichnisse löschen" -#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714 +#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "Muster" #: builtin/clean.c:881 msgid "add <pattern> to ignore rules" -msgstr "fügt <Muster> zu den Regeln für ignorierte Pfade hinzu" +msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen" #: builtin/clean.c:882 msgid "remove ignored files, too" -msgstr "löscht auch ignorierte Dateien" +msgstr "auch ignorierte Dateien löschen" #: builtin/clean.c:884 msgid "remove only ignored files" -msgstr "löscht nur ignorierte Dateien" +msgstr "nur ignorierte Dateien löschen" #: builtin/clean.c:902 msgid "-x and -X cannot be used together" @@ -3823,149 +3926,149 @@ msgstr "" "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -" "f gegeben; \"clean\" verweigert" -#: builtin/clone.c:36 +#: builtin/clone.c:37 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [Optionen] [--] <Repository> [<Verzeichnis>]" -#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222 -#: builtin/push.c:503 +#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223 +#: builtin/push.c:514 msgid "force progress reporting" -msgstr "erzwingt Fortschrittsanzeige" +msgstr "Fortschrittsanzeige erzwingen" -#: builtin/clone.c:66 +#: builtin/clone.c:67 msgid "don't create a checkout" msgstr "kein Auschecken" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 msgid "create a bare repository" -msgstr "erstellt ein Bare-Repository" +msgstr "ein Bare-Repository erstellen" -#: builtin/clone.c:71 +#: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" -msgstr "erstellt ein Spiegelarchiv (impliziert --bare)" +msgstr "ein Spiegelarchiv erstellen (impliziert --bare)" -#: builtin/clone.c:73 +#: builtin/clone.c:74 msgid "to clone from a local repository" -msgstr "um von einem lokalen Repository zu klonen" +msgstr "von einem lokalen Repository klonen" -#: builtin/clone.c:75 +#: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" -msgstr "verwendet lokal keine harten Verweise, immer Kopien" +msgstr "lokal keine harten Verweise verwenden, immer Kopien" -#: builtin/clone.c:77 +#: builtin/clone.c:78 msgid "setup as shared repository" -msgstr "Einrichtung als verteiltes Repository" +msgstr "als verteiltes Repository einrichten" -#: builtin/clone.c:79 builtin/clone.c:81 +#: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" -msgstr "initialisiert Submodule im Klon" +msgstr "Submodule im Klon initialisieren" -#: builtin/clone.c:82 builtin/init-db.c:483 +#: builtin/clone.c:83 builtin/init-db.c:485 msgid "template-directory" msgstr "Vorlagenverzeichnis" -#: builtin/clone.c:83 builtin/init-db.c:484 +#: builtin/clone.c:84 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden" -#: builtin/clone.c:85 +#: builtin/clone.c:86 msgid "reference repository" -msgstr "referenziert Repository" +msgstr "Repository referenzieren" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "Name" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "use <name> instead of 'origin' to track upstream" -msgstr "verwendet <Name> statt 'origin' für Upstream-Repository" +msgstr "<Name> statt 'origin' für Upstream-Repository verwenden" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" -msgstr "checkt <Branch> aus, anstatt HEAD des Remote-Repositories" +msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "path to git-upload-pack on the remote" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659 msgid "depth" msgstr "Tiefe" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "create a shallow clone of that depth" msgstr "" -"erstellt einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe" +"einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen" -#: builtin/clone.c:95 +#: builtin/clone.c:96 msgid "clone only one branch, HEAD or --branch" -msgstr "klont nur einen Branch, HEAD oder --branch" +msgstr "nur einen Branch klonen, HEAD oder --branch" -#: builtin/clone.c:96 builtin/init-db.c:492 +#: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" msgstr ".git-Verzeichnis" -#: builtin/clone.c:97 builtin/init-db.c:493 +#: builtin/clone.c:98 builtin/init-db.c:495 msgid "separate git dir from working tree" -msgstr "separiert Git-Verzeichnis vom Arbeitsverzeichnis" +msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "key=value" msgstr "Schlüssel=Wert" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "set config inside the new repository" -msgstr "setzt Konfiguration innerhalb des neuen Repositories" +msgstr "Konfiguration innerhalb des neuen Repositories setzen" -#: builtin/clone.c:252 +#: builtin/clone.c:253 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "Referenziertes Repository '%s' ist kein lokales Repository." -#: builtin/clone.c:256 +#: builtin/clone.c:257 #, c-format msgid "reference repository '%s' is shallow" msgstr "" "Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)." -#: builtin/clone.c:259 +#: builtin/clone.c:260 #, c-format msgid "reference repository '%s' is grafted" msgstr "" "Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") " "eingehängt." -#: builtin/clone.c:321 +#: builtin/clone.c:322 #, c-format msgid "failed to create directory '%s'" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/clone.c:323 builtin/diff.c:83 +#: builtin/clone.c:324 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "Konnte '%s' nicht lesen" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "%s exists and is not a directory" msgstr "%s existiert und ist kein Verzeichnis" -#: builtin/clone.c:339 +#: builtin/clone.c:340 #, c-format msgid "failed to stat %s\n" msgstr "Konnte %s nicht lesen\n" -#: builtin/clone.c:361 +#: builtin/clone.c:362 #, c-format msgid "failed to create link '%s'" msgstr "Konnte Verweis '%s' nicht erstellen" -#: builtin/clone.c:365 +#: builtin/clone.c:366 #, c-format msgid "failed to copy file to '%s'" msgstr "Konnte Datei nicht nach '%s' kopieren" -#: builtin/clone.c:388 builtin/clone.c:565 +#: builtin/clone.c:389 builtin/clone.c:563 #, c-format msgid "done.\n" msgstr "Fertig.\n" @@ -3980,114 +4083,114 @@ 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:480 +#: builtin/clone.c:478 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." -#: builtin/clone.c:560 +#: builtin/clone.c:558 #, c-format msgid "Checking connectivity... " msgstr "Prüfe Konnektivität... " -#: builtin/clone.c:563 +#: builtin/clone.c:561 msgid "remote did not send all necessary objects" msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet." -#: builtin/clone.c:627 +#: builtin/clone.c:625 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:658 +#: builtin/clone.c:656 msgid "unable to checkout working tree" msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" -#: builtin/clone.c:768 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:772 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "Sie müssen ein Repository zum Klonen angeben." -#: builtin/clone.c:783 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Die Optionen --bare und --origin %s sind inkompatibel." -#: builtin/clone.c:786 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:799 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht." -#: builtin/clone.c:805 builtin/fetch.c:1143 +#: builtin/clone.c:802 builtin/fetch.c:1155 #, c-format msgid "depth %s is not a positive number" msgstr "Tiefe %s ist keine positive Zahl" -#: builtin/clone.c:815 +#: builtin/clone.c:812 #, 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:825 +#: builtin/clone.c:822 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:838 builtin/clone.c:850 +#: builtin/clone.c:835 builtin/clone.c:847 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:841 +#: builtin/clone.c:838 #, c-format msgid "could not create work tree dir '%s'." msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen." -#: builtin/clone.c:860 +#: builtin/clone.c:857 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in Bare-Repository '%s'...\n" -#: builtin/clone.c:862 +#: builtin/clone.c:859 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s'...\n" -#: builtin/clone.c:898 +#: builtin/clone.c:895 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:901 +#: builtin/clone.c:898 msgid "source repository is shallow, ignoring --local" msgstr "" "Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --" "local" -#: builtin/clone.c:906 +#: builtin/clone.c:903 msgid "--local is ignored" msgstr "--local wird ignoriert" -#: builtin/clone.c:910 +#: builtin/clone.c:907 #, c-format msgid "Don't know how to clone %s" msgstr "Weiß nicht wie %s zu klonen ist." -#: builtin/clone.c:961 builtin/clone.c:969 +#: builtin/clone.c:958 builtin/clone.c:966 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" -#: builtin/clone.c:972 +#: builtin/clone.c:969 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." @@ -4097,7 +4200,7 @@ msgstr "git column [Optionen]" #: builtin/column.c:26 msgid "lookup config vars" -msgstr "schlägt Konfigurationsvariablen nach" +msgstr "Konfigurationsvariablen nachschlagen" #: builtin/column.c:27 builtin/column.c:28 msgid "layout to use" @@ -4123,15 +4226,43 @@ msgstr "Abstand zwischen Spalten" msgid "--command must be the first argument" msgstr "Die Option --command muss an erster Stelle stehen." -#: builtin/commit.c:36 +#: builtin/commit.c:37 msgid "git commit [options] [--] <pathspec>..." msgstr "git commit [Optionen] [--] <Pfadspezifikation>..." -#: builtin/commit.c:41 +#: builtin/commit.c:42 msgid "git status [options] [--] <pathspec>..." msgstr "git status [Optionen] [--] <Pfadspezifikation>..." -#: builtin/commit.c:46 +#: builtin/commit.c:47 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"Ihr Name und E-Mail Adresse wurden automatisch auf Basis\n" +"Ihres Benutzer- und Rechnernamens konfiguriert. Bitte prüfen Sie, dass\n" +"diese zutreffend sind. Sie können diese Meldung unterdrücken, indem Sie\n" +"diese explizit setzen. Führen Sie dazu das folgende Kommando aus und folgen\n" +"Sie den Anweisungen in Ihrem Editor, um die Konfigurationsdatei zu " +"bearbeiten:\n" +"\n" +" git config --global --edit\n" +"\n" +"Nachdem Sie das getan haben, können Sie Ihre Identität für diesen Commit\n" +"ändern mit:\n" +"\n" +" git commit --amend --reset-author\n" + +#: builtin/commit.c:60 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4157,7 +4288,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:58 +#: builtin/commit.c:72 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -4167,7 +4298,7 @@ msgstr "" "machen. Sie können Ihr Kommando mit --allow-empty wiederholen, oder diesen\n" "Commit mit \"git reset HEAD^\" vollständig entfernen.\n" -#: builtin/commit.c:63 +#: builtin/commit.c:77 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4182,11 +4313,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:70 +#: builtin/commit.c:84 msgid "Otherwise, please use 'git reset'\n" msgstr "Andernfalls benutzen Sie bitte 'git reset'\n" -#: builtin/commit.c:73 +#: builtin/commit.c:87 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4202,59 +4333,76 @@ msgstr "" "Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n" "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n" -#: builtin/commit.c:288 +#: builtin/commit.c:302 msgid "failed to unpack HEAD tree object" msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD." -#: builtin/commit.c:328 +#: builtin/commit.c:342 msgid "unable to create temporary index" msgstr "Konnte temporäre Staging-Area nicht erstellen." -#: builtin/commit.c:334 +#: builtin/commit.c:348 msgid "interactive add failed" msgstr "interaktives Hinzufügen fehlgeschlagen" -#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435 +#: builtin/commit.c:359 +msgid "unable to write index file" +msgstr "Konnte Staging-Area-Datei nicht schreiben." + +#: builtin/commit.c:361 +msgid "unable to update temporary index" +msgstr "Konnte temporäre Staging-Area nicht aktualisieren." + +#: builtin/commit.c:363 +msgid "Failed to update main cache tree" +msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren" + +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 msgid "unable to write new_index file" msgstr "Konnte new_index Datei nicht schreiben" -#: builtin/commit.c:418 +#: builtin/commit.c:443 msgid "cannot do a partial commit during a merge." msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist." -#: builtin/commit.c:420 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist." -#: builtin/commit.c:429 +#: builtin/commit.c:454 msgid "cannot read the index" msgstr "Kann Staging-Area nicht lesen" -#: builtin/commit.c:447 +#: builtin/commit.c:473 msgid "unable to write temporary index file" msgstr "Konnte temporäre Staging-Area-Datei nicht schreiben." -#: builtin/commit.c:557 builtin/commit.c:563 +#: builtin/commit.c:592 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "Commit '%s' fehlt Autor-Kopfbereich" + +#: builtin/commit.c:594 #, c-format -msgid "invalid commit: %s" -msgstr "Ungültiger Commit: %s" +msgid "commit '%s' has malformed author line" +msgstr "Commit '%s' hat fehlerhafte Autor-Zeile" -#: builtin/commit.c:585 +#: builtin/commit.c:613 msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:592 +#: builtin/commit.c:621 #, c-format msgid "invalid date format: %s" msgstr "Ungültiges Datumsformat: %s" -#: builtin/commit.c:609 +#: builtin/commit.c:642 #, c-format msgid "Malformed ident string: '%s'" msgstr "Fehlerhafter Ident-String: '%s'" -#: builtin/commit.c:642 +#: builtin/commit.c:675 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4262,43 +4410,43 @@ msgstr "" "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n" "der aktuellen Commit-Beschreibung verwendet wird." -#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086 +#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120 #, c-format msgid "could not lookup commit %s" msgstr "Konnte Commit %s nicht nachschlagen" -#: builtin/commit.c:691 builtin/shortlog.c:273 +#: builtin/commit.c:724 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" -#: builtin/commit.c:693 +#: builtin/commit.c:726 msgid "could not read log from standard input" msgstr "Konnte Log nicht von Standard-Eingabe lesen." -#: builtin/commit.c:697 +#: builtin/commit.c:730 #, c-format msgid "could not read log file '%s'" msgstr "Konnte Log-Datei '%s' nicht lesen" -#: builtin/commit.c:719 +#: builtin/commit.c:752 msgid "could not read MERGE_MSG" msgstr "Konnte MERGE_MSG nicht lesen" -#: builtin/commit.c:723 +#: builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:727 +#: builtin/commit.c:760 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" -#: builtin/commit.c:798 +#: builtin/commit.c:831 msgid "could not write commit template" msgstr "Konnte Commit-Vorlage nicht schreiben" -#: builtin/commit.c:816 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -4313,7 +4461,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -4328,7 +4476,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:834 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4338,7 +4486,7 @@ msgstr "" "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/commit.c:841 +#: builtin/commit.c:874 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4351,378 +4499,370 @@ msgstr "" "entfernen.\n" "Eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:888 #, c-format msgid "%sAuthor: %.*s <%.*s>" -msgstr "%sAutor: %.*s <%.*s>" +msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:863 +#: builtin/commit.c:896 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:870 +#: builtin/commit.c:903 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommit-Ersteller: %.*s <%.*s>" -#: builtin/commit.c:888 +#: builtin/commit.c:921 msgid "Cannot read index" msgstr "Kann Staging-Area nicht lesen" -#: builtin/commit.c:945 +#: builtin/commit.c:978 msgid "Error building trees" msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte" -#: builtin/commit.c:960 builtin/tag.c:495 +#: builtin/commit.c:993 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" "Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n" -#: builtin/commit.c:1061 +#: builtin/commit.c:1095 #, c-format msgid "No existing author found with '%s'" msgstr "Kein existierender Autor mit '%s' gefunden." -#: builtin/commit.c:1076 builtin/commit.c:1316 +#: builtin/commit.c:1110 builtin/commit.c:1350 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungültiger Modus '%s' für unbeobachtete Dateien" -#: builtin/commit.c:1113 +#: builtin/commit.c:1147 msgid "--long and -z are incompatible" msgstr "Die Optionen --long und -z sind inkompatibel." -#: builtin/commit.c:1143 +#: builtin/commit.c:1177 msgid "Using both --reset-author and --author does not make sense" msgstr "" "Die Optionen --reset-author und --author können nicht gemeinsam verwendet " "werden." -#: builtin/commit.c:1152 +#: builtin/commit.c:1186 msgid "You have nothing to amend." msgstr "Sie haben nichts für \"--amend\"." -#: builtin/commit.c:1155 +#: builtin/commit.c:1189 msgid "You are in the middle of a merge -- cannot amend." msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1157 +#: builtin/commit.c:1191 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1160 +#: builtin/commit.c:1194 msgid "Options --squash and --fixup cannot be used together" msgstr "" "Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden." -#: builtin/commit.c:1170 +#: builtin/commit.c:1204 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden." -#: builtin/commit.c:1172 +#: builtin/commit.c:1206 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden." -#: builtin/commit.c:1180 +#: builtin/commit.c:1214 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden." -#: builtin/commit.c:1197 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Es kann nur eine Option von --include/--only/--all/--interactive/--patch " "verwendet werden." -#: builtin/commit.c:1199 +#: builtin/commit.c:1233 msgid "No paths with --include/--only does not make sense." msgstr "" "Die Optionen --include und --only können nur mit der Angabe von Pfaden " "verwendet werden." -#: builtin/commit.c:1201 +#: builtin/commit.c:1235 msgid "Clever... amending the last one with dirty index." msgstr "" "Klug... den letzten Commit mit einer geänderten Staging-Area nachbessern." -#: builtin/commit.c:1203 +#: builtin/commit.c:1237 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an" -#: builtin/commit.c:1215 builtin/tag.c:727 +#: builtin/commit.c:1249 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger \"cleanup\" Modus %s" -#: builtin/commit.c:1220 +#: builtin/commit.c:1254 msgid "Paths with -a does not make sense." msgstr "Die Option -a kann nur mit der Angabe von Pfaden verwendet werden." -#: builtin/commit.c:1330 builtin/commit.c:1595 +#: builtin/commit.c:1364 builtin/commit.c:1644 msgid "show status concisely" -msgstr "zeigt Status im Kurzformat" +msgstr "Status im Kurzformat anzeigen" -#: builtin/commit.c:1332 builtin/commit.c:1597 +#: builtin/commit.c:1366 builtin/commit.c:1646 msgid "show branch information" -msgstr "zeigt Branchinformationen" +msgstr "Branchinformationen anzeigen" -#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489 +#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" -#: builtin/commit.c:1337 builtin/commit.c:1601 +#: builtin/commit.c:1371 builtin/commit.c:1650 msgid "show status in long format (default)" -msgstr "zeigt Status im Langformat (Standard)" +msgstr "Status im Langformat anzeigen (Standard)" -#: builtin/commit.c:1340 builtin/commit.c:1604 +#: builtin/commit.c:1374 builtin/commit.c:1653 msgid "terminate entries with NUL" -msgstr "schließt Einträge mit NUL-Zeichen ab" +msgstr "Einträge mit NUL-Zeichen abschließen" -#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703 -#: builtin/fast-export.c:706 builtin/tag.c:602 +#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980 +#: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "Modus" -#: builtin/commit.c:1343 builtin/commit.c:1607 +#: builtin/commit.c:1377 builtin/commit.c:1656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -"zeigt nicht beobachtete Dateien, optionale Modi: all, normal, no. (Standard: " -"all)" +"nicht beobachtete Dateien anzeigen, optionale Modi: all, normal, no. " +"(Standard: all)" -#: builtin/commit.c:1346 +#: builtin/commit.c:1380 msgid "show ignored files" -msgstr "zeigt ignorierte Dateien" +msgstr "ignorierte Dateien anzeigen" -#: builtin/commit.c:1347 parse-options.h:153 +#: builtin/commit.c:1381 parse-options.h:153 msgid "when" msgstr "wann" -#: builtin/commit.c:1348 +#: builtin/commit.c:1382 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -"ignoriert Änderungen in Submodulen, optional wenn: all, dirty, untracked. " +"Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. " "(Standard: all)" -#: builtin/commit.c:1350 +#: builtin/commit.c:1384 msgid "list untracked files in columns" -msgstr "listet unbeobachtete Dateien in Spalten auf" +msgstr "unbeobachtete Dateien in Spalten auflisten" -#: builtin/commit.c:1419 +#: builtin/commit.c:1471 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellten Commit nicht nachschlagen." -#: builtin/commit.c:1421 +#: builtin/commit.c:1473 msgid "could not parse newly created commit" msgstr "Konnte neulich erstellten Commit nicht analysieren." -#: builtin/commit.c:1469 +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "losgelöster HEAD" -#: builtin/commit.c:1471 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr " (Basis-Commit)" -#: builtin/commit.c:1565 +#: builtin/commit.c:1614 msgid "suppress summary after successful commit" -msgstr "unterdrückt Zusammenfassung nach erfolgreichem Commit" +msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken" -#: builtin/commit.c:1566 +#: builtin/commit.c:1615 msgid "show diff in commit message template" -msgstr "zeigt Unterschiede in Commit-Beschreibungsvorlage an" +msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen" -#: builtin/commit.c:1568 +#: builtin/commit.c:1617 msgid "Commit message options" msgstr "Optionen für Commit-Beschreibung" -#: builtin/commit.c:1569 builtin/tag.c:600 +#: builtin/commit.c:1618 builtin/tag.c:601 msgid "read message from file" -msgstr "liest Beschreibung von Datei" +msgstr "Beschreibung von Datei lesen" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "author" msgstr "Autor" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "override author for commit" -msgstr "überschreibt Autor eines Commits" +msgstr "Autor eines Commits überschreiben" -#: builtin/commit.c:1571 builtin/gc.c:286 +#: builtin/commit.c:1620 builtin/gc.c:275 msgid "date" msgstr "Datum" -#: builtin/commit.c:1571 +#: builtin/commit.c:1620 msgid "override date for commit" -msgstr "überschreibt Datum eines Commits" +msgstr "Datum eines Commits überschreiben" -#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409 -#: builtin/notes.c:566 builtin/tag.c:598 +#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/tag.c:599 msgid "message" msgstr "Beschreibung" -#: builtin/commit.c:1572 +#: builtin/commit.c:1621 msgid "commit message" msgstr "Commit-Beschreibung" -#: builtin/commit.c:1573 +#: builtin/commit.c:1622 msgid "reuse and edit message from specified commit" -msgstr "verwendet wieder und editiert Beschreibung des angegebenen Commits" +msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren" -#: builtin/commit.c:1574 +#: builtin/commit.c:1623 msgid "reuse message from specified commit" -msgstr "verwendet Beschreibung des angegebenen Commits wieder" +msgstr "Beschreibung des angegebenen Commits wiederverwenden" -#: builtin/commit.c:1575 +#: builtin/commit.c:1624 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -"verwendet eine automatisch zusammengesetzte Beschreibung zum Nachbessern des " -"angegebenen Commits" +"eine automatisch zusammengesetzte Beschreibung zum Nachbessern des " +"angegebenen Commits verwenden" -#: builtin/commit.c:1576 +#: builtin/commit.c:1625 msgid "use autosquash formatted message to squash specified commit" msgstr "" -"verwendet eine automatisch zusammengesetzte Beschreibung beim \"squash\" des " -"angegebenen Commits" +"eine automatisch zusammengesetzte Beschreibung beim \"squash\" des " +"angegebenen Commits verwenden" -#: builtin/commit.c:1577 +#: builtin/commit.c:1626 msgid "the commit is authored by me now (used with -C/-c/--amend)" -msgstr "Setzt Sie als Autor des Commits (verwendet mit -C/-c/--amend)" +msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)" -#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86 +#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" -msgstr "fügt 'Signed-off-by:'-Zeile hinzu" +msgstr "'Signed-off-by:'-Zeile hinzufügen" -#: builtin/commit.c:1579 +#: builtin/commit.c:1628 msgid "use specified template file" -msgstr "verwendet angegebene Vorlagendatei" +msgstr "angegebene Vorlagendatei verwenden" -#: builtin/commit.c:1580 +#: builtin/commit.c:1629 msgid "force edit of commit" -msgstr "erzwingt Bearbeitung des Commits" +msgstr "Bearbeitung des Commits erzwingen" -#: builtin/commit.c:1581 +#: builtin/commit.c:1630 msgid "default" msgstr "Standard" -#: builtin/commit.c:1581 builtin/tag.c:603 +#: builtin/commit.c:1630 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:1582 +#: builtin/commit.c:1631 msgid "include status in commit message template" -msgstr "fügt Status in die Commit-Beschreibungsvorlage ein" +msgstr "Status in die Commit-Beschreibungsvorlage einfügen" -#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92 -#: builtin/tag.c:604 +#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92 +#: builtin/tag.c:605 msgid "key-id" msgstr "GPG-Schlüsselkennung" -#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93 +#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93 msgid "GPG sign commit" -msgstr "signiert Commit mit GPG" +msgstr "Commit mit GPG signieren" -#: builtin/commit.c:1587 +#: builtin/commit.c:1636 msgid "Commit contents options" msgstr "Optionen für Commit-Inhalt" -#: builtin/commit.c:1588 +#: builtin/commit.c:1637 msgid "commit all changed files" -msgstr "committet alle geänderten Dateien" +msgstr "alle geänderten Dateien committen" -#: builtin/commit.c:1589 +#: builtin/commit.c:1638 msgid "add specified files to index for commit" -msgstr "merkt die angegebenen Dateien zusätzlich zum Commit vor" +msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken" -#: builtin/commit.c:1590 +#: builtin/commit.c:1639 msgid "interactively add files" msgstr "interaktives Hinzufügen von Dateien" -#: builtin/commit.c:1591 +#: builtin/commit.c:1640 msgid "interactively add changes" msgstr "interaktives Hinzufügen von Änderungen" -#: builtin/commit.c:1592 +#: builtin/commit.c:1641 msgid "commit only specified files" -msgstr "committet nur die angegebenen Dateien" +msgstr "nur die angegebenen Dateien committen" -#: builtin/commit.c:1593 +#: builtin/commit.c:1642 msgid "bypass pre-commit hook" -msgstr "umgeht \"pre-commit hook\"" +msgstr "\"pre-commit hook\" umgehen" -#: builtin/commit.c:1594 +#: builtin/commit.c:1643 msgid "show what would be committed" -msgstr "zeigt an, was committet werden würde" +msgstr "anzeigen, was committet werden würde" -#: builtin/commit.c:1605 +#: builtin/commit.c:1654 msgid "amend previous commit" -msgstr "ändert vorherigen Commit" +msgstr "vorherigen Commit ändern" -#: builtin/commit.c:1606 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" -msgstr "umgeht \"post-rewrite hook\"" +msgstr "\"post-rewrite hook\" umgehen" -#: builtin/commit.c:1611 +#: builtin/commit.c:1660 msgid "ok to record an empty change" -msgstr "erlaubt Aufzeichnung einer leeren Änderung" +msgstr "Aufzeichnung einer leeren Änderung erlauben" -#: builtin/commit.c:1613 +#: builtin/commit.c:1662 msgid "ok to record a change with an empty message" -msgstr "erlaubt Aufzeichnung einer Änderung mit einer leeren Beschreibung" +msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben" -#: builtin/commit.c:1641 +#: builtin/commit.c:1691 msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." -#: builtin/commit.c:1680 builtin/merge.c:518 +#: builtin/commit.c:1730 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: builtin/commit.c:1687 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1694 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1713 +#: builtin/commit.c:1763 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Commit-Beschreibung nicht lesen: %s" -#: builtin/commit.c:1724 +#: builtin/commit.c:1774 #, 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:1729 +#: builtin/commit.c:1779 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n" -#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: builtin/commit.c:1756 -msgid "cannot lock HEAD ref" -msgstr "Kann Referenz von HEAD nicht sperren." - -#: builtin/commit.c:1769 -msgid "cannot update HEAD ref" -msgstr "Kann Referenz von HEAD nicht aktualisieren." - -#: builtin/commit.c:1780 +#: builtin/commit.c:1827 msgid "" "Repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full or quota is\n" +"new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" "Das Repository wurde aktualisiert, aber die \"new_index\"-Datei\n" @@ -4740,19 +4880,19 @@ msgstr "Ort der Konfigurationsdatei" #: builtin/config.c:54 msgid "use global config file" -msgstr "verwendet globale Konfigurationsdatei" +msgstr "globale Konfigurationsdatei verwenden" #: builtin/config.c:55 msgid "use system config file" -msgstr "verwendet systemweite Konfigurationsdatei" +msgstr "systemweite Konfigurationsdatei verwenden" #: builtin/config.c:56 msgid "use repository config file" -msgstr "verwendet Konfigurationsdatei des Repositories" +msgstr "Konfigurationsdatei des Repositories verwenden" #: builtin/config.c:57 msgid "use given config file" -msgstr "verwendet die angegebene Konfigurationsdatei" +msgstr "die angegebene Konfigurationsdatei verwenden" #: builtin/config.c:58 msgid "blob-id" @@ -4760,7 +4900,7 @@ msgstr "Blob-Id" #: builtin/config.c:58 msgid "read config from given blob object" -msgstr "liest Konfiguration von angegebenem Blob-Objekt" +msgstr "Konfiguration von angegebenem Blob-Objekt lesen" #: builtin/config.c:59 msgid "Action" @@ -4768,51 +4908,51 @@ msgstr "Aktion" #: builtin/config.c:60 msgid "get value: name [value-regex]" -msgstr "gibt Wert zurück: Name [Wert-regex]" +msgstr "Wert zurückgeben: Name [Wert-regex]" #: builtin/config.c:61 msgid "get all values: key [value-regex]" -msgstr "gibt alle Werte zurück: Schlüssel [Wert-regex]" +msgstr "alle Werte zurückgeben: Schlüssel [Wert-regex]" #: builtin/config.c:62 msgid "get values for regexp: name-regex [value-regex]" -msgstr "gibt Werte für den regulären Ausdruck zurück: Name-regex [Wert-regex]" +msgstr "Werte für den regulären Ausdruck zurückgeben: Name-regex [Wert-regex]" #: builtin/config.c:63 msgid "get value specific for the URL: section[.var] URL" -msgstr "gibt Wert spezifisch für eine URL zurück: section[.var] URL" +msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL" #: builtin/config.c:64 msgid "replace all matching variables: name value [value_regex]" -msgstr "ersetzt alle passenden Variablen: Name Wert [Wert-regex] " +msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] " #: builtin/config.c:65 msgid "add a new variable: name value" -msgstr "fügt neue Variable hinzu: Name Wert" +msgstr "neue Variable hinzufügen: Name Wert" #: builtin/config.c:66 msgid "remove a variable: name [value-regex]" -msgstr "entfernt eine Variable: Name [Wert-regex]" +msgstr "eine Variable entfernen: Name [Wert-regex]" #: builtin/config.c:67 msgid "remove all matches: name [value-regex]" -msgstr "entfernt alle Übereinstimmungen: Name [Wert-regex]" +msgstr "alle Übereinstimmungen entfernen: Name [Wert-regex]" #: builtin/config.c:68 msgid "rename section: old-name new-name" -msgstr "benennt eine Sektion um: alter-Name neuer-Name" +msgstr "eine Sektion umbenennen: alter-Name neuer-Name" #: builtin/config.c:69 msgid "remove a section: name" -msgstr "entfernt eine Sektion: Name" +msgstr "eine Sektion entfernen: Name" #: builtin/config.c:70 msgid "list all" -msgstr "listet alles auf" +msgstr "alles auflisten" #: builtin/config.c:71 msgid "open an editor" -msgstr "öffnet einen Editor" +msgstr "einen Editor öffnen" #: builtin/config.c:72 builtin/config.c:73 msgid "slot" @@ -4820,11 +4960,11 @@ msgstr "Slot" #: builtin/config.c:72 msgid "find the color configured: [default]" -msgstr "findet die konfigurierte Farbe: [Standard]" +msgstr "die konfigurierte Farbe finden: [Standard]" #: builtin/config.c:73 msgid "find the color setting: [stdout-is-tty]" -msgstr "findet die Farbeinstellung: [Standard-Ausgabe-ist-Terminal]" +msgstr "die Farbeinstellung finden: [Standard-Ausgabe-ist-Terminal]" #: builtin/config.c:74 msgid "Type" @@ -4858,63 +4998,87 @@ msgstr "schließt Werte mit NUL-Byte ab" msgid "respect include directives on lookup" msgstr "beachtet \"include\"-Direktiven beim Nachschlagen" -#: builtin/count-objects.c:82 +#: builtin/config.c:315 +msgid "unable to parse default color value" +msgstr "konnte Standard-Farbwert nicht parsen" + +#: builtin/config.c:455 +#, c-format +msgid "" +"# This is Git's per-user configuration file.\n" +"[core]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tuser = %s\n" +"#\temail = %s\n" +msgstr "" +"# Das ist Git's benutzerspezifische Konfiguraionsdatei.\n" +"[core]\n" +"# Bitte passen Sie die folgenden Zeilen an und kommentieren Sie diese aus:\n" +"#\tuser = %s\n" +"#\temail = %s\n" + +#: builtin/config.c:590 +#, c-format +msgid "cannot create configuration file %s" +msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen." + +#: builtin/count-objects.c:55 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:65 msgid "print sizes in human readable format" msgstr "gibt Größenangaben in menschenlesbaren Format aus" -#: builtin/describe.c:16 +#: builtin/describe.c:17 msgid "git describe [options] <commit-ish>*" msgstr "git describe [Optionen] <commit-ish>*" -#: builtin/describe.c:17 +#: builtin/describe.c:18 msgid "git describe [options] --dirty" msgstr "git describe [Optionen] --dirty" -#: builtin/describe.c:216 +#: builtin/describe.c:217 #, c-format msgid "annotated tag %s not available" msgstr "annotiertes Tag %s ist nicht verfügbar" -#: builtin/describe.c:220 +#: builtin/describe.c:221 #, c-format msgid "annotated tag %s has no embedded name" msgstr "annotiertes Tag %s hat keinen eingebetteten Namen" -#: builtin/describe.c:222 +#: builtin/describe.c:223 #, c-format msgid "tag '%s' is really '%s' here" msgstr "Tag '%s' ist eigentlich '%s' hier" -#: builtin/describe.c:249 +#: builtin/describe.c:250 builtin/log.c:452 #, c-format msgid "Not a valid object name %s" msgstr "%s ist kein gültiger Objekt-Name" -#: builtin/describe.c:252 +#: builtin/describe.c:253 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s ist kein gültiges '%s' Objekt" -#: builtin/describe.c:269 +#: builtin/describe.c:270 #, c-format msgid "no tag exactly matches '%s'" msgstr "kein Tag entspricht exakt '%s'" -#: builtin/describe.c:271 +#: builtin/describe.c:272 #, c-format msgid "searching to describe %s\n" msgstr "suche zur Beschreibung von %s\n" -#: builtin/describe.c:318 +#: builtin/describe.c:319 #, c-format msgid "finished search at %s\n" msgstr "beendete Suche bei %s\n" -#: builtin/describe.c:345 +#: builtin/describe.c:346 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -4923,7 +5087,7 @@ msgstr "" "Keine annotierten Tags können '%s' beschreiben.\n" "Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags." -#: builtin/describe.c:349 +#: builtin/describe.c:350 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -4932,12 +5096,12 @@ msgstr "" "Keine Tags können '%s' beschreiben.\n" "Versuchen Sie --always oder erstellen Sie einige Tags." -#: builtin/describe.c:370 +#: builtin/describe.c:371 #, c-format msgid "traversed %lu commits\n" msgstr "%lu Commits durchlaufen\n" -#: builtin/describe.c:373 +#: builtin/describe.c:374 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -4946,144 +5110,148 @@ msgstr "" "mehr als %i Tags gefunden; Führe die ersten %i auf\n" "Suche bei %s aufgegeben\n" -#: builtin/describe.c:395 +#: builtin/describe.c:396 msgid "find the tag that comes after the commit" -msgstr "findet das Tag, das nach Commit kommt" +msgstr "das Tag finden, das nach dem Commit kommt" -#: builtin/describe.c:396 +#: builtin/describe.c:397 msgid "debug search strategy on stderr" -msgstr "protokolliert die Suchstrategie in der Standard-Fehlerausgabe" +msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren" -#: builtin/describe.c:397 +#: builtin/describe.c:398 msgid "use any ref" -msgstr "verwendet alle Referenzen" +msgstr "alle Referenzen verwenden" -#: builtin/describe.c:398 +#: builtin/describe.c:399 msgid "use any tag, even unannotated" -msgstr "verwendet jedes Tag, auch nicht-annotierte" +msgstr "jedes Tag verwenden, auch nicht-annotierte" -#: builtin/describe.c:399 +#: builtin/describe.c:400 msgid "always use long format" -msgstr "verwendet immer langes Format" +msgstr "immer langes Format verwenden" -#: builtin/describe.c:400 +#: builtin/describe.c:401 msgid "only follow first parent" -msgstr "folgt nur erstem Elternteil" +msgstr "nur erstem Elternteil folgen" -#: builtin/describe.c:403 +#: builtin/describe.c:404 msgid "only output exact matches" -msgstr "gibt nur exakte Übereinstimmungen aus" +msgstr "nur exakte Übereinstimmungen ausgeben" -#: builtin/describe.c:405 +#: builtin/describe.c:406 msgid "consider <n> most recent tags (default: 10)" -msgstr "betrachtet die jüngsten <n> Tags (Standard: 10)" +msgstr "die jüngsten <n> Tags betrachten (Standard: 10)" -#: builtin/describe.c:407 +#: builtin/describe.c:408 msgid "only consider tags matching <pattern>" -msgstr "betrachtet nur Tags die <Muster> entsprechen" +msgstr "nur Tags, die <Muster> entsprechen, betrachten" -#: builtin/describe.c:409 builtin/name-rev.c:318 +#: builtin/describe.c:410 builtin/name-rev.c:318 msgid "show abbreviated commit object as fallback" -msgstr "zeigt gekürztes Commit-Objekt, wenn sonst nichts zutrifft" +msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft" -#: builtin/describe.c:410 +#: builtin/describe.c:411 msgid "mark" msgstr "Kennzeichen" -#: builtin/describe.c:411 +#: builtin/describe.c:412 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -"fügt <Kennzeichen> bei geändertem Arbeitsverzeichnis hinzu (Standard: \"-" +"<Kennzeichen> bei geändertem Arbeitsverzeichnis hinzufügen (Standard: \"-" "dirty\")" -#: builtin/describe.c:429 +#: builtin/describe.c:430 msgid "--long is incompatible with --abbrev=0" msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel." -#: builtin/describe.c:455 +#: builtin/describe.c:456 msgid "No names found, cannot describe anything." msgstr "Keine Namen gefunden, kann nichts beschreiben." -#: builtin/describe.c:475 +#: builtin/describe.c:476 msgid "--dirty is incompatible with commit-ishes" msgstr "Die Option --dirty kann nicht mit Commits verwendet werden." -#: builtin/diff.c:85 +#: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s': keine reguläre Datei oder symbolischer Verweis" -#: builtin/diff.c:236 +#: builtin/diff.c:237 #, c-format msgid "invalid option: %s" msgstr "Ungültige Option: %s" -#: builtin/diff.c:357 +#: builtin/diff.c:358 msgid "Not a git repository" msgstr "Kein Git-Repository" -#: builtin/diff.c:400 +#: builtin/diff.c:401 #, c-format msgid "invalid object '%s' given." msgstr "Objekt '%s' ist ungültig." -#: builtin/diff.c:409 +#: builtin/diff.c:410 #, c-format msgid "more than two blobs given: '%s'" msgstr "Mehr als zwei Blobs angegeben: '%s'" -#: builtin/diff.c:416 +#: builtin/diff.c:417 #, c-format msgid "unhandled object '%s' given." msgstr "unbehandeltes Objekt '%s' angegeben" -#: builtin/fast-export.c:23 +#: builtin/fast-export.c:24 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:702 +#: builtin/fast-export.c:979 msgid "show progress after <n> objects" -msgstr "zeigt Fortschritt nach <n> Objekten an" +msgstr "Fortschritt nach <n> Objekten anzeigen" -#: builtin/fast-export.c:704 +#: builtin/fast-export.c:981 msgid "select handling of signed tags" -msgstr "wählt Behandlung von signierten Tags" +msgstr "Behandlung von signierten Tags wählen" -#: builtin/fast-export.c:707 +#: builtin/fast-export.c:984 msgid "select handling of tags that tag filtered objects" -msgstr "wählt Behandlung von Tags, die gefilterte Objekte markieren" +msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren" -#: builtin/fast-export.c:710 +#: builtin/fast-export.c:987 msgid "Dump marks to this file" -msgstr "Schreibt Kennzeichen in diese Datei" +msgstr "Kennzeichen in diese Datei schreiben" -#: builtin/fast-export.c:712 +#: builtin/fast-export.c:989 msgid "Import marks from this file" -msgstr "Importiert Kennzeichen von dieser Datei" +msgstr "Kennzeichen von dieser Datei importieren" -#: builtin/fast-export.c:714 +#: builtin/fast-export.c:991 msgid "Fake a tagger when tags lack one" -msgstr "erzeugt künstlich einen Tag-Ersteller, wenn das Tag keinen hat" +msgstr "künstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat" -#: builtin/fast-export.c:716 +#: builtin/fast-export.c:993 msgid "Output full tree for each commit" -msgstr "gibt für jeden Commit das gesamte Verzeichnis aus" +msgstr "für jeden Commit das gesamte Verzeichnis ausgeben" -#: builtin/fast-export.c:718 +#: builtin/fast-export.c:995 msgid "Use the done feature to terminate the stream" -msgstr "Benutzt die \"done\"-Funktion, um den Strom abzuschließen" +msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen" -#: builtin/fast-export.c:719 +#: builtin/fast-export.c:996 msgid "Skip output of blob data" -msgstr "Überspringt Ausgabe von Blob-Daten" +msgstr "Ausgabe von Blob-Daten überspringen" -#: builtin/fast-export.c:720 +#: builtin/fast-export.c:997 msgid "refspec" msgstr "Refspec" -#: builtin/fast-export.c:721 +#: builtin/fast-export.c:998 msgid "Apply refspec to exported refs" -msgstr "Wendet Refspec auf exportierte Referenzen an" +msgstr "Refspec auf exportierte Referenzen anwenden" + +#: builtin/fast-export.c:999 +msgid "anonymize output" +msgstr "Ausgabe anonymisieren" #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" @@ -5107,7 +5275,7 @@ msgstr "fordert von allen Remote-Repositories an" #: builtin/fetch.c:92 msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "hängt an .git/FETCH_HEAD an, anstatt zu überschreiben" +msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben" #: builtin/fetch.c:94 msgid "path to upload pack on remote end" @@ -5115,24 +5283,24 @@ msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" #: builtin/fetch.c:95 msgid "force overwrite of local branch" -msgstr "erzwingt das Überschreiben von lokalen Branches" +msgstr "das Überschreiben von lokalen Branches erzwingen" #: builtin/fetch.c:97 msgid "fetch from multiple remotes" -msgstr "fordert von mehreren Remote-Repositories an" +msgstr "von mehreren Remote-Repositories anfordern" #: builtin/fetch.c:99 msgid "fetch all tags and associated objects" -msgstr "fordert alle Tags und verbundene Objekte an" +msgstr "alle Tags und verbundene Objekte anfordern" #: builtin/fetch.c:101 msgid "do not fetch all tags (--no-tags)" -msgstr "fordert nicht alle Tags an (--no-tags)" +msgstr "nicht alle Tags anfordern (--no-tags)" #: builtin/fetch.c:103 msgid "prune remote-tracking branches no longer on remote" msgstr "" -"entfernt Remote-Tracking-Branches, die sich nicht mehr im Remote-Repository " +"Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository " "befinden" #: builtin/fetch.c:104 @@ -5141,32 +5309,32 @@ msgstr "bei-Bedarf" #: builtin/fetch.c:105 msgid "control recursive fetching of submodules" -msgstr "kontrolliert rekursive Anforderungen von Submodulen" +msgstr "rekursive Anforderungen von Submodulen kontrollieren" #: builtin/fetch.c:109 msgid "keep downloaded pack" -msgstr "behält heruntergeladenes Paket" +msgstr "heruntergeladenes Paket behalten" #: builtin/fetch.c:111 msgid "allow updating of HEAD ref" -msgstr "erlaubt Aktualisierung der \"HEAD\"-Referenz" +msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben" #: builtin/fetch.c:114 msgid "deepen history of shallow clone" msgstr "" -"vertieft die Historie eines Klons mit unvollständiger Historie (shallow)" +"die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen" #: builtin/fetch.c:116 msgid "convert to a complete repository" -msgstr "konvertiert zu einem vollständigen Repository" +msgstr "zu einem vollständigen Repository konvertieren" -#: builtin/fetch.c:118 builtin/log.c:1205 +#: builtin/fetch.c:118 builtin/log.c:1208 msgid "dir" msgstr "Verzeichnis" #: builtin/fetch.c:119 msgid "prepend this to submodule path output" -msgstr "stellt dies an die Ausgabe der Submodul-Pfade voran" +msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen" #: builtin/fetch.c:122 msgid "default mode for recursion" @@ -5174,7 +5342,7 @@ msgstr "Standard-Modus für Rekursion" #: builtin/fetch.c:124 msgid "accept refs that update .git/shallow" -msgstr "akzeptiert Referenzen die .git/shallow aktualisieren" +msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren" #: builtin/fetch.c:125 msgid "refmap" @@ -5182,86 +5350,86 @@ msgstr "Refmap" #: builtin/fetch.c:126 msgid "specify fetch refmap" -msgstr "Angabe der Refmap für 'fetch'" +msgstr "Refmap für 'fetch' angeben" #: builtin/fetch.c:376 msgid "Couldn't find remote ref HEAD" msgstr "Konnte Remote-Referenz von HEAD nicht finden." -#: builtin/fetch.c:440 +#: builtin/fetch.c:454 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" -#: builtin/fetch.c:445 +#: builtin/fetch.c:459 msgid "[up to date]" msgstr "[aktuell]" -#: builtin/fetch.c:459 +#: builtin/fetch.c:473 #, 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:460 builtin/fetch.c:546 +#: builtin/fetch.c:474 builtin/fetch.c:560 msgid "[rejected]" msgstr "[zurückgewiesen]" -#: builtin/fetch.c:471 +#: builtin/fetch.c:485 msgid "[tag update]" msgstr "[Tag Aktualisierung]" -#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526 +#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 msgid " (unable to update local ref)" msgstr " (kann lokale Referenz nicht aktualisieren)" -#: builtin/fetch.c:491 +#: builtin/fetch.c:505 msgid "[new tag]" msgstr "[neues Tag]" -#: builtin/fetch.c:494 +#: builtin/fetch.c:508 msgid "[new branch]" msgstr "[neuer Branch]" -#: builtin/fetch.c:497 +#: builtin/fetch.c:511 msgid "[new ref]" msgstr "[neue Referenz]" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "unable to update local ref" msgstr "kann lokale Referenz nicht aktualisieren" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "forced update" msgstr "Aktualisierung erzwungen" -#: builtin/fetch.c:548 +#: builtin/fetch.c:562 msgid "(non-fast-forward)" msgstr "(kein Vorspulen)" -#: builtin/fetch.c:581 builtin/fetch.c:814 +#: builtin/fetch.c:595 builtin/fetch.c:828 #, c-format msgid "cannot open %s: %s\n" msgstr "kann %s nicht öffnen: %s\n" -#: builtin/fetch.c:590 +#: builtin/fetch.c:604 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" -#: builtin/fetch.c:608 +#: builtin/fetch.c:622 #, 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:696 builtin/fetch.c:779 +#: builtin/fetch.c:710 builtin/fetch.c:793 #, c-format msgid "From %.*s\n" msgstr "Von %.*s\n" -#: builtin/fetch.c:707 +#: builtin/fetch.c:721 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5270,57 +5438,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:759 +#: builtin/fetch.c:773 #, c-format msgid " (%s will become dangling)" msgstr " (%s wird unreferenziert)" -#: builtin/fetch.c:760 +#: builtin/fetch.c:774 #, c-format msgid " (%s has become dangling)" msgstr " (%s wurde unreferenziert)" -#: builtin/fetch.c:784 +#: builtin/fetch.c:798 msgid "[deleted]" msgstr "[gelöscht]" -#: builtin/fetch.c:785 builtin/remote.c:1059 +#: builtin/fetch.c:799 builtin/remote.c:1063 msgid "(none)" msgstr "(nichts)" -#: builtin/fetch.c:804 +#: builtin/fetch.c:818 #, 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:823 +#: builtin/fetch.c:837 #, 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:826 +#: builtin/fetch.c:840 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Option \"%s\" wird ignoriert für %s\n" -#: builtin/fetch.c:882 +#: builtin/fetch.c:896 #, c-format msgid "Don't know how to fetch from %s" msgstr "Weiß nicht wie von %s angefordert wird." -#: builtin/fetch.c:1044 +#: builtin/fetch.c:1058 #, c-format msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:1046 builtin/remote.c:90 +#: builtin/fetch.c:1060 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" -#: builtin/fetch.c:1064 +#: builtin/fetch.c:1078 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5329,35 +5497,35 @@ msgstr "" "oder den Namen des Remote-Repositories an, von welchem neue\n" "Commits angefordert werden sollen." -#: builtin/fetch.c:1087 +#: builtin/fetch.c:1101 msgid "You need to specify a tag name." msgstr "Sie müssen den Namen des Tags angeben." -#: builtin/fetch.c:1131 +#: builtin/fetch.c:1143 msgid "--depth and --unshallow cannot be used together" msgstr "" "Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden." -#: builtin/fetch.c:1133 +#: builtin/fetch.c:1145 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:1156 +#: builtin/fetch.c:1168 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Repository als Argument" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1170 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kann nicht mit Refspecs verwendet werden." -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1181 #, c-format msgid "No such remote or remote group: %s" msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1189 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" @@ -5369,15 +5537,15 @@ msgstr "" "git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>]|--no-log] [--file <Datei>]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698 -#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589 +#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590 #: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "Anzahl" #: builtin/fmt-merge-msg.c:664 msgid "populate log with at most <n> entries from shortlog" -msgstr "fügt Historie mit höchstens <n> Einträgen von \"shortlog\" hinzu" +msgstr "Historie mit höchstens <n> Einträgen von \"shortlog\" hinzufügen" #: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" @@ -5389,105 +5557,109 @@ msgstr "Text" #: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" -msgstr "verwendet <Text> als Beschreibungsanfang" +msgstr "<Text> als Beschreibungsanfang verwenden" #: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "Datei zum Einlesen" -#: builtin/for-each-ref.c:1051 +#: builtin/for-each-ref.c:676 +msgid "unable to parse format" +msgstr "Konnte Format nicht parsen." + +#: builtin/for-each-ref.c:1057 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [Optionen] [<Muster>]" -#: builtin/for-each-ref.c:1066 +#: builtin/for-each-ref.c:1072 msgid "quote placeholders suitably for shells" -msgstr "formatiert Platzhalter als Shell-String" +msgstr "Platzhalter als Shell-String formatieren" -#: builtin/for-each-ref.c:1068 +#: builtin/for-each-ref.c:1074 msgid "quote placeholders suitably for perl" -msgstr "formatiert Platzhalter als Perl-String" +msgstr "Platzhalter als Perl-String formatieren" -#: builtin/for-each-ref.c:1070 +#: builtin/for-each-ref.c:1076 msgid "quote placeholders suitably for python" -msgstr "formatiert Platzhalter als Python-String" +msgstr "Platzhalter als Python-String formatieren" -#: builtin/for-each-ref.c:1072 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for tcl" -msgstr "formatiert Platzhalter als TCL-String" +msgstr "Platzhalter als Tcl-String formatieren" -#: builtin/for-each-ref.c:1075 +#: builtin/for-each-ref.c:1081 msgid "show only <n> matched refs" -msgstr "zeigt nur <n> passende Referenzen" +msgstr "nur <n> passende Referenzen anzeigen" -#: builtin/for-each-ref.c:1076 builtin/replace.c:435 +#: builtin/for-each-ref.c:1082 builtin/replace.c:438 msgid "format" msgstr "Format" -#: builtin/for-each-ref.c:1076 +#: builtin/for-each-ref.c:1082 msgid "format to use for the output" msgstr "für die Ausgabe zu verwendendes Format" -#: builtin/for-each-ref.c:1077 +#: builtin/for-each-ref.c:1083 msgid "key" msgstr "Schüssel" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1084 msgid "field name to sort on" msgstr "sortiere nach diesem Feld" -#: builtin/fsck.c:147 builtin/prune.c:172 +#: builtin/fsck.c:147 builtin/prune.c:136 msgid "Checking connectivity" msgstr "Prüfe Konnektivität" -#: builtin/fsck.c:538 +#: builtin/fsck.c:540 msgid "Checking object directories" msgstr "Prüfe Objekt-Verzeichnisse" -#: builtin/fsck.c:601 +#: builtin/fsck.c:603 msgid "git fsck [options] [<object>...]" msgstr "git fsck [Optionen] [<Objekt>...]" -#: builtin/fsck.c:607 +#: builtin/fsck.c:609 msgid "show unreachable objects" -msgstr "zeigt unerreichbare Objekte" +msgstr "unerreichbare Objekte anzeigen" -#: builtin/fsck.c:608 +#: builtin/fsck.c:610 msgid "show dangling objects" -msgstr "zeigt unreferenzierte Objekte" +msgstr "unreferenzierte Objekte anzeigen" -#: builtin/fsck.c:609 +#: builtin/fsck.c:611 msgid "report tags" -msgstr "meldet Tags" +msgstr "Tags melden" -#: builtin/fsck.c:610 +#: builtin/fsck.c:612 msgid "report root nodes" -msgstr "meldet Hauptwurzeln" +msgstr "Hauptwurzeln melden" -#: builtin/fsck.c:611 +#: builtin/fsck.c:613 msgid "make index objects head nodes" -msgstr "prüft Objekte in der Staging-Area" +msgstr "Objekte in der Staging-Area prüfen" -#: builtin/fsck.c:612 +#: builtin/fsck.c:614 msgid "make reflogs head nodes (default)" -msgstr "prüft die Reflogs (Standard)" +msgstr "die Reflogs prüfen (Standard)" -#: builtin/fsck.c:613 +#: builtin/fsck.c:615 msgid "also consider packs and alternate objects" -msgstr "" +msgstr "ebenso Pakete und alternative Objekte betrachten" -#: builtin/fsck.c:614 +#: builtin/fsck.c:616 msgid "enable more strict checking" -msgstr "aktiviert genauere Prüfung" +msgstr "genauere Prüfung aktivieren" -#: builtin/fsck.c:616 +#: builtin/fsck.c:618 msgid "write dangling objects in .git/lost-found" -msgstr "schreibt unreferenzierte Objekte nach .git/lost-found" +msgstr "unreferenzierte Objekte nach .git/lost-found schreiben" -#: builtin/fsck.c:617 builtin/prune.c:144 +#: builtin/fsck.c:619 builtin/prune.c:108 msgid "show progress" -msgstr "zeigt Fortschrittsanzeige" +msgstr "Fortschrittsanzeige anzeigen" -#: builtin/fsck.c:667 +#: builtin/fsck.c:669 msgid "Checking objects" msgstr "Prüfe Objekte" @@ -5495,54 +5667,54 @@ msgstr "Prüfe Objekte" msgid "git gc [options]" msgstr "git gc [Optionen]" -#: builtin/gc.c:91 +#: builtin/gc.c:79 #, c-format -msgid "Invalid %s: '%s'" -msgstr "Ungültiger %s: '%s'" +msgid "Invalid gc.pruneexpire: '%s'" +msgstr "Ungültiges Wert für \"gc.pruneexpire\": '%s'" -#: builtin/gc.c:118 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "zu langes Objekt-Verzeichnis %.*s" -#: builtin/gc.c:287 +#: builtin/gc.c:276 msgid "prune unreferenced objects" -msgstr "entfernt unreferenzierte Objekte" +msgstr "unreferenzierte Objekte entfernen" -#: builtin/gc.c:289 +#: builtin/gc.c:278 msgid "be more thorough (increased runtime)" msgstr "mehr Gründlichkeit (erhöht Laufzeit)" -#: builtin/gc.c:290 +#: builtin/gc.c:279 msgid "enable auto-gc mode" -msgstr "aktiviert \"auto-gc\" Modus" +msgstr "\"auto-gc\" Modus aktivieren" -#: builtin/gc.c:291 +#: builtin/gc.c:280 msgid "force running gc even if there may be another gc running" msgstr "" -"erzwingt Ausführung von \"git gc\" selbst wenn ein anderes\n" +"Ausführung von \"git gc\" erwzingen, selbst wenn ein anderes\n" "\"git gc\" bereits ausgeführt wird" -#: builtin/gc.c:332 +#: builtin/gc.c:321 #, 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:334 +#: builtin/gc.c:323 #, 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:335 +#: builtin/gc.c:324 #, 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:353 +#: builtin/gc.c:342 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5550,7 +5722,7 @@ msgstr "" "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n" "(benutzen Sie --force falls nicht)" -#: builtin/gc.c:375 +#: builtin/gc.c:364 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5588,83 +5760,83 @@ msgstr "kann '%s' nicht öffnen" #: builtin/grep.c:638 msgid "search in index instead of in the work tree" -msgstr "sucht in der Staging-Area anstatt im Arbeitsverzeichnis" +msgstr "in der Staging-Area anstatt im Arbeitsverzeichnis suchen" #: builtin/grep.c:640 msgid "find in contents not managed by git" -msgstr "findet auch in Inhalten, die nicht von Git verwaltet werden" +msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden" #: builtin/grep.c:642 msgid "search in both tracked and untracked files" -msgstr "sucht in beobachteten und unbeobachteten Dateien" +msgstr "in beobachteten und unbeobachteten Dateien suchen" #: builtin/grep.c:644 msgid "search also in ignored files" -msgstr "sucht auch in ignorierten Dateien" +msgstr "auch in ignorierten Dateien suchen" #: builtin/grep.c:647 msgid "show non-matching lines" -msgstr "zeigt Zeilen ohne Übereinstimmungen" +msgstr "Zeilen ohne Übereinstimmungen anzeigen" #: builtin/grep.c:649 msgid "case insensitive matching" -msgstr "findet Übereinstimmungen unabhängig von Groß- und Kleinschreibung" +msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden" #: builtin/grep.c:651 msgid "match patterns only at word boundaries" -msgstr "sucht nur ganze Wörter" +msgstr "nur ganze Wörter suchen" #: builtin/grep.c:653 msgid "process binary files as text" -msgstr "verarbeitet binäre Dateien als Text" +msgstr "binäre Dateien als Text verarbeiten" #: builtin/grep.c:655 msgid "don't match patterns in binary files" -msgstr "findet keine Muster in Binärdateien" +msgstr "keine Muster in Binärdateien finden" #: builtin/grep.c:658 msgid "process binary files with textconv filters" -msgstr "verarbeitet binäre Dateien mit \"textconv\"-Filtern" +msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten" #: builtin/grep.c:660 msgid "descend at most <depth> levels" -msgstr "durchläuft höchstens <Tiefe> Ebenen" +msgstr "höchstens <Tiefe> Ebenen durchlaufen" #: builtin/grep.c:664 msgid "use extended POSIX regular expressions" -msgstr "verwendet erweiterte reguläre Ausdrücke aus POSIX" +msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden" #: builtin/grep.c:667 msgid "use basic POSIX regular expressions (default)" -msgstr "verwendet grundlegende reguläre Ausdrücke aus POSIX (Standard)" +msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)" #: builtin/grep.c:670 msgid "interpret patterns as fixed strings" -msgstr "interpretiert Muster als feste Zeichenketten" +msgstr "Muster als feste Zeichenketten interpretieren" #: builtin/grep.c:673 msgid "use Perl-compatible regular expressions" -msgstr "verwendet Perl-kompatible reguläre Ausdrücke" +msgstr "Perl-kompatible reguläre Ausdrücke verwenden" #: builtin/grep.c:676 msgid "show line numbers" -msgstr "zeigt Zeilennummern" +msgstr "Zeilennummern anzeigen" #: builtin/grep.c:677 msgid "don't show filenames" -msgstr "zeigt keine Dateinamen" +msgstr "keine Dateinamen anzeigen" #: builtin/grep.c:678 msgid "show filenames" -msgstr "zeigt Dateinamen" +msgstr "Dateinamen anzeigen" #: builtin/grep.c:680 msgid "show filenames relative to top directory" -msgstr "zeigt Dateinamen relativ zum Projektverzeichnis" +msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen" #: builtin/grep.c:682 msgid "show only filenames instead of matching lines" -msgstr "zeigt nur Dateinamen anstatt übereinstimmende Zeilen" +msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen" #: builtin/grep.c:684 msgid "synonym for --files-with-matches" @@ -5672,42 +5844,42 @@ msgstr "Synonym für --files-with-matches" #: builtin/grep.c:687 msgid "show only the names of files without match" -msgstr "zeigt nur die Dateinamen ohne Übereinstimmungen" +msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen" #: builtin/grep.c:689 msgid "print NUL after filenames" -msgstr "gibt NUL-Zeichen nach Dateinamen aus" +msgstr "NUL-Zeichen nach Dateinamen ausgeben" #: builtin/grep.c:691 msgid "show the number of matches instead of matching lines" -msgstr "zeigt, anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen" +msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen" #: builtin/grep.c:692 msgid "highlight matches" -msgstr "hebt Übereinstimmungen hervor" +msgstr "Übereinstimmungen hervorheben" #: builtin/grep.c:694 msgid "print empty line between matches from different files" msgstr "" -"gibt eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien aus" +"eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben" #: builtin/grep.c:696 msgid "show filename only once above matches from same file" msgstr "" -"zeigt den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser " -"Datei an" +"den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser Datei " +"anzeigen" #: builtin/grep.c:699 msgid "show <n> context lines before and after matches" -msgstr "zeigt <n> Zeilen vor und nach den Übereinstimmungen an" +msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen" #: builtin/grep.c:702 msgid "show <n> context lines before matches" -msgstr "zeigt <n> Zeilen vor den Übereinstimmungen an" +msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen" #: builtin/grep.c:704 msgid "show <n> context lines after matches" -msgstr "zeigt <n> Zeilen nach den Übereinstimmungen an" +msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen" #: builtin/grep.c:705 msgid "shortcut for -C NUM" @@ -5715,35 +5887,36 @@ msgstr "Kurzform für -C NUM" #: builtin/grep.c:708 msgid "show a line with the function name before matches" -msgstr "zeigt eine Zeile mit dem Funktionsnamen vor Übereinstimmungen an" +msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen" #: builtin/grep.c:710 msgid "show the surrounding function" -msgstr "zeigt die umgebende Funktion an" +msgstr "die umgebende Funktion anzeigen" #: builtin/grep.c:713 msgid "read patterns from file" -msgstr "liest Muster von einer Datei" +msgstr "Muster von einer Datei lesen" #: builtin/grep.c:715 msgid "match <pattern>" -msgstr "findet <Muster>" +msgstr "<Muster> finden" #: builtin/grep.c:717 msgid "combine patterns specified with -e" -msgstr "kombiniert Muster, die mit -e angegeben wurden" +msgstr "Muster kombinieren, die mit -e angegeben wurden" #: builtin/grep.c:729 msgid "indicate hit with exit status without output" -msgstr "zeigt Übereinstimmungen nur durch Beendigungsstatus an" +msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen" #: builtin/grep.c:731 msgid "show only matches from files that match all patterns" -msgstr "zeigt nur Übereinstimmungen von Dateien, die allen Mustern entsprechen" +msgstr "" +"nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen" #: builtin/grep.c:733 msgid "show parse tree for grep expression" -msgstr "zeigt geparstes Verzeichnis für \"grep\"-Ausdruck" +msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen" #: builtin/grep.c:737 msgid "pager" @@ -5751,15 +5924,15 @@ msgstr "Anzeigeprogramm" #: builtin/grep.c:737 msgid "show matching files in the pager" -msgstr "zeigt Dateien mit Übereinstimmungen im Anzeigeprogramm" +msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen" #: builtin/grep.c:740 msgid "allow calling of grep(1) (ignored by this build)" -msgstr "erlaubt den Aufruf von grep(1) (von dieser Programmversion ignoriert)" +msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)" #: builtin/grep.c:741 builtin/show-ref.c:187 msgid "show usage" -msgstr "zeigt Verwendung" +msgstr "Verwendung anzeigen" #: builtin/grep.c:808 msgid "no pattern given." @@ -5793,7 +5966,7 @@ msgstr "" msgid "both --cached and trees are given." msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden." -#: builtin/hash-object.c:60 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." @@ -5801,53 +5974,60 @@ msgstr "" "git hash-object [-t <Art>] [-w] [--path=<Datei>|--no-filters] [--stdin] [--] " "<Datei>..." -#: builtin/hash-object.c:61 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <Liste-von-Pfaden>" -#: builtin/hash-object.c:72 builtin/tag.c:609 +#: builtin/hash-object.c:94 builtin/tag.c:610 msgid "type" msgstr "Art" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:94 msgid "object type" msgstr "Art des Objektes" -#: builtin/hash-object.c:73 +#: builtin/hash-object.c:95 msgid "write the object into the object database" -msgstr "schreibt das Objekt in die Objektdatenbank" +msgstr "das Objekt in die Objektdatenbank schreiben" -#: builtin/hash-object.c:74 +#: builtin/hash-object.c:97 msgid "read the object from stdin" -msgstr "liest das Objekt von der Standard-Eingabe" +msgstr "das Objekt von der Standard-Eingabe lesen" -#: builtin/hash-object.c:76 +#: builtin/hash-object.c:99 msgid "store file as is without filters" -msgstr "speichert Datei wie sie ist, ohne Filter" +msgstr "Datei wie sie ist speichern, ohne Filter" -#: builtin/hash-object.c:77 +#: builtin/hash-object.c:100 +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 msgid "process file as it were from this path" -msgstr "verarbeitet Datei, als ob sie von diesem Pfad wäre" +msgstr "Datei verarbeiten, als ob sie von diesem Pfad wäre" #: builtin/help.c:41 msgid "print all available commands" -msgstr "Anzeige aller vorhandenen Kommandos" +msgstr "alle vorhandenen Kommandos anzeigen" #: builtin/help.c:42 msgid "print list of useful guides" -msgstr "zeigt Liste von allgemein verwendeten Anleitungen" +msgstr "Liste von allgemein verwendeten Anleitungen anzeigen" #: builtin/help.c:43 msgid "show man page" -msgstr "zeigt Handbuch" +msgstr "Handbuch anzeigen" #: builtin/help.c:44 msgid "show manual in web browser" -msgstr "zeigt Handbuch in einem Webbrowser" +msgstr "Handbuch in einem Webbrowser anzeigen" #: builtin/help.c:46 msgid "show info page" -msgstr "zeigt Info-Seite" +msgstr "Info-Seite anzeigen" #: builtin/help.c:52 msgid "git help [--all] [--guides] [--man|--web|--info] [command]" @@ -5858,25 +6038,25 @@ msgstr "git help [--all] [--guides] [--man|--web|--info] [Kommando]" msgid "unrecognized help format '%s'" msgstr "nicht erkanntes Hilfeformat: %s" -#: builtin/help.c:92 +#: builtin/help.c:91 msgid "Failed to start emacsclient." msgstr "Konnte emacsclient nicht starten." -#: builtin/help.c:105 +#: builtin/help.c:104 msgid "Failed to parse emacsclient version." msgstr "Konnte Version des emacsclient nicht parsen." -#: builtin/help.c:113 +#: builtin/help.c:112 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "Version des emacsclient '%d' ist zu alt (< 22)." -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 #, c-format msgid "failed to exec '%s': %s" msgstr "Fehler beim Ausführen von '%s': %s" -#: builtin/help.c:216 +#: builtin/help.c:215 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -5885,7 +6065,7 @@ msgstr "" "'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n" "Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen." -#: builtin/help.c:228 +#: builtin/help.c:227 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -5894,23 +6074,27 @@ msgstr "" "'%s': Kommando für unterstützten Handbuchbetrachter.\n" "Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen." -#: builtin/help.c:353 +#: builtin/help.c:352 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': unbekannter Handbuch-Betrachter." -#: builtin/help.c:370 +#: builtin/help.c:369 msgid "no man viewer handled the request" msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:378 +#: builtin/help.c:377 msgid "no info viewer handled the request" msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:424 +#: builtin/help.c:423 msgid "Defining attributes per path" msgstr "Definition von Attributen pro Pfad" +#: builtin/help.c:424 +msgid "Everyday Git With 20 Commands Or So" +msgstr "Tägliche Benutzung von Git mit ungefähr 20 Kommandos" + #: builtin/help.c:425 msgid "A Git glossary" msgstr "Ein Git-Glossar" @@ -5949,292 +6133,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:145 +#: builtin/index-pack.c:150 #, c-format msgid "unable to open %s" msgstr "kann %s nicht öffnen" -#: builtin/index-pack.c:191 +#: builtin/index-pack.c:200 #, c-format msgid "object type mismatch at %s" msgstr "Objekt-Typen passen bei %s nicht zusammen" -#: builtin/index-pack.c:211 +#: builtin/index-pack.c:220 #, c-format msgid "did not receive expected object %s" msgstr "konnte erwartetes Objekt %s nicht empfangen" -#: builtin/index-pack.c:214 +#: builtin/index-pack.c:223 #, c-format msgid "object %s: expected type %s, found %s" msgstr "Objekt %s: erwarteter Typ %s, %s gefunden" -#: builtin/index-pack.c:256 +#: builtin/index-pack.c:265 #, 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:266 +#: builtin/index-pack.c:275 msgid "early EOF" msgstr "zu frühes Dateiende" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:276 msgid "read error on input" msgstr "Fehler beim Lesen der Eingabe" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:288 msgid "used more bytes than were available" msgstr "verwendete mehr Bytes als verfügbar waren" -#: builtin/index-pack.c:286 +#: builtin/index-pack.c:295 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:302 +#: builtin/index-pack.c:311 #, c-format msgid "unable to create '%s'" msgstr "konnte '%s' nicht erstellen" -#: builtin/index-pack.c:307 +#: builtin/index-pack.c:316 #, c-format msgid "cannot open packfile '%s'" msgstr "Kann Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:321 +#: builtin/index-pack.c:330 msgid "pack signature mismatch" msgstr "Paketsignatur stimmt nicht überein" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:332 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "Paketversion %<PRIu32> nicht unterstützt" -#: builtin/index-pack.c:341 +#: builtin/index-pack.c:350 #, 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:462 +#: builtin/index-pack.c:471 #, c-format msgid "inflate returned %d" msgstr "Dekomprimierung gab %d zurück" -#: builtin/index-pack.c:511 +#: builtin/index-pack.c:520 msgid "offset value overflow for delta base object" msgstr "Wert für Versatz bei Differenzobjekt übergelaufen" -#: builtin/index-pack.c:519 +#: builtin/index-pack.c:528 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:527 +#: builtin/index-pack.c:536 #, c-format msgid "unknown object type %d" msgstr "Unbekannter Objekt-Typ %d" -#: builtin/index-pack.c:558 +#: builtin/index-pack.c:567 msgid "cannot pread pack file" msgstr "Kann Paketdatei %s nicht lesen" -#: builtin/index-pack.c:560 +#: builtin/index-pack.c:569 #, 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:586 +#: builtin/index-pack.c:595 msgid "serious inflate inconsistency" msgstr "ernsthafte Inkonsistenz nach Dekomprimierung" -#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706 -#: builtin/index-pack.c:740 builtin/index-pack.c:749 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !" -#: builtin/index-pack.c:680 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:689 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "kann %s nicht lesen" -#: builtin/index-pack.c:746 +#: builtin/index-pack.c:755 #, c-format msgid "cannot read existing object %s" msgstr "Kann existierendes Objekt %s nicht lesen." -#: builtin/index-pack.c:760 +#: builtin/index-pack.c:769 #, c-format msgid "invalid blob object %s" msgstr "ungültiges Blob-Objekt %s" -#: builtin/index-pack.c:774 +#: builtin/index-pack.c:783 #, c-format msgid "invalid %s" msgstr "Ungültiger Objekt-Typ %s" -#: builtin/index-pack.c:777 +#: builtin/index-pack.c:787 msgid "Error in object" msgstr "Fehler in Objekt" -#: builtin/index-pack.c:779 +#: builtin/index-pack.c:789 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Nicht alle Kind-Objekte von %s sind erreichbar" -#: builtin/index-pack.c:851 builtin/index-pack.c:881 +#: builtin/index-pack.c:861 builtin/index-pack.c:890 msgid "failed to apply delta" msgstr "Konnte Dateiunterschied nicht anwenden" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Receiving objects" msgstr "Empfange Objekte" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Indexing objects" msgstr "Indiziere Objekte" -#: builtin/index-pack.c:1048 +#: builtin/index-pack.c:1081 msgid "pack is corrupted (SHA1 mismatch)" msgstr "Paket ist beschädigt (SHA1 unterschiedlich)" -#: builtin/index-pack.c:1053 +#: builtin/index-pack.c:1086 msgid "cannot fstat packfile" msgstr "kann Paketdatei nicht lesen" -#: builtin/index-pack.c:1056 +#: builtin/index-pack.c:1089 msgid "pack has junk at the end" msgstr "Paketende enthält nicht verwendbaren Inhalt" -#: builtin/index-pack.c:1067 +#: builtin/index-pack.c:1100 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "Fehler beim Ausführen von \"parse_pack_objects()\"" -#: builtin/index-pack.c:1090 +#: builtin/index-pack.c:1123 msgid "Resolving deltas" msgstr "Löse Unterschiede auf" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1133 #, c-format msgid "unable to create thread: %s" msgstr "kann Thread nicht erzeugen: %s" -#: builtin/index-pack.c:1142 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity" msgstr "Fehler beim Auflösen der Unterschiede" -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1181 #, c-format msgid "completed with %d local objects" msgstr "abgeschlossen mit %d lokalen Objekten" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1191 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)" -#: builtin/index-pack.c:1164 +#: builtin/index-pack.c:1195 #, 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:1189 +#: builtin/index-pack.c:1220 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1299 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschädigt" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1323 msgid "error while closing pack file" msgstr "Fehler beim Schließen der Paketdatei" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1336 #, c-format msgid "cannot write keep file '%s'" msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben" -#: builtin/index-pack.c:1313 +#: builtin/index-pack.c:1344 #, c-format msgid "cannot close written keep file '%s'" msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen" -#: builtin/index-pack.c:1326 +#: builtin/index-pack.c:1357 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1337 +#: builtin/index-pack.c:1368 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1370 +#: builtin/index-pack.c:1401 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig" -#: builtin/index-pack.c:1376 +#: builtin/index-pack.c:1407 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ungültige Anzahl von Threads angegeben (%d)" -#: builtin/index-pack.c:1380 builtin/index-pack.c:1559 +#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 #, c-format msgid "no threads support, ignoring %s" msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1469 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1471 #, 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:1487 +#: builtin/index-pack.c:1518 #, 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:1494 +#: builtin/index-pack.c:1525 #, 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:1523 +#: builtin/index-pack.c:1554 msgid "Cannot come back to cwd" msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln" -#: builtin/index-pack.c:1571 builtin/index-pack.c:1574 -#: builtin/index-pack.c:1586 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 +#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 #, c-format msgid "bad %s" msgstr "%s ist ungültig" -#: builtin/index-pack.c:1604 +#: builtin/index-pack.c:1635 msgid "--fix-thin cannot be used without --stdin" msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." -#: builtin/index-pack.c:1608 builtin/index-pack.c:1617 +#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" -#: builtin/index-pack.c:1625 +#: builtin/index-pack.c:1656 msgid "--verify with no packfile name given" msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." @@ -6343,11 +6527,7 @@ msgstr "Initialisierte leeres" msgid " shared" msgstr " gemeinsames" -#: builtin/init-db.c:439 -msgid "cannot tell cwd" -msgstr "kann aktuelles Arbeitsverzeichnis nicht ermitteln" - -#: builtin/init-db.c:465 +#: builtin/init-db.c:467 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [directory]" @@ -6355,29 +6535,29 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--" "shared[=<Berechtigungen>]] [Verzeichnis]" -#: builtin/init-db.c:488 +#: builtin/init-db.c:490 msgid "permissions" msgstr "Berechtigungen" -#: builtin/init-db.c:489 +#: builtin/init-db.c:491 msgid "specify that the git repository is to be shared amongst several users" -msgstr "gibt an, dass das Git-Repository mit mehreren Benutzern geteilt wird" +msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird" -#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172 +#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172 msgid "be quiet" msgstr "weniger Ausgaben" -#: builtin/init-db.c:523 builtin/init-db.c:528 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "kann Verzeichnis %s nicht erstellen" -#: builtin/init-db.c:532 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "kann nicht in Verzeichnis %s wechseln" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6386,15 +6566,31 @@ msgstr "" "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s " "(oder --git-dir=<Verzeichnis>)" -#: builtin/init-db.c:578 -msgid "Cannot access current working directory" -msgstr "Kann nicht auf aktuelles Arbeitsverzeichnis zugreifen." - -#: builtin/init-db.c:585 +#: builtin/init-db.c:583 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen." +#: builtin/interpret-trailers.c:15 +msgid "" +"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " +"[<file>...]" +msgstr "" +"git interpret-trailers [--trim-empty] [(--trailer <Token>[(=|:)<Wert>])...] " +"[<Datei>...]" + +#: builtin/interpret-trailers.c:25 +msgid "trim empty trailers" +msgstr "kürzt leere Anhänge" + +#: builtin/interpret-trailers.c:26 +msgid "trailer" +msgstr "Anhang" + +#: builtin/interpret-trailers.c:27 +msgid "trailer(s) to add" +msgstr "Anhang/Anhänge hinzufügen" + #: builtin/log.c:41 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "git log [<Optionen>] [Commitbereich>] [[--] <Pfad>...]\n" @@ -6403,258 +6599,272 @@ msgstr "git log [<Optionen>] [Commitbereich>] [[--] <Pfad>...]\n" msgid " or: git show [options] <object>..." msgstr " oder: git show [Optionen] <Objekt>..." +#: builtin/log.c:81 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "Ungültige Option für --decorate: %s" + #: builtin/log.c:127 msgid "suppress diff output" -msgstr "unterdrückt Ausgabe der Unterschiede" +msgstr "Ausgabe der Unterschiede unterdrücken" #: builtin/log.c:128 msgid "show source" -msgstr "zeigt Quelle" +msgstr "Quelle anzeigen" #: builtin/log.c:129 msgid "Use mail map file" -msgstr "verwendet \"mailmap\"-Datei" +msgstr "\"mailmap\"-Datei verwenden" #: builtin/log.c:130 msgid "decorate options" msgstr "decorate-Optionen" +#: builtin/log.c:133 +msgid "Process line range n,m in file, counting from 1" +msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1" + #: builtin/log.c:229 #, c-format msgid "Final output: %d %s\n" msgstr "letzte Ausgabe: %d %s\n" -#: builtin/log.c:470 builtin/log.c:562 +#: builtin/log.c:458 +#, c-format +msgid "git show %s: bad file" +msgstr "git show %s: ungültige Datei" + +#: builtin/log.c:472 builtin/log.c:564 #, c-format msgid "Could not read object %s" msgstr "Kann Objekt %s nicht lesen." -#: builtin/log.c:586 +#: builtin/log.c:588 #, c-format msgid "Unknown type: %d" msgstr "Unbekannter Typ: %d" -#: builtin/log.c:687 +#: builtin/log.c:689 msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:771 +#: builtin/log.c:773 msgid "name of output directory is too long" msgstr "Name des Ausgabeverzeichnisses ist zu lang." -#: builtin/log.c:787 +#: builtin/log.c:789 #, c-format msgid "Cannot open patch file %s" msgstr "Kann Patch-Datei %s nicht öffnen" -#: builtin/log.c:801 +#: builtin/log.c:803 msgid "Need exactly one range." msgstr "Brauche genau einen Commit-Bereich." -#: builtin/log.c:809 +#: builtin/log.c:811 msgid "Not a range." msgstr "Kein Commit-Bereich." -#: builtin/log.c:916 +#: builtin/log.c:919 msgid "Cover letter needs email format" msgstr "Anschreiben benötigt E-Mail-Format" -#: builtin/log.c:995 +#: builtin/log.c:998 #, c-format msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" -#: builtin/log.c:1023 +#: builtin/log.c:1026 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [Optionen] [<seit> | <Commitbereich>]" -#: builtin/log.c:1068 +#: builtin/log.c:1071 msgid "Two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1183 +#: builtin/log.c:1186 msgid "use [PATCH n/m] even with a single patch" -msgstr "verwendet [PATCH n/m] auch mit einzelnem Patch" +msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden" -#: builtin/log.c:1186 +#: builtin/log.c:1189 msgid "use [PATCH] even with multiple patches" -msgstr "verwendet [PATCH] auch mit mehreren Patches" +msgstr "[PATCH] auch mit mehreren Patches verwenden" -#: builtin/log.c:1190 +#: builtin/log.c:1193 msgid "print patches to standard out" msgstr "Ausgabe der Patches in Standard-Ausgabe" -#: builtin/log.c:1192 +#: builtin/log.c:1195 msgid "generate a cover letter" -msgstr "erzeugt ein Deckblatt" +msgstr "ein Deckblatt erzeugen" -#: builtin/log.c:1194 +#: builtin/log.c:1197 msgid "use simple number sequence for output file names" -msgstr "verwendet einfache Nummernfolge für die Namen der Ausgabedateien" +msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden" -#: builtin/log.c:1195 +#: builtin/log.c:1198 msgid "sfx" msgstr "Dateiendung" -#: builtin/log.c:1196 +#: builtin/log.c:1199 msgid "use <sfx> instead of '.patch'" -msgstr "verwendet <Dateiendung> anstatt '.patch'" +msgstr "<Dateiendung> anstatt '.patch' verwenden" -#: builtin/log.c:1198 +#: builtin/log.c:1201 msgid "start numbering patches at <n> instead of 1" -msgstr "beginnt die Nummerierung der Patches bei <n> anstatt bei 1" +msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen" -#: builtin/log.c:1200 +#: builtin/log.c:1203 msgid "mark the series as Nth re-roll" -msgstr "kennzeichnet die Serie als n-te Fassung" +msgstr "die Serie als n-te Fassung kennzeichnen" -#: builtin/log.c:1202 +#: builtin/log.c:1205 msgid "Use [<prefix>] instead of [PATCH]" -msgstr "verwendet [<Präfix>] anstatt [PATCH]" +msgstr "[<Präfix>] anstatt [PATCH] verwenden" -#: builtin/log.c:1205 +#: builtin/log.c:1208 msgid "store resulting files in <dir>" -msgstr "speichert erzeugte Dateien in <Verzeichnis>" +msgstr "erzeugte Dateien in <Verzeichnis> speichern" -#: builtin/log.c:1208 +#: builtin/log.c:1211 msgid "don't strip/add [PATCH]" -msgstr "[PATCH] wird nicht entfernt/hinzugefügt" +msgstr "[PATCH] nicht entfernen/hinzufügen" -#: builtin/log.c:1211 +#: builtin/log.c:1214 msgid "don't output binary diffs" -msgstr "gibt keine binären Unterschiede aus" +msgstr "keine binären Unterschiede ausgeben" -#: builtin/log.c:1213 +#: builtin/log.c:1216 msgid "don't include a patch matching a commit upstream" msgstr "" -"schließt keine Patches ein, die einem Commit im Upstream-Branch entsprechen" +"keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen" -#: builtin/log.c:1215 +#: builtin/log.c:1218 msgid "show patch format instead of default (patch + stat)" -msgstr "zeigt Patchformat anstatt des Standards (Patch + Zusammenfassung)" +msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)" -#: builtin/log.c:1217 +#: builtin/log.c:1220 msgid "Messaging" msgstr "E-Mail-Einstellungen" -#: builtin/log.c:1218 +#: builtin/log.c:1221 msgid "header" msgstr "Header" -#: builtin/log.c:1219 +#: builtin/log.c:1222 msgid "add email header" -msgstr "fügt E-Mail-Header hinzu" +msgstr "E-Mail-Header hinzufügen" -#: builtin/log.c:1220 builtin/log.c:1222 +#: builtin/log.c:1223 builtin/log.c:1225 msgid "email" msgstr "E-Mail" -#: builtin/log.c:1220 +#: builtin/log.c:1223 msgid "add To: header" -msgstr "fügt \"To:\"-Header hinzu" +msgstr "\"To:\"-Header hinzufügen" -#: builtin/log.c:1222 +#: builtin/log.c:1225 msgid "add Cc: header" -msgstr "fügt \"Cc:\"-Header hinzu" +msgstr "\"Cc:\"-Header hinzufügen" -#: builtin/log.c:1224 +#: builtin/log.c:1227 msgid "ident" msgstr "Ident" -#: builtin/log.c:1225 +#: builtin/log.c:1228 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -"setzt \"From\"-Adresse auf <Ident> (oder Ident des Commit-Erstellers,wenn " +"\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn " "fehlend)" -#: builtin/log.c:1227 +#: builtin/log.c:1230 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1228 +#: builtin/log.c:1231 msgid "make first mail a reply to <message-id>" -msgstr "macht aus erster E-Mail eine Antwort zu <message-id>" +msgstr "aus erster E-Mail eine Antwort zu <message-id> machen" -#: builtin/log.c:1229 builtin/log.c:1232 +#: builtin/log.c:1232 builtin/log.c:1235 msgid "boundary" msgstr "Grenze" -#: builtin/log.c:1230 +#: builtin/log.c:1233 msgid "attach the patch" -msgstr "hängt einen Patch an" +msgstr "den Patch anhängen" -#: builtin/log.c:1233 +#: builtin/log.c:1236 msgid "inline the patch" -msgstr "fügt den Patch direkt in die Nachricht ein" +msgstr "den Patch direkt in die Nachricht einfügen" -#: builtin/log.c:1237 +#: builtin/log.c:1240 msgid "enable message threading, styles: shallow, deep" -msgstr "aktiviert Nachrichtenverkettung, Stile: shallow, deep" +msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep" -#: builtin/log.c:1239 +#: builtin/log.c:1242 msgid "signature" msgstr "Signatur" -#: builtin/log.c:1240 +#: builtin/log.c:1243 msgid "add a signature" -msgstr "fügt eine Signatur hinzu" +msgstr "eine Signatur hinzufügen" -#: builtin/log.c:1242 +#: builtin/log.c:1245 msgid "add a signature from a file" -msgstr "fügt eine Signatur aus einer Datei hinzu" +msgstr "eine Signatur aus einer Datei hinzufügen" -#: builtin/log.c:1243 +#: builtin/log.c:1246 msgid "don't print the patch filenames" -msgstr "zeigt keine Dateinamen der Patches" +msgstr "keine Dateinamen der Patches anzeigen" -#: builtin/log.c:1317 +#: builtin/log.c:1320 #, c-format msgid "invalid ident line: %s" msgstr "Ungültige Identifikationszeile: %s" -#: builtin/log.c:1332 +#: builtin/log.c:1335 msgid "-n and -k are mutually exclusive." msgstr "Die Optionen -n und -k schließen sich gegenseitig aus." -#: builtin/log.c:1334 +#: builtin/log.c:1337 msgid "--subject-prefix and -k are mutually exclusive." msgstr "Die Optionen --subject-prefix und -k schließen sich gegenseitig aus." -#: builtin/log.c:1342 +#: builtin/log.c:1345 msgid "--name-only does not make sense" msgstr "Die Option --name-only kann nicht verwendet werden." -#: builtin/log.c:1344 +#: builtin/log.c:1347 msgid "--name-status does not make sense" msgstr "Die Option --name-status kann nicht verwendet werden." -#: builtin/log.c:1346 +#: builtin/log.c:1349 msgid "--check does not make sense" msgstr "Die Option --check kann nicht verwendet werden." -#: builtin/log.c:1369 +#: builtin/log.c:1372 msgid "standard output, or directory, which one?" msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" -#: builtin/log.c:1371 +#: builtin/log.c:1374 #, c-format msgid "Could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/log.c:1468 +#: builtin/log.c:1472 #, c-format msgid "unable to read signature file '%s'" msgstr "Konnte Signatur-Datei '%s' nicht lesen" -#: builtin/log.c:1531 +#: builtin/log.c:1535 msgid "Failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:1579 +#: builtin/log.c:1583 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]" -#: builtin/log.c:1634 +#: builtin/log.c:1638 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -6662,7 +6872,7 @@ msgstr "" "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> " "manuell an.\n" -#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661 +#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 #, c-format msgid "Unknown commit %s" msgstr "Unbekannter Commit %s" @@ -6673,74 +6883,74 @@ msgstr "git ls-files [Optionen] [<Datei>...]" #: builtin/ls-files.c:458 msgid "identify the file status with tags" -msgstr "zeigt den Dateistatus mit Tags" +msgstr "den Dateistatus mit Tags anzeigen" #: builtin/ls-files.c:460 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -"verwendet Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung" +"Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden" #: builtin/ls-files.c:462 msgid "show cached files in the output (default)" -msgstr "zeigt zwischengespeicherten Dateien in der Ausgabe an (Standard)" +msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)" #: builtin/ls-files.c:464 msgid "show deleted files in the output" -msgstr "zeigt entfernte Dateien in der Ausgabe an" +msgstr "entfernte Dateien in der Ausgabe anzeigen" #: builtin/ls-files.c:466 msgid "show modified files in the output" -msgstr "zeigt geänderte Dateien in der Ausgabe an" +msgstr "geänderte Dateien in der Ausgabe anzeigen" #: builtin/ls-files.c:468 msgid "show other files in the output" -msgstr "zeigt sonstige Dateien in der Ausgabe an" +msgstr "sonstige Dateien in der Ausgabe anzeigen" #: builtin/ls-files.c:470 msgid "show ignored files in the output" -msgstr "zeigt ignorierte Dateien in der Ausgabe an" +msgstr "ignorierte Dateien in der Ausgabe anzeigen" #: builtin/ls-files.c:473 msgid "show staged contents' object name in the output" msgstr "" -"zeigt Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der " -"Ausgabe an" +"Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der Ausgabe " +"anzeigen" #: builtin/ls-files.c:475 msgid "show files on the filesystem that need to be removed" -msgstr "zeigt Dateien im Dateisystem, die gelöscht werden müssen, an" +msgstr "Dateien im Dateisystem, die gelöscht werden müssen, anzeigen" #: builtin/ls-files.c:477 -msgid "show 'other' directories' name only" -msgstr "zeigt nur Namen von 'sonstigen' Verzeichnissen an" +msgid "show 'other' directories' names only" +msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen" #: builtin/ls-files.c:480 msgid "don't show empty directories" -msgstr "zeigt keine leeren Verzeichnisse an" +msgstr "keine leeren Verzeichnisse anzeigen" #: builtin/ls-files.c:483 msgid "show unmerged files in the output" -msgstr "zeigt nicht zusammengeführte Dateien in der Ausgabe an" +msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen" #: builtin/ls-files.c:485 msgid "show resolve-undo information" -msgstr "zeigt 'resolve-undo' Informationen an" +msgstr "'resolve-undo' Informationen anzeigen" #: builtin/ls-files.c:487 msgid "skip files matching pattern" -msgstr "lässt Dateien aus, die einem Muster entsprechen" +msgstr "Dateien auslassen, die einem Muster entsprechen" #: builtin/ls-files.c:490 msgid "exclude patterns are read from <file>" -msgstr "schließt Muster, gelesen von <Datei>, aus" +msgstr "Muster, gelesen von <Datei>, ausschließen" #: builtin/ls-files.c:493 msgid "read additional per-directory exclude patterns in <file>" -msgstr "liest zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei>" +msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen" #: builtin/ls-files.c:495 msgid "add the standard git exclusions" -msgstr "fügt die standardmäßigen Git-Ausschlüsse hinzu" +msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen" #: builtin/ls-files.c:498 msgid "make the output relative to the project top directory" @@ -6749,7 +6959,7 @@ msgstr "Ausgabe relativ zum Projektverzeichnis" #: builtin/ls-files.c:501 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -"behandle es als Fehler, wenn sich eine <Datei> nicht in der Staging-Area " +"als Fehler behandeln, wenn sich eine <Datei> nicht in der Staging-Area " "befindet" #: builtin/ls-files.c:502 @@ -6759,12 +6969,12 @@ msgstr "Commit-Referenz" #: builtin/ls-files.c:503 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -"gibt vor, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch " +"vorgeben, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch " "vorhanden sind" #: builtin/ls-files.c:505 msgid "show debugging data" -msgstr "zeigt Ausgaben zur Fehlersuche an" +msgstr "Ausgaben zur Fehlersuche anzeigen" #: builtin/ls-tree.c:28 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" @@ -6772,135 +6982,135 @@ msgstr "git ls-tree [<Optionen>] <Commit-Referenz> [<Pfad>...]" #: builtin/ls-tree.c:126 msgid "only show trees" -msgstr "zeigt nur Verzeichnisse an" +msgstr "nur Verzeichnisse anzeigen" #: builtin/ls-tree.c:128 msgid "recurse into subtrees" -msgstr "führt Rekursion in Unterverzeichnissen durch" +msgstr "Rekursion in Unterverzeichnissen durchführen" #: builtin/ls-tree.c:130 msgid "show trees when recursing" -msgstr "zeigt Verzeichnisse bei Rekursion an" +msgstr "Verzeichnisse bei Rekursion anzeigen" #: builtin/ls-tree.c:133 msgid "terminate entries with NUL byte" -msgstr "schließt Einträge mit NUL-Byte ab" +msgstr "Einträge mit NUL-Byte abschließen" #: builtin/ls-tree.c:134 msgid "include object size" -msgstr "schließt Objektgröße ein" +msgstr "Objektgröße einschließen" #: builtin/ls-tree.c:136 builtin/ls-tree.c:138 msgid "list only filenames" -msgstr "listet nur Dateinamen auf" +msgstr "nur Dateinamen auflisten" #: builtin/ls-tree.c:141 msgid "use full path names" -msgstr "verwendet vollständige Pfadnamen" +msgstr "vollständige Pfadnamen verwenden" #: builtin/ls-tree.c:143 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" -"listet das gesamte Verzeichnis auf; nicht nur das aktuelle Verzeichnis " +"das gesamte Verzeichnis auflisten; nicht nur das aktuelle Verzeichnis " "(impliziert --full-name)" -#: builtin/merge.c:43 +#: builtin/merge.c:44 msgid "git merge [options] [<commit>...]" msgstr "git merge [Optionen] [<Commit>...]" -#: builtin/merge.c:44 +#: builtin/merge.c:45 msgid "git merge [options] <msg> HEAD <commit>" msgstr "git merge [Optionen] <Beschreibung> HEAD <Commit>" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:98 +#: builtin/merge.c:99 msgid "switch `m' requires a value" msgstr "Schalter 'm' erfordert einen Wert." -#: builtin/merge.c:135 +#: builtin/merge.c:136 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Konnte Merge-Strategie '%s' nicht finden.\n" -#: builtin/merge.c:136 +#: builtin/merge.c:137 #, c-format msgid "Available strategies are:" msgstr "Verfügbare Strategien sind:" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "Available custom strategies are:" msgstr "Verfügbare benutzerdefinierte Strategien sind:" -#: builtin/merge.c:191 +#: builtin/merge.c:192 msgid "do not show a diffstat at the end of the merge" -msgstr "zeigt keine Zusammenfassung der Unterschiede am Schluss des Merges an" +msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:194 +#: builtin/merge.c:195 msgid "show a diffstat at the end of the merge" -msgstr "zeigt eine Zusammenfassung der Unterschiede am Schluss des Merges an" +msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:195 +#: builtin/merge.c:196 msgid "(synonym to --stat)" msgstr "(Synonym für --stat)" -#: builtin/merge.c:197 +#: builtin/merge.c:198 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -"fügt (höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-" -"Commits hinzu" +"(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits " +"hinzufügen" -#: builtin/merge.c:200 +#: builtin/merge.c:201 msgid "create a single commit instead of doing a merge" -msgstr "erzeugt einen einzelnen Commit anstatt eines Merges" +msgstr "einen einzelnen Commit anstatt eines Merges erzeugen" -#: builtin/merge.c:202 +#: builtin/merge.c:203 msgid "perform a commit if the merge succeeds (default)" -msgstr "führt einen Commit durch, wenn der Merge erfolgreich war (Standard)" +msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)" -#: builtin/merge.c:204 +#: builtin/merge.c:205 msgid "edit message before committing" msgstr "Bearbeitung der Beschreibung vor dem Commit" -#: builtin/merge.c:205 +#: builtin/merge.c:206 msgid "allow fast-forward (default)" -msgstr "erlaubt Vorspulen (Standard)" +msgstr "Vorspulen erlauben (Standard)" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "abort if fast-forward is not possible" -msgstr "bricht ab, wenn kein Vorspulen möglich ist" +msgstr "abbrechen, wenn kein Vorspulen möglich ist" -#: builtin/merge.c:211 +#: builtin/merge.c:212 msgid "Verify that the named commit has a valid GPG signature" -msgstr "überprüft den genannten Commit auf eine gültige GPG-Signatur" +msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen" -#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89 +#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89 msgid "strategy" msgstr "Strategie" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "merge strategy to use" msgstr "zu verwendende Merge-Strategie" -#: builtin/merge.c:214 +#: builtin/merge.c:215 msgid "option=value" msgstr "Option=Wert" -#: builtin/merge.c:215 +#: builtin/merge.c:216 msgid "option for selected merge strategy" msgstr "Option für ausgewählte Merge-Strategie" -#: builtin/merge.c:217 +#: builtin/merge.c:218 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -"führt Commit-Beschreibung zusammen (für einen Merge, der kein Vorspulen war)" +"Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)" -#: builtin/merge.c:221 +#: builtin/merge.c:222 msgid "abort the current in-progress merge" -msgstr "bricht den sich im Gange befindlichen Merge ab" +msgstr "den sich im Gange befindlichen Merge abbrechen" #: builtin/merge.c:250 msgid "could not run stash." @@ -6955,33 +7165,33 @@ msgstr "Ungültiger branch.%s.mergeoptions String: %s" 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:677 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:691 #, 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:704 #, c-format msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:794 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "konnte nicht von '%s' lesen" -#: builtin/merge.c:803 +#: builtin/merge.c:802 #, 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:808 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6997,168 +7207,168 @@ msgstr "" "Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/merge.c:833 +#: builtin/merge.c:832 msgid "Empty commit message." msgstr "Leere Commit-Beschreibung" -#: builtin/merge.c:845 +#: builtin/merge.c:844 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:908 +#: builtin/merge.c:907 #, 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:924 +#: builtin/merge.c:923 #, c-format msgid "'%s' is not a commit" msgstr "'%s' ist kein Commit" -#: builtin/merge.c:965 +#: builtin/merge.c:964 msgid "No current branch." msgstr "Sie befinden sich auf keinem Branch." -#: builtin/merge.c:967 +#: builtin/merge.c:966 msgid "No remote for the current branch." msgstr "Kein Remote-Repository für den aktuellen Branch." -#: builtin/merge.c:969 +#: builtin/merge.c:968 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:974 +#: builtin/merge.c:973 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Kein Remote-Tracking-Branch für %s von %s" -#: builtin/merge.c:1130 +#: builtin/merge.c:1129 msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "Es gibt keinen Merge zum Abbrechen (vermisse MERGE_HEAD)" +msgstr "Es gibt keinen Merge zum Abbrechen (MERGE_HEAD fehlt)" -#: builtin/merge.c:1146 git-pull.sh:31 +#: builtin/merge.c:1145 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" -"Bitte committen Sie Ihre Änderungen, bevor Sie \"merge\" ausführen können." +"Bitte committen Sie Ihre Änderungen, bevor Sie \"merge\" ausführen." -#: builtin/merge.c:1149 git-pull.sh:34 +#: builtin/merge.c:1148 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)." -#: builtin/merge.c:1153 +#: builtin/merge.c:1152 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" -"Bitte committen Sie Ihre Änderungen, bevor Sie \"merge\" ausführen können." +"Bitte committen Sie Ihre Änderungen, bevor Sie \"merge\" ausführen." -#: builtin/merge.c:1156 +#: builtin/merge.c:1155 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:1165 +#: builtin/merge.c:1164 msgid "You cannot combine --squash with --no-ff." msgstr "Sie können --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1174 +#: builtin/merge.c:1173 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1206 +#: builtin/merge.c:1205 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:1209 +#: builtin/merge.c:1208 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:1211 +#: builtin/merge.c:1210 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:1216 +#: builtin/merge.c:1215 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenführen können" -#: builtin/merge.c:1267 +#: builtin/merge.c:1266 #, 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:1270 +#: builtin/merge.c:1269 #, 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:1273 +#: builtin/merge.c:1272 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s hat keine GPG-Signatur." -#: builtin/merge.c:1276 +#: builtin/merge.c:1275 #, 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:1357 +#: builtin/merge.c:1356 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1396 +#: builtin/merge.c:1395 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge...\n" -#: builtin/merge.c:1403 +#: builtin/merge.c:1402 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1435 +#: builtin/merge.c:1434 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1458 builtin/merge.c:1537 +#: builtin/merge.c:1457 builtin/merge.c:1536 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Verzeichnisses bis zum Ursprung...\n" -#: builtin/merge.c:1462 +#: builtin/merge.c:1461 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s...\n" -#: builtin/merge.c:1528 +#: builtin/merge.c:1527 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie behandelt diesen Merge.\n" -#: builtin/merge.c:1530 +#: builtin/merge.c:1529 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1538 #, 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:1551 +#: builtin/merge.c:1550 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7190,11 +7400,11 @@ msgstr "Ausgabe aller gemeinsamen Vorgänger-Commits" #: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" -msgstr "findet Vorgänger-Commits für einen einzelnen n-Wege-Merge" +msgstr "Vorgänger-Commits für einen einzelnen n-Wege-Merge finden" #: builtin/merge-base.c:218 msgid "list revs not reachable from others" -msgstr "listet Commits auf, die nicht durch Andere erreichbar sind" +msgstr "Commits auflisten, die nicht durch Andere erreichbar sind" #: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" @@ -7202,7 +7412,7 @@ msgstr "ist der Erste ein Vorgänger-Commit von dem Anderen?" #: builtin/merge-base.c:222 msgid "find where <commit> forked from reflog of <ref>" -msgstr "findet wo <Commit> von Reflog von <Referenz> abgespalten wurde" +msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde" #: builtin/merge-file.c:8 msgid "" @@ -7214,27 +7424,27 @@ msgstr "" #: builtin/merge-file.c:33 msgid "send results to standard output" -msgstr "sendet Ergebnisse zur Standard-Ausgabe" +msgstr "Ergebnisse zur Standard-Ausgabe senden" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" -msgstr "verwendet einen diff3 basierten Merge" +msgstr "einen diff3 basierten Merge verwenden" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" -msgstr "verwendet bei Konflikten unsere Variante" +msgstr "bei Konflikten unsere Variante verwenden" #: builtin/merge-file.c:37 msgid "for conflicts, use their version" -msgstr "verwendet bei Konflikten ihre Variante" +msgstr "bei Konflikten ihre Variante verwenden" #: builtin/merge-file.c:39 msgid "for conflicts, use a union version" -msgstr "verwendet bei Konflikten eine gemeinsame Variante" +msgstr "bei Konflikten eine gemeinsame Variante verwenden" #: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" -msgstr "verwendet bei Konflikten diese Kennzeichnungslänge" +msgstr "bei Konflikten diese Kennzeichnungslänge verwenden" #: builtin/merge-file.c:43 msgid "do not warn about conflicts" @@ -7242,7 +7452,7 @@ msgstr "keine Warnung bei Konflikten" #: builtin/merge-file.c:45 msgid "set labels for file1/orig_file/file2" -msgstr "setzt Beschriftung für Datei1/orig_Datei/Datei2" +msgstr "Beschriftung für Datei1/orig_Datei/Datei2 setzen" #: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" @@ -7254,98 +7464,103 @@ msgstr "Eingabe ist durch NUL-Zeichen abgeschlossen" #: builtin/mktree.c:151 builtin/write-tree.c:24 msgid "allow missing objects" -msgstr "erlaubt fehlende Objekte" +msgstr "fehlende Objekte erlauben" #: builtin/mktree.c:152 msgid "allow creation of more than one tree" -msgstr "erlaubt die Erstellung von mehr als einem \"Tree\"-Objekt" +msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben" #: builtin/mv.c:15 msgid "git mv [options] <source>... <destination>" msgstr "git mv [Optionen] <Quelle>... <Ziel>" +#: builtin/mv.c:69 +#, c-format +msgid "Directory %s is in index and no submodule?" +msgstr "Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?" + #: builtin/mv.c:71 +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/mv.c:89 +#, c-format +msgid "%.*s is in index" +msgstr "%.*s ist zum Commit vorgemerkt" + +#: builtin/mv.c:111 msgid "force move/rename even if target exists" -msgstr "erzwingt Verschieben/Umbenennen, auch wenn das Ziel existiert" +msgstr "Verschieben/Umbenennen erzwingen, auch wenn das Ziel existiert" -#: builtin/mv.c:72 +#: builtin/mv.c:112 msgid "skip move/rename errors" -msgstr "überspringt Fehler beim Verschieben oder Umbenennen" +msgstr "Fehler beim Verschieben oder Umbenennen überspringen" + +#: builtin/mv.c:151 +#, c-format +msgid "destination '%s' is not a directory" +msgstr "Ziel '%s' ist kein Verzeichnis" -#: builtin/mv.c:122 +#: builtin/mv.c:162 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Prüfe Umbenennung von '%s' nach '%s'\n" -#: builtin/mv.c:126 +#: builtin/mv.c:166 msgid "bad source" msgstr "ungültige Quelle" -#: builtin/mv.c:129 +#: builtin/mv.c:169 msgid "can not move directory into itself" msgstr "kann Verzeichnis nicht in sich selbst verschieben" -#: builtin/mv.c:132 +#: builtin/mv.c:172 msgid "cannot move directory over file" msgstr "kann Verzeichnis nicht über Datei verschieben" -#: builtin/mv.c:138 -#, c-format -msgid "Huh? Directory %s is in index and no submodule?" -msgstr "Huh? Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?" - -#: builtin/mv.c:140 builtin/rm.c:318 -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/mv.c:156 -#, c-format -msgid "Huh? %.*s is in index?" -msgstr "Huh? %.*s ist zum Commit vorgemerkt?" - -#: builtin/mv.c:169 +#: builtin/mv.c:181 msgid "source directory is empty" msgstr "Quellverzeichnis ist leer" -#: builtin/mv.c:205 +#: builtin/mv.c:206 msgid "not under version control" msgstr "nicht unter Versionskontrolle" -#: builtin/mv.c:208 +#: builtin/mv.c:209 msgid "destination exists" msgstr "Ziel existiert bereits" -#: builtin/mv.c:216 +#: builtin/mv.c:217 #, c-format msgid "overwriting '%s'" msgstr "überschreibe '%s'" -#: builtin/mv.c:219 +#: builtin/mv.c:220 msgid "Cannot overwrite" msgstr "Kann nicht überschreiben" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "multiple sources for the same target" msgstr "mehrere Quellen für das selbe Ziel" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "destination directory does not exist" msgstr "Zielverzeichnis existiert nicht" -#: builtin/mv.c:244 +#: builtin/mv.c:232 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, Quelle=%s, Ziel=%s" -#: builtin/mv.c:254 +#: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" @@ -7364,31 +7579,31 @@ msgstr "git name-rev [Optionen] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" -msgstr "zeigt nur Namen an (keine SHA-1)" +msgstr "nur Namen anzeigen (keine SHA-1)" #: builtin/name-rev.c:310 msgid "only use tags to name the commits" -msgstr "verwendet nur Tags, um die Commits zu benennen" +msgstr "nur Tags verwenden, um die Commits zu benennen" #: builtin/name-rev.c:312 msgid "only use refs matching <pattern>" -msgstr "verwendet nur Referenzen die <Muster> entsprechen" +msgstr "nur Referenzen verwenden die <Muster> entsprechen" #: builtin/name-rev.c:314 msgid "list all commits reachable from all refs" -msgstr "listet alle Commits auf, die von allen Referenzen erreichbar sind" +msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind" #: builtin/name-rev.c:315 msgid "read from stdin" -msgstr "liest von der Standard-Eingabe" +msgstr "von der Standard-Eingabe lesen" #: builtin/name-rev.c:316 msgid "allow to print `undefined` names (default)" -msgstr "erlaubt Ausgabe von `undefinierten` Namen (Standard)" +msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)" #: builtin/name-rev.c:322 msgid "dereference tags in the input (internal use)" -msgstr "dereferenziert Tags in der Eingabe (interne Verwendung)" +msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)" #: builtin/notes.c:24 msgid "git notes [--ref <notes_ref>] [list [<object>]]" @@ -7502,119 +7717,119 @@ msgstr "git notes prune [<Optionen>]" msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:137 +#: builtin/notes.c:136 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "konnte 'show' für Objekt '%s' nicht starten" -#: builtin/notes.c:141 +#: builtin/notes.c:140 msgid "could not read 'show' output" msgstr "Konnte Ausgabe von 'show' nicht lesen." -#: builtin/notes.c:149 +#: builtin/notes.c:148 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "konnte 'show' für Objekt '%s' nicht abschließen" -#: builtin/notes.c:167 builtin/tag.c:477 +#: builtin/notes.c:166 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "konnte Datei '%s' nicht erstellen" -#: builtin/notes.c:186 +#: builtin/notes.c:185 msgid "Please supply the note contents using either -m or -F option" msgstr "" "Bitte liefern Sie den Notiz-Inhalt unter Verwendung der Option -m oder -F." -#: builtin/notes.c:207 builtin/notes.c:848 +#: builtin/notes.c:206 builtin/notes.c:847 #, c-format msgid "Removing note for object %s\n" msgstr "Entferne Notiz für Objekt %s\n" -#: builtin/notes.c:212 +#: builtin/notes.c:211 msgid "unable to write note object" msgstr "Konnte Notiz-Objekt nicht schreiben" -#: builtin/notes.c:214 +#: builtin/notes.c:213 #, c-format -msgid "The note contents has been left in %s" +msgid "The note contents have been left in %s" msgstr "Die Notiz-Inhalte wurden in %s belassen" -#: builtin/notes.c:248 builtin/tag.c:692 +#: builtin/notes.c:247 builtin/tag.c:693 #, c-format msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" -#: builtin/notes.c:250 builtin/tag.c:695 +#: builtin/notes.c:249 builtin/tag.c:696 #, c-format msgid "could not open or read '%s'" msgstr "konnte '%s' nicht öffnen oder lesen" -#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322 -#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519 -#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641 -#: builtin/notes.c:843 builtin/tag.c:708 +#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321 +#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518 +#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640 +#: builtin/notes.c:842 builtin/tag.c:709 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Konnte '%s' nicht als gültige Referenz auflösen." -#: builtin/notes.c:272 +#: builtin/notes.c:271 #, c-format msgid "Failed to read object '%s'." msgstr "Fehler beim Lesen des Objektes '%s'." -#: builtin/notes.c:276 +#: builtin/notes.c:275 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen." -#: builtin/notes.c:316 +#: builtin/notes.c:315 #, c-format msgid "Malformed input line: '%s'." msgstr "Fehlerhafte Eingabezeile: '%s'." -#: builtin/notes.c:331 +#: builtin/notes.c:330 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" -#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502 -#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634 -#: builtin/notes.c:908 +#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501 +#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633 +#: builtin/notes.c:907 msgid "too many parameters" msgstr "zu viele Parameter" -#: builtin/notes.c:388 builtin/notes.c:647 +#: builtin/notes.c:387 builtin/notes.c:646 #, c-format msgid "No note found for object %s." msgstr "Kein Notiz für Objekt %s gefunden." -#: builtin/notes.c:410 builtin/notes.c:567 +#: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents as a string" msgstr "Notizinhalte als Zeichenkette" -#: builtin/notes.c:413 builtin/notes.c:570 +#: builtin/notes.c:412 builtin/notes.c:569 msgid "note contents in a file" msgstr "Notizinhalte in einer Datei" -#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572 -#: builtin/notes.c:575 builtin/tag.c:627 +#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571 +#: builtin/notes.c:574 builtin/tag.c:628 msgid "object" msgstr "Objekt" -#: builtin/notes.c:416 builtin/notes.c:573 +#: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes" -#: builtin/notes.c:419 builtin/notes.c:576 +#: builtin/notes.c:418 builtin/notes.c:575 msgid "reuse specified note object" msgstr "Wiederverwendung des angegebenen Notiz-Objektes" -#: builtin/notes.c:421 builtin/notes.c:489 +#: builtin/notes.c:420 builtin/notes.c:488 msgid "replace existing notes" -msgstr "ersetzt existierende Notizen" +msgstr "existierende Notizen ersetzen" -#: builtin/notes.c:455 +#: builtin/notes.c:454 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7623,26 +7838,26 @@ msgstr "" "Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s " "gefunden. Verwenden Sie '-f', um die existierenden Notizen zu überschreiben." -#: builtin/notes.c:460 builtin/notes.c:537 +#: builtin/notes.c:459 builtin/notes.c:536 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Überschreibe existierende Notizen für Objekt %s\n" -#: builtin/notes.c:490 +#: builtin/notes.c:489 msgid "read objects from stdin" -msgstr "liest Objekte von der Standard-Eingabe" +msgstr "Objekte von der Standard-Eingabe lesen" -#: builtin/notes.c:492 +#: builtin/notes.c:491 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" -"lädt Konfiguration für <Kommando> beim Umschreiben von Versionen (impliziert " -"--stdin)" +"Konfiguration für <Kommando> beim Umschreiben von Versionen laden " +"(impliziert --stdin)" -#: builtin/notes.c:510 +#: builtin/notes.c:509 msgid "too few parameters" msgstr "zu wenig Parameter" -#: builtin/notes.c:531 +#: builtin/notes.c:530 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7651,12 +7866,12 @@ msgstr "" "Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. " "Verwenden Sie '-f', um die existierenden Notizen zu überschreiben." -#: builtin/notes.c:543 +#: builtin/notes.c:542 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich." -#: builtin/notes.c:592 +#: builtin/notes.c:591 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -7665,15 +7880,15 @@ msgstr "" "Die Optionen -m/-F/-c/-C sind für das Unterkommando 'edit' veraltet.\n" "Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n" -#: builtin/notes.c:739 +#: builtin/notes.c:738 msgid "General options" msgstr "Allgemeine Optionen" -#: builtin/notes.c:741 +#: builtin/notes.c:740 msgid "Merge options" msgstr "Merge-Optionen" -#: builtin/notes.c:743 +#: builtin/notes.c:742 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -7681,234 +7896,241 @@ msgstr "" "löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:745 +#: builtin/notes.c:744 msgid "Committing unmerged notes" -msgstr "trägt nicht zusammengeführte Notizen ein" +msgstr "nicht zusammengeführte Notizen eintragen" -#: builtin/notes.c:747 +#: builtin/notes.c:746 msgid "finalize notes merge by committing unmerged notes" msgstr "" -"schließt Merge von Notizen ab, in dem nicht zusammengeführte Notizen " +"Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen " "committet werden" -#: builtin/notes.c:749 +#: builtin/notes.c:748 msgid "Aborting notes merge resolution" -msgstr "bricht Konfliktauflösung beim Merge von Notizen ab" +msgstr "Konfliktauflösung beim Merge von Notizen abbrechen" -#: builtin/notes.c:751 +#: builtin/notes.c:750 msgid "abort notes merge" -msgstr "bricht Merge von Notizen ab" +msgstr "Merge von Notizen abbrechen" -#: builtin/notes.c:846 +#: builtin/notes.c:845 #, c-format msgid "Object %s has no note\n" msgstr "Objekt %s hat keine Notiz\n" -#: builtin/notes.c:858 +#: builtin/notes.c:857 msgid "attempt to remove non-existent note is not an error" msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler" -#: builtin/notes.c:861 +#: builtin/notes.c:860 msgid "read object names from the standard input" -msgstr "liest Objektnamen von der Standard-Eingabe" +msgstr "Objektnamen von der Standard-Eingabe lesen" -#: builtin/notes.c:942 +#: builtin/notes.c:941 msgid "notes-ref" msgstr "Notiz-Referenz" -#: builtin/notes.c:943 +#: builtin/notes.c:942 msgid "use notes from <notes_ref>" -msgstr "verwendet Notizen von <Notiz-Referenz>" +msgstr "Notizen von <Notiz-Referenz> verwenden" -#: builtin/notes.c:978 builtin/remote.c:1616 +#: builtin/notes.c:977 builtin/remote.c:1624 #, c-format msgid "Unknown subcommand: %s" msgstr "Unbekanntes Unterkommando: %s" -#: builtin/pack-objects.c:25 +#: builtin/pack-objects.c:28 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "" "git pack-objects --stdout [Optionen...] [< Referenzliste | < Objektliste]" -#: builtin/pack-objects.c:26 +#: builtin/pack-objects.c:29 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" "git pack-objects [Optionen...] Basis-Name [< Referenzliste | < Objektliste]" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "Fehler beim Komprimieren (%d)" -#: builtin/pack-objects.c:771 +#: builtin/pack-objects.c:773 msgid "Writing objects" msgstr "Schreibe Objekte" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1015 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:2174 +#: builtin/pack-objects.c:2175 msgid "Compressing objects" msgstr "Komprimiere Objekte" -#: builtin/pack-objects.c:2526 +#: builtin/pack-objects.c:2572 #, c-format msgid "unsupported index version %s" msgstr "Nicht unterstützte Staging-Area-Version %s" -#: builtin/pack-objects.c:2530 +#: builtin/pack-objects.c:2576 #, c-format msgid "bad index version '%s'" msgstr "Ungültige Staging-Area-Version '%s'" -#: builtin/pack-objects.c:2553 +#: builtin/pack-objects.c:2599 #, c-format msgid "option %s does not accept negative form" msgstr "Option %s akzeptiert keine negative Form" -#: builtin/pack-objects.c:2557 +#: builtin/pack-objects.c:2603 #, 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:2576 +#: builtin/pack-objects.c:2622 msgid "do not show progress meter" -msgstr "zeigt keine Fortschrittsanzeige" +msgstr "keine Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2578 +#: builtin/pack-objects.c:2624 msgid "show progress meter" -msgstr "zeigt Fortschrittsanzeige" +msgstr "Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c:2626 msgid "show progress meter during object writing phase" -msgstr "zeigt Forschrittsanzeige während der Phase des Schreibens der Objekte" +msgstr "" +"Forschrittsanzeige während der Phase des Schreibens der Objekte anzeigen" -#: builtin/pack-objects.c:2583 +#: builtin/pack-objects.c:2629 msgid "similar to --all-progress when progress meter is shown" msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" -#: builtin/pack-objects.c:2584 +#: builtin/pack-objects.c:2630 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2585 +#: builtin/pack-objects.c:2631 msgid "write the pack index file in the specified idx format version" msgstr "" -"schreibt die Index-Datei des Paketes in der angegebenen Indexformat-Version" +"die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2634 msgid "maximum size of each output pack file" msgstr "maximale Größe für jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:2590 +#: builtin/pack-objects.c:2636 msgid "ignore borrowed objects from alternate object store" -msgstr "ignoriert geliehene Objekte von alternativem Objektspeicher" +msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2638 msgid "ignore packed objects" -msgstr "ignoriert gepackte Objekte" +msgstr "gepackte Objekte ignorieren" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2640 msgid "limit pack window by objects" -msgstr "begrenzt Paketfenster durch Objekte" +msgstr "Paketfenster durch Objekte begrenzen" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2642 msgid "limit pack window by memory in addition to object limit" -msgstr "begrenzt Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher" +msgstr "" +"Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen" -#: builtin/pack-objects.c:2598 +#: builtin/pack-objects.c:2644 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:2600 +#: builtin/pack-objects.c:2646 msgid "reuse existing deltas" -msgstr "verwendet existierende Unterschiede wieder" +msgstr "existierende Unterschiede wiederverwenden" -#: builtin/pack-objects.c:2602 +#: builtin/pack-objects.c:2648 msgid "reuse existing objects" -msgstr "verwendet existierende Objekte wieder" +msgstr "existierende Objekte wiederverwenden" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2650 msgid "use OFS_DELTA objects" -msgstr "verwendet OFS_DELTA Objekte" +msgstr "OFS_DELTA Objekte verwenden" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2652 msgid "use threads when searching for best delta matches" msgstr "" -"verwendet Threads bei der Suche nach den besten Übereinstimmungen bei " -"Unterschieden" +"Threads bei der Suche nach den besten Übereinstimmungen bei Unterschieden " +"verwenden" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2654 msgid "do not create an empty pack output" -msgstr "erzeugt keine leeren Pakete" +msgstr "keine leeren Pakete erzeugen" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2656 msgid "read revision arguments from standard input" -msgstr "liest Argumente bezüglich Commits von der Standard-Eingabe" +msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2658 msgid "limit the objects to those that are not yet packed" -msgstr "begrenzt die Objekte zu solchen, die noch nicht gepackt wurden" +msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2661 msgid "include objects reachable from any reference" -msgstr "schließt Objekte ein, die von jeder Referenz erreichbar sind" +msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2664 msgid "include objects referred by reflog entries" msgstr "" -"schließt Objekte ein, die von Einträgen des Reflogs referenziert werden" +"Objekte einschließen, die von Einträgen des Reflogs referenziert werden" + +#: builtin/pack-objects.c:2667 +msgid "include objects referred to by the index" +msgstr "" +"Objekte einschließen, die von der Staging-Area referenziert werden" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2670 msgid "output pack to stdout" -msgstr "schreibt Paket in die Standard-Ausgabe" +msgstr "Paket in die Standard-Ausgabe schreiben" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2672 msgid "include tag objects that refer to objects to be packed" -msgstr "schließt Tag-Objekte ein, die auf gepackte Objekte referenzieren" +msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2674 msgid "keep unreachable objects" -msgstr "behält nicht erreichbare Objekte" +msgstr "nicht erreichbare Objekte behalten" -#: builtin/pack-objects.c:2626 parse-options.h:140 +#: builtin/pack-objects.c:2675 parse-options.h:140 msgid "time" msgstr "Zeit" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2676 msgid "unpack unreachable objects newer than <time>" -msgstr "entpackt nicht erreichbare Objekte, die neuer als <Zeit> sind" +msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2679 msgid "create thin packs" -msgstr "erzeugt dünnere Pakete" +msgstr "dünnere Pakete erzeugen" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2681 msgid "ignore packs that have companion .keep file" -msgstr "ignoriert Pakete die .keep Dateien haben" +msgstr "Pakete ignorieren, die .keep Dateien haben" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2683 msgid "pack compression level" msgstr "Komprimierungsgrad für Paketierung" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2685 msgid "do not hide commits by grafts" -msgstr "verbirgt keine künstlichen Vorgänger-Commits (\"grafts\")" +msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen" -#: builtin/pack-objects.c:2638 +#: builtin/pack-objects.c:2687 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -"benutzt Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung" +"Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2689 msgid "write a bitmap index together with the pack index" -msgstr "schreibt Bitmap-Index zusammen mit Pack-Index" +msgstr "Bitmap-Index zusammen mit Pack-Index schreiben" -#: builtin/pack-objects.c:2719 +#: builtin/pack-objects.c:2778 msgid "Counting objects" msgstr "Zähle Objekte" @@ -7918,17 +8140,17 @@ msgstr "git pack-refs [Optionen]" #: builtin/pack-refs.c:14 msgid "pack everything" -msgstr "packt alles" +msgstr "alles packen" #: builtin/pack-refs.c:15 msgid "prune loose refs (default)" -msgstr "entfernt lose Referenzen (Standard)" +msgstr "lose Referenzen entfernen (Standard)" #: builtin/prune-packed.c:7 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" -#: builtin/prune-packed.c:49 +#: builtin/prune-packed.c:40 msgid "Removing duplicate objects" msgstr "Lösche doppelte Objekte" @@ -7936,17 +8158,17 @@ msgstr "Lösche doppelte Objekte" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <Zeit>] [--] [<head>...]" -#: builtin/prune.c:142 +#: builtin/prune.c:106 msgid "do not remove, show only" msgstr "nicht löschen, nur anzeigen" -#: builtin/prune.c:143 +#: builtin/prune.c:107 msgid "report pruned objects" -msgstr "meldet gelöschte Objekte" +msgstr "gelöschte Objekte melden" -#: builtin/prune.c:146 +#: builtin/prune.c:110 msgid "expire objects older than <time>" -msgstr "lässt Objekte älter als <Zeit> verfallen" +msgstr "Objekte älter als <Zeit> verfallen lassen" #: builtin/push.c:14 msgid "git push [<options>] [<repository> [<refspec>...]]" @@ -8219,79 +8441,83 @@ msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden." msgid "--all and --mirror are incompatible" msgstr "Die Optionen --all und --mirror sind inkompatibel." -#: builtin/push.c:482 +#: builtin/push.c:493 msgid "repository" msgstr "Repository" -#: builtin/push.c:483 +#: builtin/push.c:494 msgid "push all refs" -msgstr "versendet alle Referenzen" +msgstr "alle Referenzen versenden" -#: builtin/push.c:484 +#: builtin/push.c:495 msgid "mirror all refs" -msgstr "spiegelt alle Referenzen" +msgstr "alle Referenzen spiegeln" -#: builtin/push.c:486 +#: builtin/push.c:497 msgid "delete refs" -msgstr "löscht Referenzen" +msgstr "Referenzen löschen" -#: builtin/push.c:487 +#: builtin/push.c:498 msgid "push tags (can't be used with --all or --mirror)" -msgstr "versendet Tags (kann nicht mit --all oder --mirror verwendet werden)" +msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)" -#: builtin/push.c:490 +#: builtin/push.c:501 msgid "force updates" -msgstr "erzwingt Aktualisierung" +msgstr "Aktualisierung erzwingen" -#: builtin/push.c:492 +#: builtin/push.c:503 msgid "refname>:<expect" msgstr "Referenzname>:<Erwartungswert" -#: builtin/push.c:493 +#: builtin/push.c:504 msgid "require old value of ref to be at this value" msgstr "Referenz muss sich auf dem angegebenen Wert befinden" -#: builtin/push.c:495 +#: builtin/push.c:506 msgid "check" -msgstr "" +msgstr "check|on-demand" -#: builtin/push.c:496 +#: builtin/push.c:507 msgid "control recursive pushing of submodules" -msgstr "steuert rekursiven \"push\" von Submodulen" +msgstr "rekursiven \"push\" von Submodulen steuern" -#: builtin/push.c:498 +#: builtin/push.c:509 msgid "use thin pack" -msgstr "verwendet kleinere Pakete" +msgstr "kleinere Pakete verwenden" -#: builtin/push.c:499 builtin/push.c:500 +#: builtin/push.c:510 builtin/push.c:511 msgid "receive pack program" msgstr "'receive pack' Programm" -#: builtin/push.c:501 +#: builtin/push.c:512 msgid "set upstream for git pull/status" -msgstr "setzt Upstream für \"git pull/status\"" +msgstr "Upstream für \"git pull/status\" setzen" -#: builtin/push.c:504 +#: builtin/push.c:515 msgid "prune locally removed refs" -msgstr "entfernt lokal gelöschte Referenzen" +msgstr "lokal gelöschte Referenzen entfernen" -#: builtin/push.c:506 +#: builtin/push.c:517 msgid "bypass pre-push hook" -msgstr "umgeht \"pre-push hook\"" +msgstr "\"pre-push hook\" umgehen" -#: builtin/push.c:507 +#: builtin/push.c:518 msgid "push missing but relevant tags" -msgstr "versendet fehlende, aber relevante Tags" +msgstr "fehlende, aber relevante Tags versenden" -#: builtin/push.c:517 +#: builtin/push.c:520 +msgid "GPG sign the push" +msgstr "signiert \"push\" mit GPG" + +#: builtin/push.c:529 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags." -#: builtin/push.c:519 +#: builtin/push.c:531 msgid "--delete doesn't make sense without any refs" msgstr "Die Option --delete kann nur mit Referenzen verwendet werden." -#: builtin/read-tree.c:36 +#: builtin/read-tree.c:37 msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -8302,69 +8528,69 @@ msgstr "" "index-output=<Datei>] (--empty | <Commit-Referenz1> [<Commit-Referenz2> " "[<Commit-Referenz3>]])" -#: builtin/read-tree.c:109 +#: builtin/read-tree.c:110 msgid "write resulting index to <file>" -msgstr "schreibt resultierende Staging-Area nach <Datei>" +msgstr "resultierende Staging-Area nach <Datei> schreiben" -#: builtin/read-tree.c:112 +#: builtin/read-tree.c:113 msgid "only empty the index" -msgstr "leert die Staging-Area" +msgstr "die Staging-Area leeren" -#: builtin/read-tree.c:114 +#: builtin/read-tree.c:115 msgid "Merging" msgstr "Merge" -#: builtin/read-tree.c:116 +#: builtin/read-tree.c:117 msgid "perform a merge in addition to a read" -msgstr "führt einen Merge zusätzlich zum Lesen aus" +msgstr "einen Merge, zusätzlich zum Lesen, ausführen" -#: builtin/read-tree.c:118 +#: builtin/read-tree.c:119 msgid "3-way merge if no file level merging required" msgstr "3-Wege-Merge, wenn kein Merge auf Dateiebene erforderlich ist" -#: builtin/read-tree.c:120 +#: builtin/read-tree.c:121 msgid "3-way merge in presence of adds and removes" msgstr "3-Wege-Merge bei Vorhandensein von hinzugefügten/entfernten Zeilen" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:123 msgid "same as -m, but discard unmerged entries" -msgstr "genau wie -m, verwirft aber nicht zusammengeführte Einträge" +msgstr "genau wie -m, aber nicht zusammengeführte Einträge verwerfen" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "<subdirectory>/" msgstr "<Unterverzeichnis>/" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:125 msgid "read the tree into the index under <subdirectory>/" -msgstr "liest das Verzeichnis in die Staging-Area unter <Unterverzeichnis>/" +msgstr "das Verzeichnis in die Staging-Area unter <Unterverzeichnis>/ lesen" -#: builtin/read-tree.c:127 +#: builtin/read-tree.c:128 msgid "update working tree with merge result" -msgstr "aktualisiert Arbeitsverzeichnis mit dem Ergebnis des Merges" +msgstr "Arbeitsverzeichnis mit dem Ergebnis des Merges aktualisieren" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:131 msgid "allow explicitly ignored files to be overwritten" -msgstr "erlaubt explizit ignorierte Dateien zu überschreiben" +msgstr "explizit ignorierte Dateien zu überschreiben erlauben" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't check the working tree after merging" -msgstr "prüft nicht das Arbeitsverzeichnis nach dem Merge" +msgstr "das Arbeitsverzeichnis nach dem Merge nicht prüfen" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:135 msgid "don't update the index or the work tree" -msgstr "aktualisiert weder die Staging-Area, noch das Arbeitsverzeichnis" +msgstr "weder die Staging-Area, noch das Arbeitsverzeichnis aktualisieren" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" -msgstr "überspringt Anwendung des Filters für spärliches Auschecken" +msgstr "Anwendung des Filters für spärliches Auschecken überspringen" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:139 msgid "debug unpack-trees" -msgstr "protokolliert Entpacken der Bäume" +msgstr "Entpacken der Bäume protokollieren" #: builtin/reflog.c:499 #, c-format @@ -8478,11 +8704,11 @@ msgstr "unbekanntes Argument für Option --mirror: %s" #: builtin/remote.c:153 msgid "fetch the remote branches" -msgstr "fordert die Remote-Branches an" +msgstr "die Remote-Branches anfordern" #: builtin/remote.c:155 msgid "import all tags and associated objects when fetching" -msgstr "importiert alle Tags und verbundene Objekte beim Anfordern" +msgstr "alle Tags und verbundene Objekte beim Anfordern importieren" #: builtin/remote.c:158 msgid "or do not fetch any tag at all (--no-tags)" @@ -8518,12 +8744,12 @@ msgstr "" "Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von " "Spiegelarchiven verwendet werden." -#: builtin/remote.c:185 builtin/remote.c:640 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "externes Repository %s existiert bereits" -#: builtin/remote.c:189 builtin/remote.c:644 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' ist kein gültiger Name für ein Remote-Repository" @@ -8533,11 +8759,6 @@ msgstr "'%s' ist kein gültiger Name für ein Remote-Repository" msgid "Could not setup master '%s'" msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten" -#: builtin/remote.c:288 -#, c-format -msgid "more than one %s" -msgstr "mehr als ein %s" - #: builtin/remote.c:333 #, c-format msgid "Could not get fetch map for refspec %s" @@ -8551,27 +8772,27 @@ msgstr "(übereinstimmend)" msgid "(delete)" msgstr "(lösche)" -#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Konnte '%s' nicht an '%s' anhängen." -#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894 +#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898 #, c-format msgid "No such remote: %s" msgstr "Kein solches Remote-Repository: %s" -#: builtin/remote.c:650 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen" -#: builtin/remote.c:656 builtin/remote.c:846 +#: builtin/remote.c:657 builtin/remote.c:850 #, c-format msgid "Could not remove config section '%s'" msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen" -#: builtin/remote.c:671 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8582,32 +8803,32 @@ msgstr "" "\t%s\n" "\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell." -#: builtin/remote.c:677 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "Konnte '%s' nicht anhängen." -#: builtin/remote.c:688 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "Konnte '%s' nicht setzen" -#: builtin/remote.c:710 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "Konnte '%s' nicht löschen" -#: builtin/remote.c:744 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "Konnte '%s' nicht erstellen" -#: builtin/remote.c:765 +#: builtin/remote.c:769 #, c-format msgid "Could not remove branch %s" msgstr "Konnte Branch %s nicht löschen" -#: builtin/remote.c:832 +#: builtin/remote.c:836 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8623,120 +8844,120 @@ msgstr[1] "" "entfernt;\n" "um diese zu entfernen, benutzen Sie:" -#: builtin/remote.c:947 +#: builtin/remote.c:951 #, 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:950 +#: builtin/remote.c:954 msgid " tracked" msgstr " gefolgt" -#: builtin/remote.c:952 +#: builtin/remote.c:956 msgid " stale (use 'git remote prune' to remove)" msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)" -#: builtin/remote.c:954 +#: builtin/remote.c:958 msgid " ???" msgstr " ???" -#: builtin/remote.c:995 +#: builtin/remote.c:999 #, 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:1002 +#: builtin/remote.c:1006 #, c-format msgid "rebases onto remote %s" msgstr "Rebase auf Remote-Branch %s" -#: builtin/remote.c:1005 +#: builtin/remote.c:1009 #, c-format msgid " merges with remote %s" msgstr " führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:1006 +#: builtin/remote.c:1010 msgid " and with remote" msgstr " und mit Remote-Branch" -#: builtin/remote.c:1008 +#: builtin/remote.c:1012 #, c-format msgid "merges with remote %s" msgstr "führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:1009 +#: builtin/remote.c:1013 msgid " and with remote" msgstr " und mit Remote-Branch" -#: builtin/remote.c:1055 +#: builtin/remote.c:1059 msgid "create" msgstr "erstellt" -#: builtin/remote.c:1058 +#: builtin/remote.c:1062 msgid "delete" msgstr "gelöscht" -#: builtin/remote.c:1062 +#: builtin/remote.c:1066 msgid "up to date" msgstr "aktuell" -#: builtin/remote.c:1065 +#: builtin/remote.c:1069 msgid "fast-forwardable" msgstr "vorspulbar" -#: builtin/remote.c:1068 +#: builtin/remote.c:1072 msgid "local out of date" msgstr "lokal nicht aktuell" -#: builtin/remote.c:1075 +#: builtin/remote.c:1079 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s erzwingt Versandt nach %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1082 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s versendet nach %-*s (%s)" -#: builtin/remote.c:1082 +#: builtin/remote.c:1086 #, c-format msgid " %-*s forces to %s" msgstr " %-*s erzwingt Versand nach %s" -#: builtin/remote.c:1085 +#: builtin/remote.c:1089 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s versendet nach %s" -#: builtin/remote.c:1153 +#: builtin/remote.c:1157 msgid "do not query remotes" msgstr "keine Abfrage von Remote-Repositories" -#: builtin/remote.c:1180 +#: builtin/remote.c:1184 #, c-format msgid "* remote %s" msgstr "* Remote-Repository %s" -#: builtin/remote.c:1181 +#: builtin/remote.c:1185 #, c-format msgid " Fetch URL: %s" msgstr " URL zum Abholen: %s" -#: builtin/remote.c:1182 builtin/remote.c:1329 +#: builtin/remote.c:1186 builtin/remote.c:1333 msgid "(no URL)" msgstr "(keine URL)" -#: builtin/remote.c:1191 builtin/remote.c:1193 +#: builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " Push URL: %s" msgstr " URL zum Versenden: %s" -#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199 +#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203 #, c-format msgid " HEAD branch: %s" msgstr " Hauptbranch: %s" -#: builtin/remote.c:1201 +#: builtin/remote.c:1205 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -8744,146 +8965,146 @@ msgstr "" " Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden " "sein):\n" -#: builtin/remote.c:1213 +#: builtin/remote.c:1217 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Remote-Branch:%s" msgstr[1] " Remote-Branches:%s" -#: builtin/remote.c:1216 builtin/remote.c:1243 +#: builtin/remote.c:1220 builtin/remote.c:1247 msgid " (status not queried)" msgstr " (Zustand nicht abgefragt)" -#: builtin/remote.c:1225 +#: builtin/remote.c:1229 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:1233 +#: builtin/remote.c:1237 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokale Referenzen werden von 'git push' gespiegelt" -#: builtin/remote.c:1240 +#: builtin/remote.c:1244 #, 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:1261 +#: builtin/remote.c:1265 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository" -#: builtin/remote.c:1263 +#: builtin/remote.c:1267 msgid "delete refs/remotes/<name>/HEAD" msgstr "entfernt refs/remotes/<Name>/HEAD" -#: builtin/remote.c:1278 +#: builtin/remote.c:1282 msgid "Cannot determine remote HEAD" msgstr "Kann HEAD des Remote-Repositories nicht bestimmen" -#: builtin/remote.c:1280 +#: builtin/remote.c:1284 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:1290 +#: builtin/remote.c:1294 #, c-format msgid "Could not delete %s" msgstr "Konnte %s nicht entfernen" -#: builtin/remote.c:1298 +#: builtin/remote.c:1302 #, c-format msgid "Not a valid ref: %s" msgstr "keine gültige Referenz: %s" -#: builtin/remote.c:1300 +#: builtin/remote.c:1304 #, c-format msgid "Could not setup %s" msgstr "Konnte %s nicht einrichten" -#: builtin/remote.c:1318 +#: builtin/remote.c:1322 #, c-format msgid " %s will become dangling!" msgstr " %s wird unreferenziert!" -#: builtin/remote.c:1319 +#: builtin/remote.c:1323 #, c-format msgid " %s has become dangling!" msgstr " %s wurde unreferenziert!" -#: builtin/remote.c:1325 +#: builtin/remote.c:1329 #, c-format msgid "Pruning %s" msgstr "entferne veraltete Branches von %s" -#: builtin/remote.c:1326 +#: builtin/remote.c:1330 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1349 +#: builtin/remote.c:1357 #, c-format msgid " * [would prune] %s" msgstr " * [würde veralteten Branch entfernen] %s" -#: builtin/remote.c:1352 +#: builtin/remote.c:1360 #, c-format msgid " * [pruned] %s" msgstr "* [veralteten Branch entfernt] %s" -#: builtin/remote.c:1397 +#: builtin/remote.c:1405 msgid "prune remotes after fetching" -msgstr "entfernt veraltete Branches im Remote-Repository nach \"fetch\"" +msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\"" -#: builtin/remote.c:1463 builtin/remote.c:1537 +#: builtin/remote.c:1471 builtin/remote.c:1545 #, c-format msgid "No such remote '%s'" msgstr "Kein solches Remote-Repository '%s'" -#: builtin/remote.c:1483 +#: builtin/remote.c:1491 msgid "add branch" -msgstr "fügt Branch hinzu" +msgstr "Branch hinzufügen" -#: builtin/remote.c:1490 +#: builtin/remote.c:1498 msgid "no remote specified" msgstr "kein Remote-Repository angegeben" -#: builtin/remote.c:1512 +#: builtin/remote.c:1520 msgid "manipulate push URLs" -msgstr "manipuliert URLs für \"push\"" +msgstr "URLs für \"push\" manipulieren" -#: builtin/remote.c:1514 +#: builtin/remote.c:1522 msgid "add URL" -msgstr "fügt URL hinzu" +msgstr "URL hinzufügen" -#: builtin/remote.c:1516 +#: builtin/remote.c:1524 msgid "delete URLs" -msgstr "löscht URLs" +msgstr "URLs löschen" -#: builtin/remote.c:1523 +#: builtin/remote.c:1531 msgid "--add --delete doesn't make sense" msgstr "" "Die Optionen --add und --delete können nicht gemeinsam verwendet werden." -#: builtin/remote.c:1563 +#: builtin/remote.c:1571 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ungültiges altes URL Format: %s" -#: builtin/remote.c:1571 +#: builtin/remote.c:1579 #, c-format msgid "No such URL found: %s" msgstr "Keine solche URL gefunden: %s" -#: builtin/remote.c:1573 +#: builtin/remote.c:1581 msgid "Will not delete all non-push URLs" msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind" -#: builtin/remote.c:1587 +#: builtin/remote.c:1595 msgid "be verbose; must be placed before a subcommand" msgstr "erweiterte Ausgaben; muss vor einem Unterkommando angegeben werden" @@ -8893,7 +9114,7 @@ msgstr "git repack [Optionen]" #: builtin/repack.c:160 msgid "pack everything in a single pack" -msgstr "packt alles in eine einzige Pack-Datei" +msgstr "alles in eine einzige Pack-Datei packen" #: builtin/repack.c:162 msgid "same as -a, and turn unreachable objects loose" @@ -8901,15 +9122,15 @@ msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht" #: builtin/repack.c:165 msgid "remove redundant packs, and run git-prune-packed" -msgstr "entfernt redundante Pakete und führt \"git-prune-packed\" aus" +msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen" #: builtin/repack.c:167 msgid "pass --no-reuse-delta to git-pack-objects" -msgstr "übergibt --no-reuse-delta an git-pack-objects" +msgstr "--no-reuse-delta an git-pack-objects übergeben" #: builtin/repack.c:169 msgid "pass --no-reuse-object to git-pack-objects" -msgstr "übergibt --no-reuse-object an git-pack-objects" +msgstr "--no-reuse-object an git-pack-objects übergeben" #: builtin/repack.c:171 msgid "do not run git-update-server-info" @@ -8917,11 +9138,11 @@ msgstr "git-update-server-info nicht ausführen" #: builtin/repack.c:174 msgid "pass --local to git-pack-objects" -msgstr "übergibt --local an git-pack-objects" +msgstr "--local an git-pack-objects übergeben" #: builtin/repack.c:176 msgid "write bitmap index" -msgstr "schreibt Bitmap-Index" +msgstr "Bitmap-Index schreiben" #: builtin/repack.c:177 msgid "approxidate" @@ -8929,7 +9150,7 @@ msgstr "Datumsangabe" #: builtin/repack.c:178 msgid "with -A, do not loosen objects older than this" -msgstr "mit -A, löscht keine Objekte älter als dieses Datum" +msgstr "mit -A, keine Objekte älter als dieses Datum löschen" #: builtin/repack.c:180 msgid "size of the window used for delta compression" @@ -8942,12 +9163,12 @@ msgstr "Bytes" #: builtin/repack.c:182 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -"gleiches wie oben, limitiert aber die Speichergröße anstatt der\n" -"Anzahl der Einträge" +"gleiches wie oben, aber die Speichergröße anstatt der\n" +"Anzahl der Einträge limitieren" #: builtin/repack.c:184 msgid "limits the maximum delta depth" -msgstr "limitiert die maximale Delta-Tiefe" +msgstr "die maximale Delta-Tiefe limitieren" #: builtin/repack.c:186 msgid "maximum size of each packfile" @@ -8956,7 +9177,7 @@ msgstr "maximale Größe für jede Paketdatei" #: builtin/repack.c:188 msgid "repack objects in packs marked with .keep" msgstr "" -"packt Objekte um, die sich in mit .keep markierten Pack-Dateien befinden" +"Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden" #: builtin/repack.c:374 #, c-format @@ -8983,22 +9204,22 @@ msgstr "git replace -d <Objekt>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<Format>] [-l [<Muster>]]" -#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388 +#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 #, c-format msgid "Not a valid object name: '%s'" msgstr "Ungültiger Objekt-Name: '%s'" -#: builtin/replace.c:352 +#: builtin/replace.c:355 #, c-format msgid "bad mergetag in commit '%s'" msgstr "ungültiger Merge-Tag in Commit '%s'" -#: builtin/replace.c:354 +#: builtin/replace.c:357 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "fehlerhafter Merge-Tag in Commit '%s'" -#: builtin/replace.c:365 +#: builtin/replace.c:368 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -9007,47 +9228,47 @@ msgstr "" "Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n" "wird; benutzen Sie --edit anstatt --graft" -#: builtin/replace.c:398 +#: builtin/replace.c:401 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "Der ursprüngliche Commit '%s' hat eine GPG-Signatur." -#: builtin/replace.c:399 +#: builtin/replace.c:402 msgid "the signature will be removed in the replacement commit!" msgstr "Die Signatur wird in dem Ersetzungs-Commit entfernt!" -#: builtin/replace.c:405 +#: builtin/replace.c:408 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Konnte Ersetzungs-Commit für '%s' nicht schreiben" -#: builtin/replace.c:429 +#: builtin/replace.c:432 msgid "list replace refs" -msgstr "listet ersetzende Referenzen auf" +msgstr "ersetzende Referenzen auflisten" -#: builtin/replace.c:430 +#: builtin/replace.c:433 msgid "delete replace refs" -msgstr "löscht ersetzende Referenzen" +msgstr "ersetzende Referenzen löschen" -#: builtin/replace.c:431 +#: builtin/replace.c:434 msgid "edit existing object" -msgstr "bearbeitet existierendes Objekt" +msgstr "existierendes Objekt bearbeiten" -#: builtin/replace.c:432 +#: builtin/replace.c:435 msgid "change a commit's parents" -msgstr "ändert Eltern-Commits eines Commits" +msgstr "Eltern-Commits eines Commits ändern" -#: builtin/replace.c:433 +#: builtin/replace.c:436 msgid "replace the ref if it exists" -msgstr "ersetzt die Referenz, wenn sie existiert" +msgstr "die Referenz ersetzen, wenn sie existiert" -#: builtin/replace.c:434 +#: builtin/replace.c:437 msgid "do not pretty-print contents for --edit" msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit" -#: builtin/replace.c:435 +#: builtin/replace.c:438 msgid "use this format" -msgstr "benutzt das angegebene Format" +msgstr "das angegebene Format benutzen" #: builtin/rerere.c:12 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" @@ -9055,159 +9276,159 @@ msgstr "git rerere [clean | forget path... | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" -msgstr "registriert saubere Auflösungen in der Staging-Area" +msgstr "saubere Auflösungen in der Staging-Area registrieren" -#: builtin/reset.c:25 +#: builtin/reset.c:26 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Commit>]" -#: builtin/reset.c:26 +#: builtin/reset.c:27 msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "git reset [-q] <Commit-Referenz> [--] <Pfade>..." -#: builtin/reset.c:27 +#: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfade>...]" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "mixed" msgstr "mixed" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "soft" msgstr "soft" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "hard" msgstr "hard" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "merge" msgstr "zusammenführen" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "keep" msgstr "keep" -#: builtin/reset.c:73 +#: builtin/reset.c:74 msgid "You do not have a valid HEAD." msgstr "Sie haben keinen gültigen HEAD." -#: builtin/reset.c:75 +#: builtin/reset.c:76 msgid "Failed to find tree of HEAD." msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD." -#: builtin/reset.c:81 +#: builtin/reset.c:82 #, c-format msgid "Failed to find tree of %s." msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s." -#: builtin/reset.c:99 +#: builtin/reset.c:100 #, c-format msgid "HEAD is now at %s" msgstr "HEAD ist jetzt bei %s" -#: builtin/reset.c:182 +#: builtin/reset.c:183 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kann keinen '%s'-Reset durchführen, während ein Merge im Gange ist." -#: builtin/reset.c:275 +#: builtin/reset.c:276 msgid "be quiet, only report errors" msgstr "weniger Ausgaben, meldet nur Fehler" -#: builtin/reset.c:277 +#: builtin/reset.c:278 msgid "reset HEAD and index" -msgstr "setzt HEAD und Staging-Area um" +msgstr "HEAD und Staging-Area umsetzen" -#: builtin/reset.c:278 +#: builtin/reset.c:279 msgid "reset only HEAD" -msgstr "setzt nur HEAD um" +msgstr "nur HEAD umsetzen" -#: builtin/reset.c:280 builtin/reset.c:282 +#: builtin/reset.c:281 builtin/reset.c:283 msgid "reset HEAD, index and working tree" -msgstr "setzt HEAD, Staging-Area und Arbeitsverzeichnis um" +msgstr "HEAD, Staging-Area und Arbeitsverzeichnis umsetzen" -#: builtin/reset.c:284 +#: builtin/reset.c:285 msgid "reset HEAD but keep local changes" -msgstr "setzt HEAD um, behält aber lokale Änderungen" +msgstr "HEAD umsetzen, aber lokale Änderungen behalten" -#: builtin/reset.c:287 +#: builtin/reset.c:288 msgid "record only the fact that removed paths will be added later" -msgstr "speichert nur, dass gelöschte Pfade später hinzugefügt werden sollen" +msgstr "nur speichern, dass gelöschte Pfade später hinzugefügt werden sollen" -#: builtin/reset.c:304 +#: builtin/reset.c:305 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Konnte '%s' nicht als gültigen Commit auflösen." -#: builtin/reset.c:307 builtin/reset.c:315 +#: builtin/reset.c:308 builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Konnte Objekt '%s' nicht parsen." -#: builtin/reset.c:312 +#: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Konnte '%s' nicht als gültiges \"Tree\"-Objekt auflösen." -#: builtin/reset.c:321 +#: builtin/reset.c:322 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}" -#: builtin/reset.c:330 +#: builtin/reset.c:331 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen 'git reset -- " "<Pfade>'." -#: builtin/reset.c:332 +#: builtin/reset.c:333 #, c-format msgid "Cannot do %s reset with paths." msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich." -#: builtin/reset.c:342 +#: builtin/reset.c:343 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "'%s'-Reset ist in einem Bare-Repository nicht erlaubt" -#: builtin/reset.c:346 +#: builtin/reset.c:347 msgid "-N can only be used with --mixed" msgstr "-N kann nur mit -mixed benutzt werden" -#: builtin/reset.c:363 +#: builtin/reset.c:364 msgid "Unstaged changes after reset:" msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:" -#: builtin/reset.c:369 +#: 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." -#: builtin/reset.c:373 +#: builtin/reset.c:374 msgid "Could not write new index file." msgstr "Konnte neue Staging-Area-Datei nicht schreiben." -#: builtin/rev-parse.c:360 +#: builtin/rev-parse.c:361 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [Optionen] -- [<Argumente>...]" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" -msgstr "lässt `--` als Argument" +msgstr "`--` als Argument lassen" -#: builtin/rev-parse.c:367 +#: builtin/rev-parse.c:368 msgid "stop parsing after the first non-option argument" -msgstr "stoppt das Parsen nach dem ersten Argument was keine Option ist" +msgstr "das Parsen nach dem ersten Argument, was keine Option ist, stoppen" -#: builtin/rev-parse.c:370 +#: builtin/rev-parse.c:371 msgid "output in stuck long form" msgstr "" "Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')" -#: builtin/rev-parse.c:498 +#: builtin/rev-parse.c:499 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -9245,23 +9466,23 @@ msgstr "%s: %s kann nicht mit %s verwendet werden" #: builtin/revert.c:80 msgid "end revert or cherry-pick sequence" -msgstr "beendet \"revert\" oder \"cherry-pick\" Ablauf" +msgstr "\"revert\" oder \"cherry-pick\" Ablauf beenden" #: builtin/revert.c:81 msgid "resume revert or cherry-pick sequence" -msgstr "setzt \"revert\" oder \"cherry-pick\" Ablauf fort" +msgstr "\"revert\" oder \"cherry-pick\" Ablauf fortsetzen" #: builtin/revert.c:82 msgid "cancel revert or cherry-pick sequence" -msgstr "bricht \"revert\" oder \"cherry-pick\" Ablauf ab" +msgstr "\"revert\" oder \"cherry-pick\" Ablauf abbrechen" #: builtin/revert.c:83 msgid "don't automatically commit" -msgstr "committet nicht automatisch" +msgstr "nicht automatisch committen" #: builtin/revert.c:84 msgid "edit the commit message" -msgstr "Bearbeitung der Commit-Beschreibung" +msgstr "Commit-Beschreibung bearbeiten" #: builtin/revert.c:87 msgid "parent number" @@ -9281,23 +9502,23 @@ msgstr "Option für Merge-Strategie" #: builtin/revert.c:104 msgid "append commit name" -msgstr "hängt Commit-Namen an" +msgstr "Commit-Namen anhängen" #: builtin/revert.c:105 msgid "allow fast-forward" -msgstr "erlaubt Vorspulen" +msgstr "Vorspulen erlauben" #: builtin/revert.c:106 msgid "preserve initially empty commits" -msgstr "erhält ursprüngliche, leere Commits" +msgstr "ursprüngliche, leere Commits erhalten" #: builtin/revert.c:107 msgid "allow commits with empty messages" -msgstr "erlaubt Commits mit leerer Beschreibung" +msgstr "Commits mit leerer Beschreibung erlauben" #: builtin/revert.c:108 msgid "keep redundant, empty commits" -msgstr "behält redundante, leere Commits" +msgstr "redundante, leere Commits behalten" #: builtin/revert.c:112 msgid "program error" @@ -9320,7 +9541,7 @@ msgid "" "the following submodule (or one of its nested submodules)\n" "uses a .git directory:" msgid_plural "" -"the following submodules (or one of its nested submodules)\n" +"the following submodules (or one of their nested submodules)\n" "use a .git directory:" msgstr[0] "" "das folgende Submodul (oder ein geschachteltes Submodul hiervon)\n" @@ -9384,23 +9605,30 @@ msgstr[1] "die folgenden Dateien haben lokale Änderungen:" #: builtin/rm.c:270 msgid "do not list removed files" -msgstr "listet keine gelöschten Dateien auf" +msgstr "keine gelöschten Dateien auflisten" #: builtin/rm.c:271 msgid "only remove from the index" -msgstr "entfernt nur aus der Staging-Area" +msgstr "nur aus der Staging-Area entfernen" #: builtin/rm.c:272 msgid "override the up-to-date check" -msgstr "überschreibt die \"up-to-date\" Prüfung" +msgstr "die \"up-to-date\" Prüfung überschreiben" #: builtin/rm.c:273 msgid "allow recursive removal" -msgstr "erlaubt rekursive Entfernung" +msgstr "rekursive Entfernung erlauben" #: builtin/rm.c:275 msgid "exit with a zero status even if nothing matched" -msgstr "beendet mit Rückgabewert 0, wenn keine Übereinstimmung gefunden wurde" +msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde" + +#: builtin/rm.c:318 +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 #, c-format @@ -9423,15 +9651,15 @@ msgstr "fehlender Autor: %s" #: builtin/shortlog.c:230 msgid "sort output according to the number of commits per author" -msgstr "sortiert die Ausgabe entsprechend der Anzahl von Commits pro Autor" +msgstr "die Ausgabe entsprechend der Anzahl von Commits pro Autor sortieren" #: builtin/shortlog.c:232 msgid "Suppress commit descriptions, only provides commit count" -msgstr "Unterdrückt Commit-Beschreibungen, liefert nur Anzahl der Commits" +msgstr "Commit-Beschreibungen unterdrücken, nur Anzahl der Commits liefern" #: builtin/shortlog.c:234 msgid "Show the email address of each author" -msgstr "Zeigt die E-Mail-Adresse von jedem Autor" +msgstr "die E-Mail-Adresse von jedem Autor anzeigen" #: builtin/shortlog.c:235 msgid "w[,i1[,i2]]" @@ -9459,19 +9687,19 @@ msgstr "git show-branch (-g|--reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]" #: builtin/show-branch.c:649 msgid "show remote-tracking and local branches" -msgstr "zeigt Remote-Tracking und lokale Branches an" +msgstr "Remote-Tracking und lokale Branches anzeigen" #: builtin/show-branch.c:651 msgid "show remote-tracking branches" -msgstr "zeigt Remote-Tracking-Branches an" +msgstr "Remote-Tracking-Branches anzeigen" #: builtin/show-branch.c:653 msgid "color '*!+-' corresponding to the branch" -msgstr "färbt '*!+-' entsprechend des Branches ein" +msgstr "'*!+-' entsprechend des Branches einfärben" #: builtin/show-branch.c:655 msgid "show <n> more commits after the common ancestor" -msgstr "zeigt <n> weitere Commits nach dem gemeinsamen Vorgänger-Commit" +msgstr "<n> weitere Commits nach dem gemeinsamen Vorgänger-Commit anzeigen" #: builtin/show-branch.c:657 msgid "synonym to more=-1" @@ -9479,35 +9707,36 @@ msgstr "Synonym für more=-1" #: builtin/show-branch.c:658 msgid "suppress naming strings" -msgstr "unterdrückt Namen" +msgstr "Namen unterdrücken" #: builtin/show-branch.c:660 msgid "include the current branch" -msgstr "bezieht den aktuellen Branch ein" +msgstr "den aktuellen Branch einbeziehen" #: builtin/show-branch.c:662 msgid "name commits with their object names" -msgstr "benennt Commits nach ihren Objektnamen" +msgstr "Commits nach ihren Objektnamen benennen" #: builtin/show-branch.c:664 msgid "show possible merge bases" -msgstr "zeigt mögliche Merge-Basen an" +msgstr "mögliche Merge-Basen anzeigen" #: builtin/show-branch.c:666 msgid "show refs unreachable from any other ref" -msgstr "zeigt Referenzen die unerreichbar von allen anderen Referenzen sind" +msgstr "" +"Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen" #: builtin/show-branch.c:668 msgid "show commits in topological order" -msgstr "zeigt Commits in topologischer Ordnung" +msgstr "Commits in topologischer Ordnung anzeigen" #: builtin/show-branch.c:671 msgid "show only commits not on the first branch" -msgstr "zeigt nur Commits, die sich nicht im ersten Branch befinden" +msgstr "nur Commits anzeigen, die sich nicht im ersten Branch befinden" #: builtin/show-branch.c:673 msgid "show merges reachable from only one tip" -msgstr "zeigt Merges, die nur von einem Branch aus erreichbar sind" +msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind" #: builtin/show-branch.c:675 msgid "topologically sort, maintaining date order where possible" @@ -9519,7 +9748,7 @@ msgstr "<n>[,<Basis>]" #: builtin/show-branch.c:679 msgid "show <n> most recent ref-log entries starting at base" -msgstr "zeigt die <n> jüngsten Einträge im Reflog beginnend an der Basis" +msgstr "die <n> jüngsten Einträge im Reflog, beginnend an der Basis, anzeigen" #: builtin/show-ref.c:10 msgid "" @@ -9535,11 +9764,11 @@ msgstr "git show-ref --exclude-existing[=Muster] < ref-list" #: builtin/show-ref.c:168 msgid "only show tags (can be combined with heads)" -msgstr "zeigt nur Tags (kann mit \"heads\" kombiniert werden)" +msgstr "nur Tags anzeigen (kann mit \"heads\" kombiniert werden)" #: builtin/show-ref.c:169 msgid "only show heads (can be combined with tags)" -msgstr "zeigt nur Branches (kann mit \"tags\" kombiniert werden)" +msgstr "nur Branches anzeigen (kann mit \"tags\" kombiniert werden)" #: builtin/show-ref.c:170 msgid "stricter reference checking, requires exact ref path" @@ -9547,15 +9776,16 @@ msgstr "strengere Referenzprüfung, erfordert exakten Referenzpfad" #: builtin/show-ref.c:173 builtin/show-ref.c:175 msgid "show the HEAD reference, even if it would be filtered out" -msgstr "zeigt die HEAD-Referenz, selbst wenn diese ausgefiltert werden würde" +msgstr "" +"die HEAD-Referenz anzeigen, selbst wenn diese ausgefiltert werden würde" #: builtin/show-ref.c:177 msgid "dereference tags into object IDs" -msgstr "dereferenziert Tags in Objekt-Identifikationen" +msgstr "Tags in Objekt-Identifikationen dereferenzieren" #: builtin/show-ref.c:179 msgid "only show SHA1 hash using <n> digits" -msgstr "zeigt nur SHA1 Hash mit <n> Ziffern" +msgstr "nur SHA1 Hash mit <n> Ziffern anzeigen" #: builtin/show-ref.c:183 msgid "do not print results to stdout (useful with --verify)" @@ -9565,8 +9795,8 @@ msgstr "" #: builtin/show-ref.c:185 msgid "show refs from stdin that aren't in local repository" msgstr "" -"zeigt Referenzen von der Standard-Eingabe, die sich nicht im lokalen " -"Repository befinden, an" +"Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen " +"Repository befinden" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [options] name [ref]" @@ -9579,21 +9809,21 @@ msgstr "git symbolic-ref -d [-q] name" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" msgstr "" -"unterdrückt Fehlermeldungen für nicht-symbolische (losgelöste) Referenzen" +"Fehlermeldungen für nicht-symbolische (losgelöste) Referenzen unterdrücken" #: builtin/symbolic-ref.c:41 msgid "delete symbolic ref" -msgstr "löscht symbolische Referenzen" +msgstr "symbolische Referenzen löschen" #: builtin/symbolic-ref.c:42 msgid "shorten ref output" msgstr "verkürzte Ausgabe der Referenzen" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "Grund" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "Grund für die Aktualisierung" @@ -9717,244 +9947,234 @@ msgstr "Option 'points-at' erfordert ein Objekt" msgid "malformed object name '%s'" msgstr "fehlerhafter Objekt-Name '%s'" -#: builtin/tag.c:588 +#: builtin/tag.c:589 msgid "list tag names" -msgstr "listet Tagnamen auf" +msgstr "Tagnamen auflisten" -#: builtin/tag.c:590 +#: builtin/tag.c:591 msgid "print <n> lines of each tag message" -msgstr "zeigt <n> Zeilen jeder Tag-Beschreibung" +msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen" -#: builtin/tag.c:592 +#: builtin/tag.c:593 msgid "delete tags" -msgstr "löscht Tags" +msgstr "Tags löschen" -#: builtin/tag.c:593 +#: builtin/tag.c:594 msgid "verify tags" -msgstr "überprüft Tags" +msgstr "Tags überprüfen" -#: builtin/tag.c:595 +#: builtin/tag.c:596 msgid "Tag creation options" msgstr "Optionen für Erstellung von Tags" -#: builtin/tag.c:597 +#: builtin/tag.c:598 msgid "annotated tag, needs a message" msgstr "annotiertes Tag, benötigt eine Beschreibung" -#: builtin/tag.c:599 +#: builtin/tag.c:600 msgid "tag message" msgstr "Tag-Beschreibung" -#: builtin/tag.c:601 +#: builtin/tag.c:602 msgid "annotated and GPG-signed tag" msgstr "annotiertes und GPG-signiertes Tag" -#: builtin/tag.c:605 +#: builtin/tag.c:606 msgid "use another key to sign the tag" -msgstr "verwendet einen anderen Schlüssel, um das Tag zu signieren" +msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren" -#: builtin/tag.c:606 +#: builtin/tag.c:607 msgid "replace the tag if exists" -msgstr "ersetzt das Tag, wenn es existiert" +msgstr "das Tag ersetzen, wenn es existiert" -#: builtin/tag.c:607 +#: builtin/tag.c:608 msgid "show tag list in columns" -msgstr "zeigt Liste der Tags in Spalten" +msgstr "Liste der Tags in Spalten anzeigen" -#: builtin/tag.c:609 +#: builtin/tag.c:610 msgid "sort tags" -msgstr "sortiert Tags" +msgstr "Tags sortieren" -#: builtin/tag.c:613 +#: builtin/tag.c:614 msgid "Tag listing options" msgstr "Optionen für Auflistung der Tags" -#: builtin/tag.c:616 builtin/tag.c:622 +#: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" -msgstr "gibt nur Tags aus, die diesen Commit beinhalten" +msgstr "nur Tags ausgeben, die diesen Commit beinhalten" -#: builtin/tag.c:628 +#: builtin/tag.c:629 msgid "print only tags of the object" -msgstr "gibt nur Tags von dem Objekt aus" +msgstr "nur Tags von dem Objekt ausgeben" -#: builtin/tag.c:654 +#: builtin/tag.c:655 msgid "--column and -n are incompatible" msgstr "--column und -n sind inkompatibel" -#: builtin/tag.c:666 +#: builtin/tag.c:667 msgid "--sort and -n are incompatible" msgstr "--sort und -n sind inkompatibel" -#: builtin/tag.c:673 +#: builtin/tag.c:674 msgid "-n option is only allowed with -l." msgstr "-n Option ist nur erlaubt mit -l." -#: builtin/tag.c:675 +#: builtin/tag.c:676 msgid "--contains option is only allowed with -l." msgstr "--contains Option ist nur erlaubt mit -l." -#: builtin/tag.c:677 +#: builtin/tag.c:678 msgid "--points-at option is only allowed with -l." msgstr "--points-at Option ist nur erlaubt mit -l." -#: builtin/tag.c:685 +#: builtin/tag.c:686 msgid "only one -F or -m option is allowed." msgstr "nur eine -F oder -m Option ist erlaubt." -#: builtin/tag.c:705 +#: builtin/tag.c:706 msgid "too many params" msgstr "zu viele Parameter" -#: builtin/tag.c:711 +#: builtin/tag.c:712 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ist kein gültiger Tagname." -#: builtin/tag.c:716 +#: builtin/tag.c:717 #, c-format msgid "tag '%s' already exists" msgstr "Tag '%s' existiert bereits" -#: builtin/tag.c:734 -#, c-format -msgid "%s: cannot lock the ref" -msgstr "%s: kann Referenz nicht sperren" - -#: builtin/tag.c:736 -#, c-format -msgid "%s: cannot update the ref" -msgstr "%s: kann Referenz nicht aktualisieren" - -#: builtin/tag.c:738 +#: builtin/tag.c:741 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aktualisiert (war %s)\n" -#: builtin/unpack-objects.c:483 +#: builtin/unpack-objects.c:489 msgid "Unpacking objects" msgstr "Entpacke Objekte" -#: builtin/update-index.c:402 +#: builtin/update-index.c:403 msgid "git update-index [options] [--] [<file>...]" msgstr "git update-index [Optionen] [--] [<Datei>...]" -#: builtin/update-index.c:755 +#: builtin/update-index.c:756 msgid "continue refresh even when index needs update" msgstr "" "Aktualisierung fortsetzen, auch wenn die Staging-Area aktualisiert werden " "muss" -#: builtin/update-index.c:758 +#: builtin/update-index.c:759 msgid "refresh: ignore submodules" msgstr "Aktualisierung: ignoriert Submodule" -#: builtin/update-index.c:761 +#: builtin/update-index.c:762 msgid "do not ignore new files" -msgstr "ignoriert keine neuen Dateien" +msgstr "keine neuen Dateien ignorieren" -#: builtin/update-index.c:763 +#: builtin/update-index.c:764 msgid "let files replace directories and vice-versa" -msgstr "lässt Dateien Verzeichnisse ersetzen, und umgedreht" +msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht" -#: builtin/update-index.c:765 +#: builtin/update-index.c:766 msgid "notice files missing from worktree" -msgstr "beachtet fehlende Dateien im Arbeitsverzeichnis" +msgstr "fehlende Dateien im Arbeitsverzeichnis beachten" -#: builtin/update-index.c:767 +#: builtin/update-index.c:768 msgid "refresh even if index contains unmerged entries" msgstr "" -"aktualisiert, auch wenn die Staging-Area nicht zusammengeführte Einträge " +"aktualisieren, auch wenn die Staging-Area nicht zusammengeführte Einträge " "beinhaltet" -#: builtin/update-index.c:770 +#: builtin/update-index.c:771 msgid "refresh stat information" -msgstr "aktualisiert Dateiinformationen" +msgstr "Dateiinformationen aktualisieren" -#: builtin/update-index.c:774 +#: builtin/update-index.c:775 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung" -#: builtin/update-index.c:778 +#: builtin/update-index.c:779 msgid "<mode>,<object>,<path>" msgstr "<Modus>,<Objekt>,<Pfad>" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "add the specified entry to the index" -msgstr "merkt den angegebenen Eintrag zum Commit vor" +msgstr "den angegebenen Eintrag zum Commit vormerken" -#: builtin/update-index.c:783 +#: builtin/update-index.c:784 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "override the executable bit of the listed files" -msgstr "überschreibt das \"ausführbar\"-Bit der aufgelisteten Dateien" +msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben" -#: builtin/update-index.c:788 +#: builtin/update-index.c:789 msgid "mark files as \"not changing\"" -msgstr "betrachte diese Datei immer als unverändert" +msgstr "diese Datei immer als unverändert betrachten" -#: builtin/update-index.c:791 +#: builtin/update-index.c:792 msgid "clear assumed-unchanged bit" -msgstr "löscht \"assumed-unchanged\"-Bit" +msgstr "\"assumed-unchanged\"-Bit löschen" -#: builtin/update-index.c:794 +#: builtin/update-index.c:795 msgid "mark files as \"index-only\"" -msgstr "markiert Dateien als \"index-only\"" +msgstr "Dateien als \"index-only\" markieren" -#: builtin/update-index.c:797 +#: builtin/update-index.c:798 msgid "clear skip-worktree bit" -msgstr "löscht \"skip-worktree\"-Bit" +msgstr "\"skip-worktree\"-Bit löschen" -#: builtin/update-index.c:800 +#: builtin/update-index.c:801 msgid "add to index only; do not add content to object database" msgstr "" -"merkt die Änderungen nur zum Commit vor; Inhalt wird nicht der Objekt-" +"die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-" "Datenbank hinzugefügt" -#: builtin/update-index.c:802 +#: builtin/update-index.c:803 msgid "remove named paths even if present in worktree" msgstr "" -"löscht benannte Pfade, auch wenn sie sich im Arbeitsverzeichnis befinden" +"benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden" -#: builtin/update-index.c:804 +#: builtin/update-index.c:805 msgid "with --stdin: input lines are terminated by null bytes" msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen" -#: builtin/update-index.c:806 +#: builtin/update-index.c:807 msgid "read list of paths to be updated from standard input" -msgstr "liest Liste der zu aktualisierenden Pfade von der Standard-Eingabe" +msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen" -#: builtin/update-index.c:810 +#: builtin/update-index.c:811 msgid "add entries from standard input to the index" -msgstr "merkt Einträge von der Standard-Eingabe zum Commit vor" +msgstr "Einträge von der Standard-Eingabe zum Commit vormerken" -#: builtin/update-index.c:814 +#: builtin/update-index.c:815 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:818 +#: builtin/update-index.c:819 msgid "only update entries that differ from HEAD" -msgstr "aktualisiert nur Einträge, die unterschiedlich zu HEAD sind" +msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind" -#: builtin/update-index.c:822 +#: builtin/update-index.c:823 msgid "ignore files missing from worktree" -msgstr "ignoriert fehlende Dateien im Arbeitsverzeichnis" +msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren" -#: builtin/update-index.c:825 +#: builtin/update-index.c:826 msgid "report actions to standard output" -msgstr "gibt die Aktionen in der Standard-Ausgabe aus" +msgstr "die Aktionen in der Standard-Ausgabe ausgeben" -#: builtin/update-index.c:827 +#: builtin/update-index.c:828 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte" -#: builtin/update-index.c:831 +#: builtin/update-index.c:832 msgid "write index in this format" -msgstr "schreibt Staging-Area-Datei in diesem Format" +msgstr "Staging-Area-Datei in diesem Format schreiben" -#: builtin/update-index.c:833 +#: builtin/update-index.c:834 msgid "enable or disable split index" msgstr "Aktivierung oder Deaktivierung des Splittings der Staging-Area" @@ -9970,21 +10190,21 @@ msgstr "git update-ref [Optionen] <Referenzname> <neuerWert> [<alterWert>]" msgid "git update-ref [options] --stdin [-z]" msgstr "git update-ref [Optionen] --stdin [-z]" -#: builtin/update-ref.c:350 +#: builtin/update-ref.c:363 msgid "delete the reference" -msgstr "löscht diese Referenz" +msgstr "diese Referenz löschen" -#: builtin/update-ref.c:352 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" -msgstr "aktualisiert <Referenzname>, nicht den Verweis" +msgstr "<Referenzname> aktualisieren, nicht den Verweis" -#: builtin/update-ref.c:353 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente" -#: builtin/update-ref.c:354 +#: builtin/update-ref.c:367 msgid "read updates from stdin" -msgstr "liest Aktualisierungen von der Standard-Eingabe" +msgstr "Aktualisierungen von der Standard-Eingabe lesen" #: builtin/update-server-info.c:6 msgid "git update-server-info [--force]" @@ -9992,7 +10212,7 @@ msgstr "git update-server-info [--force]" #: builtin/update-server-info.c:14 msgid "update the info files from scratch" -msgstr "aktualisiert die Informationsdateien von Grund auf" +msgstr "die Informationsdateien von Grund auf aktualisieren" #: builtin/verify-commit.c:17 msgid "git verify-commit [-v|--verbose] <commit>..." @@ -10000,19 +10220,19 @@ msgstr "git verify-commit [-v|--verbose] <Commit>..." #: builtin/verify-commit.c:75 msgid "print commit contents" -msgstr "gibt Commit-Inhalte aus" +msgstr "Commit-Inhalte ausgeben" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:54 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <Paket>..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:64 msgid "verbose" msgstr "erweiterte Ausgaben" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:66 msgid "show statistics only" -msgstr "zeigt nur Statistiken" +msgstr "nur Statistiken anzeigen" #: builtin/verify-tag.c:17 msgid "git verify-tag [-v|--verbose] <tag>..." @@ -10020,7 +10240,7 @@ msgstr "git verify-tag [-v|--verbose] <Tag>..." #: builtin/verify-tag.c:73 msgid "print tag contents" -msgstr "gibt Tag-Inhalte aus" +msgstr "Tag-Inhalte ausgeben" #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" @@ -10032,15 +10252,19 @@ msgstr "<Präfix>/" #: builtin/write-tree.c:27 msgid "write tree object for a subdirectory <prefix>" -msgstr "schreibt das \"Tree\"-Objekt für ein Unterverzeichnis <Präfix>" +msgstr "das \"Tree\"-Objekt für ein Unterverzeichnis <Präfix> schreiben" #: builtin/write-tree.c:30 msgid "only useful for debugging" msgstr "nur nützlich für Fehlersuche" +#: credential-cache--daemon.c:267 +msgid "print debugging messages to stderr" +msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben" + #: git.c:17 msgid "" -"'git help -a' and 'git help -g' lists available subcommands and some\n" +"'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" @@ -10049,118 +10273,124 @@ msgstr "" "oder 'git help <Konzept>', um mehr über ein spezifisches Kommando oder\n" "Konzept zu erfahren." -#: parse-options.h:143 -msgid "expiry-date" -msgstr "Verfallsdatum" - -#: parse-options.h:158 -msgid "no-op (backward compatibility)" -msgstr "Kein Effekt (Rückwärtskompatibilität)" - -#: parse-options.h:232 -msgid "be more verbose" -msgstr "erweiterte Ausgaben" - -#: parse-options.h:234 -msgid "be more quiet" -msgstr "weniger Ausgaben" - -#: parse-options.h:240 -msgid "use <n> digits to display SHA-1s" -msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" - #: common-cmds.h:8 msgid "Add file contents to the index" -msgstr "merkt Dateiinhalte zum Commit vor" +msgstr "Dateiinhalte zum Commit vormerken" #: common-cmds.h:9 msgid "Find by binary search the change that introduced a bug" msgstr "" -"Findet über eine Binärsuche die Änderungen, die einen Fehler verursacht haben" +"über eine Binärsuche die Änderungen finden, die einen Fehler verursacht haben" #: common-cmds.h:10 msgid "List, create, or delete branches" -msgstr "Zeigt an, erstellt oder entfernt Branches" +msgstr "Branches anzeigen, erstellen oder entfernen" #: common-cmds.h:11 msgid "Checkout a branch or paths to the working tree" -msgstr "Checkt Branches oder Pfade im Arbeitsverzeichnis aus" +msgstr "Branches oder Pfade im Arbeitsverzeichnis auschecken" #: common-cmds.h:12 msgid "Clone a repository into a new directory" -msgstr "Klont ein Repository in einem neuen Verzeichnis" +msgstr "ein Repository in einem neuen Verzeichnis klonen" #: common-cmds.h:13 msgid "Record changes to the repository" -msgstr "Trägt Änderungen in das Repository ein" +msgstr "Änderungen in das Repository eintragen" #: common-cmds.h:14 msgid "Show changes between commits, commit and working tree, etc" msgstr "" -"Zeigt Änderungen zwischen Commits, Commit und Arbeitsverzeichnis, etc. an" +"Änderungen zwischen Commits, Commit und Arbeitsverzeichnis, etc. anzeigen" #: common-cmds.h:15 msgid "Download objects and refs from another repository" -msgstr "Lädt Objekte und Referenzen von einem anderen Repository herunter" +msgstr "Objekte und Referenzen von einem anderen Repository herunterladen" #: common-cmds.h:16 msgid "Print lines matching a pattern" -msgstr "Stellt Zeilen dar, die einem Muster entsprechen" +msgstr "Zeilen darstellen, die einem Muster entsprechen" #: common-cmds.h:17 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" -"Erstellt ein leeres Git-Repository oder initialisiert ein bestehendes neu" +"ein leeres Git-Repository erstellen oder ein bestehendes neuinitialisieren" #: common-cmds.h:18 msgid "Show commit logs" -msgstr "Zeigt Commit-Historie an" +msgstr "Commit-Historie anzeigen" #: common-cmds.h:19 msgid "Join two or more development histories together" -msgstr "Führt zwei oder mehr Entwicklungszweige zusammen" +msgstr "zwei oder mehr Entwicklungszweige zusammenführen" #: common-cmds.h:20 msgid "Move or rename a file, a directory, or a symlink" msgstr "" -"Verschiebt oder benennt eine Datei, ein Verzeichnis, oder einen symbolischen " -"Verweis um" +"eine Datei, ein Verzeichnis, oder einen symbolischen Verweis verschieben " +"oder umbenennen" #: common-cmds.h:21 msgid "Fetch from and integrate with another repository or a local branch" msgstr "" -"Fordert Objekte von einem externen Repository an und führt sie mit einem " -"anderen Repository oder einem lokalen Branch zusammen" +"Objekte von einem externen Repository anfordern und sie mit einem anderen " +"Repository oder einem lokalen Branch zusammenführen" #: common-cmds.h:22 msgid "Update remote refs along with associated objects" -msgstr "Aktualisiert Remote-Referenzen mitsamt den verbundenen Objekten" +msgstr "Remote-Referenzen mitsamt den verbundenen Objekten aktualisieren" #: common-cmds.h:23 msgid "Forward-port local commits to the updated upstream head" -msgstr "Baut lokale Commits auf einem aktuellerem Upstream-Branch neu auf" +msgstr "lokale Commits auf einem aktuellerem Upstream-Branch neu aufbauen" #: common-cmds.h:24 msgid "Reset current HEAD to the specified state" -msgstr "Setzt aktuellen HEAD zu einem spezifizierten Zustand" +msgstr "aktuellen HEAD zu einem spezifizierten Zustand setzen" #: common-cmds.h:25 msgid "Remove files from the working tree and from the index" -msgstr "Löscht Dateien im Arbeitsverzeichnis und von der Staging-Area" +msgstr "Dateien im Arbeitsverzeichnis und von der Staging-Area löschen" #: common-cmds.h:26 msgid "Show various types of objects" -msgstr "Zeigt verschiedene Arten von Objekten an" +msgstr "verschiedene Arten von Objekten anzeigen" #: common-cmds.h:27 msgid "Show the working tree status" -msgstr "Zeigt den Zustand des Arbeitsverzeichnisses an" +msgstr "den Zustand des Arbeitsverzeichnisses anzeigen" #: common-cmds.h:28 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" -"Erzeugt, listet auf, löscht oder verifiziert ein mit GPG signiertes Tag-" -"Objekt" +"ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, löschen oder " +"verifizieren." + +#: parse-options.h:143 +msgid "expiry-date" +msgstr "Verfallsdatum" + +#: parse-options.h:158 +msgid "no-op (backward compatibility)" +msgstr "Kein Effekt (Rückwärtskompatibilität)" + +#: parse-options.h:232 +msgid "be more verbose" +msgstr "erweiterte Ausgaben" + +#: parse-options.h:234 +msgid "be more quiet" +msgstr "weniger Ausgaben" + +#: parse-options.h:240 +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" #: git-am.sh:52 msgid "You need to set your committer info first" @@ -10347,7 +10577,7 @@ msgstr "" #: git-am.sh:902 msgid "applying to an empty history" -msgstr "wende zu leerer Historie an" +msgstr "auf leere Historie anwenden" #: git-bisect.sh:48 msgid "You need to start by \"git bisect start\"" @@ -10427,7 +10657,7 @@ msgstr "Sind Sie sicher [Y/n]? " #: git-bisect.sh:289 msgid "" -"You need to give me at least one good and one bad revisions.\n" +"You need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Sie müssen mindestens einen korrekten und einen fehlerhaften Commit " @@ -10437,7 +10667,7 @@ msgstr "" #: git-bisect.sh:292 msgid "" "You need to start by \"git bisect start\".\n" -"You then need to give me at least one good and one bad revisions.\n" +"You then need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Sie müssen mit \"git bisect start\" beginnen.\n" @@ -10511,18 +10741,26 @@ msgstr "'bisect run' erfolgreich ausgeführt" 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, or use 'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" "\"pull\" ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben.\n" -"Bitte korrigieren Sie dies im Arbeitsverzeichnis und benutzen Sie dann \n" -"'git add/rm <Datei>', um die Auflösung entsprechend zu markieren, oder\n" -"benutzen Sie 'git commit -a'." +"Bitte korrigieren Sie dies im Arbeitsverzeichnis und benutzen Sie dann\n" +"'git add/rm <Datei>', um die Auflösung entsprechend zu markieren und zu\n" +"committen." #: git-pull.sh:25 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 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" +"Bitte committen Sie Ihre Änderungen, bevor Sie \"merge\" ausführen können." + #: git-pull.sh:245 msgid "updating an unborn branch with changes added to the index" msgstr "" @@ -10785,7 +11023,7 @@ msgstr "Zu viele Commits angegeben: $REV" #: git-stash.sh:397 #, sh-format -msgid "$reference is not valid reference" +msgid "$reference is not a valid reference" msgstr "$reference ist keine gültige Referenz" #: git-stash.sh:425 @@ -10832,11 +11070,11 @@ msgstr "Gelöscht ${REV} ($s)" msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen" -#: git-stash.sh:538 +#: git-stash.sh:539 msgid "No branch name specified" msgstr "Kein Branchname spezifiziert" -#: git-stash.sh:610 +#: git-stash.sh:611 msgid "(To restore them type \"git stash apply\")" msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)" @@ -11152,6 +11390,36 @@ msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'" msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisiere Submodul-URL für '$displaypath'" +#~ msgid "Failed to lock ref for update" +#~ msgstr "Fehler beim Sperren der Referenz zur Aktualisierung." + +#~ msgid "Failed to write ref" +#~ msgstr "Fehler beim Schreiben der Referenz." + +#~ msgid "Failed to lock HEAD during fast_forward_to" +#~ msgstr "Fehler beim Sperren von HEAD während fast_forward_to" + +#~ msgid "invalid commit: %s" +#~ msgstr "Ungültiger Commit: %s" + +#~ msgid "cannot lock HEAD ref" +#~ msgstr "Kann Referenz von HEAD nicht sperren." + +#~ 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" + +#~ msgid "%s: cannot lock the ref" +#~ msgstr "%s: kann Referenz nicht sperren" + +#~ msgid "%s: cannot update the ref" +#~ msgstr "%s: kann Referenz nicht aktualisieren" + #~ msgid "commit has empty message" #~ msgstr "Commit hat eine leere Beschreibung" @@ -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: 2014-08-04 14:48+0800\n" -"PO-Revision-Date: 2014-08-05 19:23+0200\n" +"POT-Creation-Date: 2014-11-20 09:42+0800\n" +"PO-Revision-Date: 2014-11-20 16:10+0800\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" @@ -91,107 +91,105 @@ msgstr "astuce: %.*s\n" #: advice.c:88 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, or use\n" -"'git commit -a'." +"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,\n" -"ou utilisez 'git commit -a'." +"nécessaire pour marquer la résolution et valider." -#: archive.c:10 +#: archive.c:11 msgid "git archive [options] <tree-ish> [<path>...]" msgstr "git archive [options] <arbre ou apparenté> [<chemin>...]" -#: archive.c:11 +#: archive.c:12 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:12 +#: archive.c:13 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" msgstr "" "git archive --remote <dépôt> [--exec <commande>] [options] <arbre ou " "apparenté> [<chemin>...]" -#: archive.c:13 +#: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" -#: archive.c:328 +#: archive.c:419 msgid "fmt" msgstr "fmt" -#: archive.c:328 +#: archive.c:419 msgid "archive format" msgstr "format d'archive" -#: archive.c:329 builtin/log.c:1201 +#: archive.c:420 builtin/log.c:1204 msgid "prefix" msgstr "préfixe" -#: archive.c:330 +#: archive.c:421 msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709 -#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412 -#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151 +#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411 +#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "fichier" -#: archive.c:332 builtin/archive.c:89 +#: archive.c:423 builtin/archive.c:89 msgid "write the archive to this file" msgstr "écrire l'archive dans ce fichier" -#: archive.c:334 +#: archive.c:425 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le répertoire de travail" -#: archive.c:335 +#: archive.c:426 msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" -#: archive.c:336 +#: archive.c:427 msgid "store only" msgstr "stockage seulement" -#: archive.c:337 +#: archive.c:428 msgid "compress faster" msgstr "compression rapide" -#: archive.c:345 +#: archive.c:436 msgid "compress better" msgstr "compression efficace" -#: archive.c:348 +#: archive.c:439 msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 +#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85 msgid "repo" msgstr "dépôt" -#: archive.c:351 builtin/archive.c:91 +#: archive.c:442 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "récupérer l'archive depuis le dépôt distant <dépôt>" -#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 +#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490 msgid "command" msgstr "commande" -#: archive.c:353 builtin/archive.c:93 +#: archive.c:444 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" -#: attr.c:259 +#: attr.c:258 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -256,33 +254,33 @@ msgstr "La branche %s est paramétrée pour suivre la référence locale %s." msgid "Not tracking: ambiguous information for ref %s" msgstr "Pas de suivi : information ambiguë pour la référence %s" -#: branch.c:178 +#: branch.c:162 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' n'est pas un nom de branche valide." -#: branch.c:183 +#: branch.c:167 #, c-format msgid "A branch named '%s' already exists." msgstr "Une branche nommée '%s' existe déjà." -#: branch.c:191 +#: branch.c:175 msgid "Cannot force update the current branch." msgstr "Impossible de forcer la mise à jour de la branche courante." -#: branch.c:211 +#: branch.c:195 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est " "pas une branche." -#: branch.c:213 +#: branch.c:197 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la branche amont demandée '%s' n'existe pas" -#: branch.c:215 +#: branch.c:199 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -302,107 +300,105 @@ msgstr "" "sa jumelle distante, vous pouvez utiliser \"git push -u\"\n" "pour paramétrer le suivi distant en même temps que vous poussez." -#: branch.c:260 +#: branch.c:243 #, c-format msgid "Not a valid object name: '%s'." msgstr "Nom d'objet invalide : '%s'." -#: branch.c:280 +#: branch.c:263 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nom d'objet ambigu : '%s'." -#: branch.c:285 +#: branch.c:268 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Point d'embranchement invalide : '%s'." -#: branch.c:291 -msgid "Failed to lock ref for update" -msgstr "Échec du verrouillage de la référence pour mise à jour" - -#: branch.c:309 -msgid "Failed to write ref" -msgstr "Échec de l'écriture de la référence" - -#: bundle.c:33 +#: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ne semble pas être un fichier bundle v2" -#: bundle.c:60 +#: bundle.c:61 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:86 builtin/commit.c:755 +#: bundle.c:87 builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" -#: bundle.c:138 +#: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" -#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330 -#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357 +#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706 +#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" -#: bundle.c:184 +#: bundle.c:185 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Le colis contient cette référence :" msgstr[1] "Le colis contient ces %d références :" -#: bundle.c:191 +#: bundle.c:192 msgid "The bundle records a complete history." msgstr "Le colis enregistre l'historique complet." -#: bundle.c:193 +#: bundle.c:194 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Le colis exige cette référence :" msgstr[1] "Le colis exige ces %d références :" -#: bundle.c:289 +#: bundle.c:251 +msgid "Could not spawn pack-objects" +msgstr "Impossible de créer des objets groupés" + +#: bundle.c:269 +msgid "pack-objects died" +msgstr "les objets groupés ont disparu" + +#: bundle.c:309 msgid "rev-list died" msgstr "rev-list a disparu" -#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261 -#, c-format -msgid "unrecognized argument: %s" -msgstr "argument non reconnu : %s" - -#: bundle.c:330 +#: bundle.c:358 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:375 +#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#, c-format +msgid "unrecognized argument: %s" +msgstr "argument non reconnu : %s" + +#: bundle.c:444 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:390 -msgid "Could not spawn pack-objects" -msgstr "Impossible de créer des objets groupés" - -#: bundle.c:408 -msgid "pack-objects died" -msgstr "les objets groupés ont disparu" - -#: bundle.c:411 +#: bundle.c:454 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:433 +#: bundle.c:475 msgid "index-pack died" msgstr "l'index de groupe a disparu" +#: color.c:157 +#, c-format +msgid "invalid color value: %.*s" +msgstr "Valeur invalide de couleur : %.*s" + #: commit.c:40 #, c-format msgid "could not parse %s" @@ -417,16 +413,72 @@ msgstr "%s %s n'est pas un commit !" msgid "memory exhausted" msgstr "plus de mémoire" -#: connected.c:70 +#: config.c:469 config.c:471 +#, c-format +msgid "bad config file line %d in %s" +msgstr "ligne %d de fichier de config incorrecte dans %s" + +#: config.c:587 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "" +"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" + +#: config.c:589 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" + +#: config.c:674 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" + +#: config.c:752 config.c:763 +#, c-format +msgid "bad zlib compression level %d" +msgstr "niveau de compression zlib incorrect %d" + +#: config.c:885 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "mode invalide pour la création d'objet : %s" + +#: config.c:1201 +msgid "unable to parse command-line config" +msgstr "lecture de la configuration de ligne de commande impossible" + +#: config.c:1262 +msgid "unknown error occured while reading the configuration files" +msgstr "erreur inconnue pendant la lecture des fichiers de configuration" + +#: config.c:1586 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "" +"impossible d'analyser '%s' depuis le configuration en ligne de commande" + +#: config.c:1588 +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "" +"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" + +#: config.c:1647 +#, c-format +msgid "%s has multiple values" +msgstr "%s a des valeurs multiples" + +#: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" -#: connected.c:90 +#: connected.c:89 #, c-format msgid "failed write to rev-list: %s" msgstr "impossible d'écrire dans la rev-list : %s" -#: connected.c:98 +#: connected.c:97 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "impossible de fermer l'entrée standard du rev-list : %s" @@ -504,7 +556,7 @@ msgstr[1] "il y a %lu ans" msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:514 +#: diffcore-rename.c:516 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" @@ -525,7 +577,7 @@ msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" -#: diff.c:267 +#: diff.c:266 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -534,16 +586,16 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:2934 +#: diff.c:2957 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:3329 +#: diff.c:3352 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:3492 +#: diff.c:3515 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -552,44 +604,44 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:3506 +#: diff.c:3529 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" -#: gpg-interface.c:73 gpg-interface.c:145 +#: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "impossible de lancer gpg." -#: gpg-interface.c:85 +#: gpg-interface.c:141 msgid "gpg did not accept the data" msgstr "gpg n'a pas accepté les données" -#: gpg-interface.c:96 +#: gpg-interface.c:152 msgid "gpg failed to sign the data" msgstr "gpg n'a pas pu signer les données" -#: gpg-interface.c:129 +#: gpg-interface.c:185 #, c-format msgid "could not create temporary file '%s': %s" msgstr "impossible de créer un fichier temporaire '%s' : %s" -#: gpg-interface.c:132 +#: gpg-interface.c:188 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "impossible d'écrire la signature détachée dans '%s' : %s" -#: grep.c:1703 +#: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:1720 +#: grep.c:1735 #, c-format msgid "'%s': %s" msgstr "'%s' : %s" -#: grep.c:1731 +#: grep.c:1746 #, c-format msgid "'%s': short read %s" msgstr "'%s' : lecture tronquée %s" @@ -659,87 +711,95 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: merge.c:40 +#: lockfile.c:275 +msgid "BUG: reopen a lockfile that is still open" +msgstr "BUG: réouverture d'un fichier verrou déjà ouvert" + +#: lockfile.c:277 +msgid "BUG: reopen a lockfile that has been committed" +msgstr "BUG: réouverture d'un fichier verrou validé" + +#: merge.c:41 msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556 -#: builtin/clone.c:661 +#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562 +#: builtin/clone.c:659 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" -#: merge-recursive.c:190 +#: merge-recursive.c:189 #, c-format msgid "(bad commit)\n" msgstr "(mauvais commit)\n" -#: merge-recursive.c:210 +#: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "échec de addinfo_cache pour le chemin '%s'" -#: merge-recursive.c:271 +#: merge-recursive.c:270 msgid "error building trees" msgstr "erreur de construction des arbres" -#: merge-recursive.c:692 +#: merge-recursive.c:691 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:703 +#: merge-recursive.c:702 #, 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:717 merge-recursive.c:738 +#: merge-recursive.c:716 merge-recursive.c:737 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:728 +#: merge-recursive.c:727 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:768 +#: merge-recursive.c:767 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:770 +#: merge-recursive.c:769 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:793 builtin/clone.c:317 +#: merge-recursive.c:792 builtin/clone.c:318 #, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" -#: merge-recursive.c:801 +#: merge-recursive.c:800 #, c-format msgid "failed to symlink '%s'" msgstr "échec à la création du lien symbolique '%s'" -#: merge-recursive.c:804 +#: merge-recursive.c:803 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:942 +#: merge-recursive.c:941 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-recursive.c:946 +#: merge-recursive.c:945 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-recursive.c:962 +#: merge-recursive.c:961 msgid "unsupported object type in the tree" msgstr "type d'objet non supporté dans l'arbre" -#: merge-recursive.c:1037 merge-recursive.c:1051 +#: merge-recursive.c:1036 merge-recursive.c:1050 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -748,7 +808,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:1043 merge-recursive.c:1056 +#: merge-recursive.c:1042 merge-recursive.c:1055 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -757,20 +817,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:1097 +#: merge-recursive.c:1096 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1097 +#: merge-recursive.c:1096 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1153 +#: merge-recursive.c:1152 #, 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:1175 +#: merge-recursive.c:1174 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -779,146 +839,146 @@ msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1180 +#: merge-recursive.c:1179 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1234 +#: merge-recursive.c:1233 #, 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:1264 +#: merge-recursive.c:1263 #, 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:1463 +#: merge-recursive.c:1462 #, 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:1473 +#: merge-recursive.c:1472 #, c-format msgid "Adding merged %s" msgstr "Ajout de %s fusionné" -#: merge-recursive.c:1478 merge-recursive.c:1676 +#: merge-recursive.c:1477 merge-recursive.c:1675 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:1529 +#: merge-recursive.c:1528 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-recursive.c:1532 +#: merge-recursive.c:1531 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modify" msgstr "modification" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modified" msgstr "modifié" -#: merge-recursive.c:1590 +#: merge-recursive.c:1589 msgid "content" msgstr "contenu" -#: merge-recursive.c:1597 +#: merge-recursive.c:1596 msgid "add/add" msgstr "ajout/ajout" -#: merge-recursive.c:1631 +#: merge-recursive.c:1630 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:1645 +#: merge-recursive.c:1644 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1649 git-submodule.sh:1150 +#: merge-recursive.c:1648 git-submodule.sh:1150 msgid "submodule" msgstr "sous-module" -#: merge-recursive.c:1650 +#: merge-recursive.c:1649 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-recursive.c:1740 +#: merge-recursive.c:1735 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:1765 +#: merge-recursive.c:1760 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:1771 +#: merge-recursive.c:1766 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:1776 +#: merge-recursive.c:1771 #, 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:1786 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:1803 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Échec fatal de fusion, qui ne devrait jamais arriver." -#: merge-recursive.c:1822 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Déjà à jour !" -#: merge-recursive.c:1831 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:1861 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "Chemin non traité ??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:1919 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ancêtre commun trouvé :" msgstr[1] "%u ancêtres communs trouvés :" -#: merge-recursive.c:1956 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:2013 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:2024 builtin/merge.c:666 +#: merge-recursive.c:2019 builtin/merge.c:666 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -943,33 +1003,33 @@ 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:234 +#: object.c:241 #, c-format msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" -#: parse-options.c:534 +#: parse-options.c:546 msgid "..." msgstr "..." -#: parse-options.c:552 +#: parse-options.c:564 #, c-format msgid "usage: %s" msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:556 +#: parse-options.c:568 #, c-format msgid " or: %s" msgstr " ou : %s" -#: parse-options.c:559 +#: parse-options.c:571 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:593 +#: parse-options.c:605 msgid "-NUM" msgstr "-NUM" @@ -1041,11 +1101,15 @@ msgstr "" "Il n'y a rien dont il faut exclure par des motifs :(exclure).\n" "Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?" +#: pretty.c:968 +msgid "unable to parse --pretty format" +msgstr "impossible d'analyser le format --pretty" + #: progress.c:225 msgid "done" msgstr "fait" -#: read-cache.c:1260 +#: read-cache.c:1261 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1054,7 +1118,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1270 +#: read-cache.c:1271 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1063,51 +1127,51 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: remote.c:753 +#: remote.c:782 #, 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:757 +#: remote.c:786 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:761 +#: remote.c:790 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#: remote.c:769 +#: remote.c:798 msgid "Internal error" msgstr "Erreur interne" -#: remote.c:1943 +#: remote.c:1968 #, 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:1947 +#: remote.c:1972 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:1950 +#: remote.c:1975 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:1954 +#: remote.c:1979 #, 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:1960 +#: remote.c:1985 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:1963 +#: remote.c:1988 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1119,11 +1183,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:1971 +#: remote.c:1996 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:1974 +#: remote.c:1999 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1138,33 +1202,41 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:1984 +#: remote.c:2009 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" -#: run-command.c:80 +#: run-command.c:87 msgid "open /dev/null failed" msgstr "échec de l'ouverture de /dev/null" -#: run-command.c:82 +#: run-command.c:89 #, c-format msgid "dup2(%d,%d) failed" msgstr "échec de dup2(%d,%d)" -#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893 -#: builtin/merge.c:1003 builtin/merge.c:1013 +#: send-pack.c:265 +msgid "failed to sign the push certificate" +msgstr "impossible de signer le certificat de poussée" + +#: send-pack.c:322 +msgid "the receiving end does not support --signed push" +msgstr "Le receveur ne gère pas les poussées avec --signed" + +#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892 +#: builtin/merge.c:1002 builtin/merge.c:1012 #, c-format msgid "Could not open '%s' for writing" msgstr "Impossible d'ouvrir '%s' en écriture" -#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785 -#: builtin/merge.c:1005 builtin/merge.c:1018 +#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784 +#: builtin/merge.c:1004 builtin/merge.c:1017 #, c-format msgid "Could not write to '%s'" msgstr "Impossible d'écrire dans '%s'" -#: sequencer.c:194 +#: sequencer.c:195 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1172,7 +1244,7 @@ msgstr "" "après résolution des conflits, marquez les chemins corrigés\n" "avec 'git add <chemins>' ou 'git rm <chemins>'" -#: sequencer.c:197 +#: sequencer.c:198 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1182,71 +1254,67 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:210 sequencer.c:841 sequencer.c:924 +#: sequencer.c:211 sequencer.c:852 sequencer.c:935 #, c-format msgid "Could not write to %s" msgstr "Impossible d'écrire dans %s" -#: sequencer.c:213 +#: sequencer.c:214 #, c-format msgid "Error wrapping up %s" msgstr "Erreur à l'emballage de %s" -#: sequencer.c:228 +#: sequencer.c:229 msgid "Your local changes would be overwritten by cherry-pick." msgstr "Vos modifications locales seraient écrasées par cherry-pick." -#: sequencer.c:230 +#: sequencer.c:231 msgid "Your local changes would be overwritten by revert." msgstr "Vos modifications locales seraient écrasées par revert." -#: sequencer.c:233 +#: sequencer.c:234 msgid "Commit your changes or stash them to proceed." msgstr "Validez vos modifications ou les remiser pour continuer." -#: sequencer.c:250 -msgid "Failed to lock HEAD during fast_forward_to" -msgstr "Échec du verrouillage de HEAD pendant l'avance rapide" - #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:293 +#: sequencer.c:304 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:324 +#: sequencer.c:335 msgid "Could not resolve HEAD commit\n" msgstr "Impossible de résoudre le commit HEAD\n" -#: sequencer.c:344 +#: sequencer.c:355 msgid "Unable to update cache tree\n" msgstr "Impossible de mettre à jour l'arbre de cache\n" -#: sequencer.c:391 +#: sequencer.c:402 #, c-format msgid "Could not parse commit %s\n" msgstr "Impossible d'analyser le commit %s\n" -#: sequencer.c:396 +#: sequencer.c:407 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Impossible d'analyser le commit parent %s\n" -#: sequencer.c:462 +#: sequencer.c:473 msgid "Your index file is unmerged." msgstr "Votre fichier d'index n'est pas fusionné." -#: sequencer.c:481 +#: sequencer.c:492 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Le commit %s est une fusion mais l'option -m n'a pas été spécifiée." -#: sequencer.c:489 +#: sequencer.c:500 #, c-format msgid "Commit %s does not have parent %d" msgstr "Le commit %s n'a pas le parent %d" -#: sequencer.c:493 +#: sequencer.c:504 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -1255,157 +1323,157 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:506 +#: sequencer.c:517 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:510 +#: sequencer.c:521 #, c-format msgid "Cannot get commit message for %s" msgstr "Impossible d'obtenir un message de validation pour %s" -#: sequencer.c:596 +#: sequencer.c:607 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:597 +#: sequencer.c:608 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:633 +#: sequencer.c:644 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:641 +#: sequencer.c:652 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:645 +#: sequencer.c:656 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:705 +#: sequencer.c:716 #, c-format msgid "Cannot %s during a %s" msgstr "Impossible de %s pendant un %s" -#: sequencer.c:727 +#: sequencer.c:738 #, c-format msgid "Could not parse line %d." msgstr "Impossible d'analyser la ligne %d." -#: sequencer.c:732 +#: sequencer.c:743 msgid "No commits parsed." msgstr "Aucun commit analysé." -#: sequencer.c:745 +#: sequencer.c:756 #, c-format msgid "Could not open %s" msgstr "Impossible d'ouvrir %s" -#: sequencer.c:749 +#: sequencer.c:760 #, c-format msgid "Could not read %s." msgstr "Impossible de lire %s." -#: sequencer.c:756 +#: sequencer.c:767 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Feuille d'instruction inutilisable : %s" -#: sequencer.c:786 +#: sequencer.c:797 #, c-format msgid "Invalid key: %s" msgstr "Clé invalide: %s" -#: sequencer.c:789 +#: sequencer.c:800 #, c-format msgid "Invalid value for %s: %s" msgstr "Valeur invalide pour %s : %s" -#: sequencer.c:801 +#: sequencer.c:812 #, c-format msgid "Malformed options sheet: %s" msgstr "Feuille d'options malformée : %s" -#: sequencer.c:822 +#: sequencer.c:833 msgid "a cherry-pick or revert is already in progress" msgstr "un picorage ou un retour est déjà en cours" -#: sequencer.c:823 +#: sequencer.c:834 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" -#: sequencer.c:827 +#: sequencer.c:838 #, c-format msgid "Could not create sequencer directory %s" msgstr "Impossible de créer le répertoire de séquenceur %s" -#: sequencer.c:843 sequencer.c:928 +#: sequencer.c:854 sequencer.c:939 #, c-format msgid "Error wrapping up %s." msgstr "Erreur lors de l'emballage de %s." -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:873 sequencer.c:1009 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:864 +#: sequencer.c:875 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:866 +#: sequencer.c:877 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:888 builtin/apply.c:4062 +#: sequencer.c:899 builtin/apply.c:4128 #, c-format msgid "cannot open %s: %s" msgstr "impossible d'ouvrir %s : %s" -#: sequencer.c:891 +#: sequencer.c:902 #, c-format msgid "cannot read %s: %s" msgstr "impossible de lire %s : %s" -#: sequencer.c:892 +#: sequencer.c:903 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:898 +#: sequencer.c:909 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu" -#: sequencer.c:921 +#: sequencer.c:932 #, c-format msgid "Could not format %s." msgstr "Impossible de formater %s." -#: sequencer.c:1066 +#: sequencer.c:1077 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:1069 +#: sequencer.c:1080 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:1103 +#: sequencer.c:1114 msgid "Can't revert as initial commit" msgstr "Impossible d'annuler en tant que commit initial" -#: sequencer.c:1104 +#: sequencer.c:1115 msgid "Can't cherry-pick into empty head" msgstr "Impossible de picorer vers une HEAD vide" -#: sha1_name.c:439 +#: sha1_name.c:440 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" @@ -1430,21 +1498,21 @@ msgstr "" "message\n" "en lançant \"git config advice.objectNameWarning false\"" -#: sha1_name.c:1060 +#: sha1_name.c:1068 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: sha1_name.c:1063 +#: sha1_name.c:1071 #, c-format msgid "No such branch: '%s'" msgstr "Branche inconnue : '%s'" -#: sha1_name.c:1065 +#: 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:1069 +#: 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" @@ -1475,16 +1543,41 @@ 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:1118 builtin/init-db.c:363 +#: submodule.c:1111 builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "Impossible de créer le lien git %s" -#: submodule.c:1129 +#: submodule.c:1122 #, c-format msgid "Could not set core.worktree in %s" msgstr "Impossible de paramétrer core.worktree dans %s" +#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565 +#: trailer.c:569 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "valeur inconnue '%s' pour la clé '%s'" + +#: trailer.c:551 trailer.c:556 builtin/remote.c:288 +#, c-format +msgid "more than one %s" +msgstr "plus d'un %s" + +#: trailer.c:589 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "symbole vide dans la ligne de fin '%.*s'" + +#: trailer.c:709 +#, c-format +msgid "could not read input file '%s'" +msgstr "impossible de lire le fichier d'entrée '%s'" + +#: trailer.c:712 +msgid "could not read from stdin" +msgstr "Impossible de lire depuis l'entrée standard" + #: unpack-trees.c:202 msgid "Checking out files" msgstr "Extraction des fichiers" @@ -1518,27 +1611,31 @@ msgstr "numéro de port invalide" msgid "invalid '..' path segment" msgstr "segment de chemin '..' invalide" -#: wrapper.c:460 +#: wrapper.c:509 #, c-format msgid "unable to access '%s': %s" msgstr "impossible d'accéder à '%s' : %s" -#: wrapper.c:481 +#: wrapper.c:530 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accéder à '%s'" -#: wrapper.c:492 +#: wrapper.c:541 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" "impossible de rechercher l'utilisateur actuel dans le fichier de mots de " "passe : %s" -#: wrapper.c:493 +#: wrapper.c:542 msgid "no such user" msgstr "utilisateur inconnu" +#: wrapper.c:550 +msgid "unable to get current working directory" +msgstr "impossible d'accéder au répertoire de travail courant" + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Chemins non fusionnés :" @@ -1685,15 +1782,15 @@ msgstr "contenu non suivi, " msgid "bug: unhandled diff status %c" msgstr "bogue : état de diff non géré %c" -#: wt-status.c:764 +#: wt-status.c:761 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:766 +#: wt-status.c:763 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:845 +#: wt-status.c:842 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1701,68 +1798,68 @@ msgstr "" "Ne touchez pas à la ligne ci-dessus\n" "Tout se qui suit sera éliminé." -#: wt-status.c:936 +#: wt-status.c:933 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:939 +#: wt-status.c:936 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:942 +#: wt-status.c:939 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:945 +#: wt-status.c:942 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:955 +#: wt-status.c:952 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:958 +#: wt-status.c:955 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:962 +#: wt-status.c:959 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:964 +#: wt-status.c:961 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:966 +#: wt-status.c:963 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1026 wt-status.c:1043 +#: wt-status.c:1023 wt-status.c:1040 #, 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:1031 wt-status.c:1048 +#: wt-status.c:1028 wt-status.c:1045 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1034 +#: wt-status.c:1031 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1036 +#: wt-status.c:1033 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1038 +#: wt-status.c:1035 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:1051 +#: wt-status.c:1048 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1055 +#: wt-status.c:1052 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1770,120 +1867,120 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1060 +#: wt-status.c:1057 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:1063 +#: wt-status.c:1060 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:1067 +#: wt-status.c:1064 #, 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:1072 +#: wt-status.c:1069 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:1075 +#: wt-status.c:1072 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1077 +#: wt-status.c:1074 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:1087 +#: wt-status.c:1084 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1092 +#: wt-status.c:1089 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1095 +#: wt-status.c:1092 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:1097 +#: wt-status.c:1094 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:1106 +#: wt-status.c:1103 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1111 +#: wt-status.c:1108 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1114 +#: wt-status.c:1111 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1116 +#: wt-status.c:1113 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1127 +#: wt-status.c:1124 #, 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:1131 +#: wt-status.c:1128 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1134 +#: wt-status.c:1131 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:1309 +#: wt-status.c:1306 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1316 +#: wt-status.c:1313 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1323 +#: wt-status.c:1320 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1325 +#: wt-status.c:1322 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1328 +#: wt-status.c:1325 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1345 +#: wt-status.c:1342 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1359 +#: wt-status.c:1356 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1361 +#: wt-status.c:1358 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1365 +#: wt-status.c:1362 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1895,32 +1992,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1371 +#: wt-status.c:1368 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1373 +#: wt-status.c:1370 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1379 +#: wt-status.c:1376 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1384 +#: wt-status.c:1381 #, 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:1387 +#: wt-status.c:1384 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1390 +#: wt-status.c:1387 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1929,98 +2026,98 @@ 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:1393 +#: wt-status.c:1390 #, 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:1396 +#: wt-status.c:1393 #, 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:1399 wt-status.c:1404 +#: wt-status.c:1396 wt-status.c:1401 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1402 +#: wt-status.c:1399 #, 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:1406 +#: wt-status.c:1403 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1515 +#: wt-status.c:1512 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1521 +#: wt-status.c:1518 msgid "Initial commit on " msgstr "Validation initiale sur " # à priori on parle d'une branche ici -#: wt-status.c:1553 +#: wt-status.c:1550 msgid "gone" msgstr "disparue" -#: wt-status.c:1555 wt-status.c:1563 +#: wt-status.c:1552 wt-status.c:1560 msgid "behind " msgstr "derrière " -#: compat/precompose_utf8.c:55 builtin/clone.c:356 +#: compat/precompose_utf8.c:55 builtin/clone.c:357 #, c-format msgid "failed to unlink '%s'" msgstr "échec lors de l'unlink de '%s'" -#: builtin/add.c:21 +#: builtin/add.c:22 msgid "git add [options] [--] <pathspec>..." msgstr "git add [options] [--] <chemin>..." -#: builtin/add.c:64 +#: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "status de diff inattendu %c" -#: builtin/add.c:69 builtin/commit.c:261 +#: builtin/add.c:70 builtin/commit.c:275 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" -#: builtin/add.c:79 +#: builtin/add.c:80 #, c-format msgid "remove '%s'\n" msgstr "suppression de '%s'\n" -#: builtin/add.c:133 +#: builtin/add.c:134 msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:193 builtin/rev-parse.c:781 +#: builtin/add.c:194 builtin/rev-parse.c:785 msgid "Could not read the index" msgstr "Impossible de lire l'index" -#: builtin/add.c:204 +#: builtin/add.c:205 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossible d'ouvrir '%s' en écriture." -#: builtin/add.c:208 +#: builtin/add.c:209 msgid "Could not write patch" msgstr "Impossible d'écrire le patch" -#: builtin/add.c:213 +#: builtin/add.c:214 #, c-format msgid "Could not stat '%s'" msgstr "Stat de '%s' impossible" -#: builtin/add.c:215 +#: builtin/add.c:216 msgid "Empty patch. Aborted." msgstr "Patch vide. Abandon." @@ -2034,15 +2131,15 @@ 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:875 builtin/fetch.c:108 builtin/mv.c:70 -#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375 #: builtin/rm.c:269 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19 -#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606 -#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113 +#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 +#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "mode verbeux" @@ -2050,7 +2147,7 @@ msgstr "mode verbeux" msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286 msgid "select hunks interactively" msgstr "sélection interactive des sections" @@ -2126,81 +2223,81 @@ 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:919 -#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: builtin/apply.c:57 +#: builtin/apply.c:58 msgid "git apply [options] [<patch>...]" msgstr "git apply [options] [<patch>...]" -#: builtin/apply.c:110 +#: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "option d'espace non reconnue '%s'" -#: builtin/apply.c:125 +#: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "option d'ignorance d'espace non reconnue '%s'" -#: builtin/apply.c:825 +#: builtin/apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Impossible de préparer la regexp d'horodatage %s" -#: builtin/apply.c:834 +#: builtin/apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec a retourné %d pour l'entrée : %s" -#: builtin/apply.c:915 +#: builtin/apply.c:916 #, c-format msgid "unable to find filename in patch at line %d" msgstr "nom de fichier du patch introuvable à la ligne %d" -#: builtin/apply.c:947 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " "ligne %d" -#: builtin/apply.c:951 +#: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " "à la ligne %d" -#: builtin/apply.c:952 +#: builtin/apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " "à la ligne %d" -#: builtin/apply.c:959 +#: builtin/apply.c:960 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" -#: builtin/apply.c:1422 +#: builtin/apply.c:1423 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" -#: builtin/apply.c:1479 +#: builtin/apply.c:1480 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" -#: builtin/apply.c:1496 +#: builtin/apply.c:1497 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2215,77 +2312,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:1657 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: builtin/apply.c:1658 +#: builtin/apply.c:1659 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: builtin/apply.c:1684 +#: builtin/apply.c:1685 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: builtin/apply.c:1720 +#: builtin/apply.c:1721 #, 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:1723 #, 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:1726 #, 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:1872 #, 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:1901 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: builtin/apply.c:1986 +#: builtin/apply.c:2052 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: builtin/apply.c:2076 +#: builtin/apply.c:2142 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: builtin/apply.c:2080 +#: builtin/apply.c:2146 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: builtin/apply.c:2688 +#: builtin/apply.c:2754 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: builtin/apply.c:2806 +#: builtin/apply.c:2872 #, 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:2818 +#: builtin/apply.c:2884 #, 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:2824 +#: builtin/apply.c:2890 #, c-format msgid "" "while searching for:\n" @@ -2294,328 +2391,328 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: builtin/apply.c:2843 +#: builtin/apply.c:2909 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: builtin/apply.c:2944 +#: builtin/apply.c:3010 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: builtin/apply.c:2950 +#: builtin/apply.c:3016 #, 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:2971 +#: builtin/apply.c:3037 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: builtin/apply.c:3095 +#: builtin/apply.c:3161 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 +#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 #, c-format msgid "read of %s failed" msgstr "échec de la lecture de %s" -#: builtin/apply.c:3174 builtin/apply.c:3396 +#: builtin/apply.c:3240 builtin/apply.c:3462 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: builtin/apply.c:3255 builtin/apply.c:3410 +#: builtin/apply.c:3321 builtin/apply.c:3476 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 +#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 #, c-format msgid "%s: %s" msgstr "%s : %s" -#: builtin/apply.c:3264 builtin/apply.c:3418 +#: builtin/apply.c:3330 builtin/apply.c:3484 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: builtin/apply.c:3366 +#: builtin/apply.c:3432 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: builtin/apply.c:3435 +#: builtin/apply.c:3501 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: builtin/apply.c:3437 +#: builtin/apply.c:3503 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: builtin/apply.c:3538 +#: builtin/apply.c:3604 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: builtin/apply.c:3541 +#: builtin/apply.c:3607 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: builtin/apply.c:3561 +#: builtin/apply.c:3627 #, 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:3566 +#: builtin/apply.c:3632 #, 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:3574 +#: builtin/apply.c:3640 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: builtin/apply.c:3587 +#: builtin/apply.c:3653 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134 +#: builtin/apply.c:3746 builtin/checkout.c:213 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:3823 +#: builtin/apply.c:3889 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: builtin/apply.c:3852 +#: builtin/apply.c:3918 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: builtin/apply.c:3856 +#: builtin/apply.c:3922 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: builtin/apply.c:3861 +#: builtin/apply.c:3927 #, 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:3864 builtin/apply.c:3972 +#: builtin/apply.c:3930 builtin/apply.c:4038 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: builtin/apply.c:3897 +#: builtin/apply.c:3963 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: builtin/apply.c:3946 +#: builtin/apply.c:4012 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: builtin/apply.c:4033 +#: builtin/apply.c:4099 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: builtin/apply.c:4041 +#: builtin/apply.c:4107 msgid "internal error" msgstr "erreur interne" -#: builtin/apply.c:4044 +#: builtin/apply.c:4110 #, 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:4054 +#: builtin/apply.c:4120 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: builtin/apply.c:4075 +#: builtin/apply.c:4141 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: builtin/apply.c:4078 +#: builtin/apply.c:4144 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: builtin/apply.c:4228 +#: builtin/apply.c:4234 msgid "unrecognized input" msgstr "entrée non reconnue" -#: builtin/apply.c:4239 +#: builtin/apply.c:4245 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91 #: builtin/fetch.c:93 msgid "path" msgstr "chemin" -#: builtin/apply.c:4359 +#: builtin/apply.c:4363 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4362 +#: builtin/apply.c:4366 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4364 +#: builtin/apply.c:4368 msgid "num" msgstr "num" -#: builtin/apply.c:4365 +#: builtin/apply.c:4369 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: builtin/apply.c:4368 +#: builtin/apply.c:4372 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: builtin/apply.c:4370 +#: builtin/apply.c:4374 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:4374 +#: builtin/apply.c:4378 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:4376 +#: builtin/apply.c:4380 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:4378 +#: builtin/apply.c:4382 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:4380 +#: builtin/apply.c:4384 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:4382 +#: builtin/apply.c:4386 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: builtin/apply.c:4384 +#: builtin/apply.c:4388 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" -#: builtin/apply.c:4386 +#: builtin/apply.c:4390 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:4388 +#: builtin/apply.c:4392 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:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: builtin/apply.c:4393 +#: builtin/apply.c:4397 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: builtin/apply.c:4394 +#: builtin/apply.c:4398 msgid "action" msgstr "action" -#: builtin/apply.c:4395 +#: builtin/apply.c:4399 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:4398 builtin/apply.c:4401 +#: builtin/apply.c:4402 builtin/apply.c:4405 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: builtin/apply.c:4404 +#: builtin/apply.c:4408 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: builtin/apply.c:4406 +#: builtin/apply.c:4410 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: builtin/apply.c:4408 +#: builtin/apply.c:4412 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: builtin/apply.c:4410 +#: builtin/apply.c:4414 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: builtin/apply.c:4413 +#: builtin/apply.c:4417 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:4416 +#: builtin/apply.c:4420 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:4418 +#: builtin/apply.c:4422 msgid "root" msgstr "racine" -#: builtin/apply.c:4419 +#: builtin/apply.c:4423 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" -#: builtin/apply.c:4441 +#: builtin/apply.c:4445 msgid "--3way outside a repository" msgstr "--3way hors d'un dépôt" -#: builtin/apply.c:4449 +#: builtin/apply.c:4453 msgid "--index outside a repository" msgstr "--index hors d'un dépôt" -#: builtin/apply.c:4452 +#: builtin/apply.c:4456 msgid "--cached outside a repository" msgstr "--cached hors d'un dépôt" -#: builtin/apply.c:4468 +#: builtin/apply.c:4472 #, c-format msgid "can't open patch '%s'" msgstr "ouverture impossible du patch '%s'" -#: builtin/apply.c:4482 +#: builtin/apply.c:4486 #, 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:4488 builtin/apply.c:4498 +#: builtin/apply.c:4492 builtin/apply.c:4502 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2781,7 +2878,7 @@ msgstr "" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2599 +#: builtin/blame.c:2602 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" @@ -2801,7 +2898,7 @@ msgstr "git branch [options] [-r] (-d | -D) <nomdebranche>..." msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "git branch [options] (-m | -M) [<anciennebranche>] <nouvellebranche>" -#: builtin/branch.c:150 +#: builtin/branch.c:152 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2810,7 +2907,7 @@ msgstr "" "suppression de la branche '%s' qui a été fusionnée dans\n" " '%s', mais pas dans HEAD." -#: builtin/branch.c:154 +#: builtin/branch.c:156 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2819,12 +2916,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:168 +#: builtin/branch.c:170 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Impossible de rechercher l'objet commit pour '%s'" -#: builtin/branch.c:172 +#: builtin/branch.c:174 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2833,304 +2930,304 @@ 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:185 +#: builtin/branch.c:187 msgid "Update of config-file failed" msgstr "Échec de la mise à jour du fichier de configuration" -#: builtin/branch.c:213 +#: builtin/branch.c:215 msgid "cannot use -a with -d" msgstr "impossible d'utiliser -a avec -d" -#: builtin/branch.c:219 +#: builtin/branch.c:221 msgid "Couldn't look up commit object for HEAD" msgstr "Impossible de rechercher l'objet commit pour HEAD" -#: builtin/branch.c:227 +#: builtin/branch.c:229 #, 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:240 +#: builtin/branch.c:245 #, c-format msgid "remote branch '%s' not found." msgstr "branche distante %s' non trouvée." -#: builtin/branch.c:241 +#: builtin/branch.c:246 #, c-format msgid "branch '%s' not found." msgstr "branche '%s' non trouvée." -#: builtin/branch.c:255 +#: builtin/branch.c:260 #, c-format msgid "Error deleting remote branch '%s'" msgstr "Erreur lors de la suppression de la branche distante '%s'" -#: builtin/branch.c:256 +#: builtin/branch.c:261 #, c-format msgid "Error deleting branch '%s'" msgstr "Erreur lors de la suppression de la branche '%s'" -#: builtin/branch.c:263 +#: builtin/branch.c:268 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "Branche distante %s supprimée (précédemment %s).\n" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branche %s supprimée (précédemment %s).\n" -#: builtin/branch.c:366 +#: builtin/branch.c:370 #, 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:454 +#: builtin/branch.c:459 #, c-format msgid "[%s: gone]" msgstr "[%s: disparue]" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:464 +#: builtin/branch.c:469 #, c-format msgid "[%s: behind %d]" msgstr "[%s: en retard de %d]" -#: builtin/branch.c:466 +#: builtin/branch.c:471 #, c-format msgid "[behind %d]" msgstr "[en retard de %d]" -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d]" msgstr "[%s : en avance de %d]" -#: builtin/branch.c:472 +#: builtin/branch.c:477 #, c-format msgid "[ahead %d]" msgstr "[en avance de %d]" -#: builtin/branch.c:475 +#: builtin/branch.c:480 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s : en avance de %d, en retard de %d]" -#: builtin/branch.c:478 +#: builtin/branch.c:483 #, c-format msgid "[ahead %d, behind %d]" msgstr "[en avance de %d, en retard de %d]" -#: builtin/branch.c:502 +#: builtin/branch.c:496 msgid " **** invalid ref ****" msgstr " **** référence invalide ****" -#: builtin/branch.c:594 +#: builtin/branch.c:587 #, c-format msgid "(no branch, rebasing %s)" msgstr "(aucune branche, rebasage de %s)" -#: builtin/branch.c:597 +#: builtin/branch.c:590 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a démarré sur %s)" -#: builtin/branch.c:600 +#: builtin/branch.c:593 #, c-format msgid "(detached from %s)" msgstr "(détaché de %s)" -#: builtin/branch.c:603 +#: builtin/branch.c:596 msgid "(no branch)" msgstr "(aucune branche)" -#: builtin/branch.c:649 +#: builtin/branch.c:643 #, c-format msgid "object '%s' does not point to a commit" msgstr "l'objet '%s' ne pointe pas sur un commit" -#: builtin/branch.c:681 +#: builtin/branch.c:691 msgid "some refs could not be read" msgstr "des références n'ont pas pu être lues" -#: builtin/branch.c:694 +#: builtin/branch.c:704 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:704 +#: builtin/branch.c:714 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:719 +#: builtin/branch.c:729 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'un branche mal nommée '%s'" -#: builtin/branch.c:727 +#: builtin/branch.c:737 #, 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:734 +#: builtin/branch.c:744 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:749 +#: builtin/branch.c:759 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: builtin/branch.c:773 +#: builtin/branch.c:783 #, 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:803 +#: builtin/branch.c:813 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:805 +#: builtin/branch.c:815 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:806 +#: builtin/branch.c:816 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:807 +#: builtin/branch.c:817 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:809 +#: builtin/branch.c:819 msgid "change upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:813 +#: builtin/branch.c:823 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:814 +#: builtin/branch.c:824 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 -#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574 -#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615 -#: builtin/tag.c:621 +#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 +#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623 +#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616 +#: builtin/tag.c:622 msgid "commit" msgstr "commit" -#: builtin/branch.c:818 builtin/branch.c:824 +#: builtin/branch.c:828 builtin/branch.c:834 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:830 +#: builtin/branch.c:840 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:831 +#: builtin/branch.c:841 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:833 +#: builtin/branch.c:843 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:834 +#: builtin/branch.c:844 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:835 +#: builtin/branch.c:845 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:836 +#: builtin/branch.c:846 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:837 +#: builtin/branch.c:847 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:838 +#: builtin/branch.c:848 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:840 +#: builtin/branch.c:850 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:841 +#: builtin/branch.c:851 msgid "force creation (when already exists)" msgstr "forcer la création (même si la cible existe)" -#: builtin/branch.c:844 +#: builtin/branch.c:854 msgid "print only not merged branches" msgstr "afficher seulement les branches non fusionnées" -#: builtin/branch.c:850 +#: builtin/branch.c:860 msgid "print only merged branches" msgstr "afficher seulement les branches fusionnées" -#: builtin/branch.c:854 +#: builtin/branch.c:864 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:867 +#: builtin/branch.c:877 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: builtin/branch.c:872 builtin/clone.c:636 +#: builtin/branch.c:881 builtin/clone.c:634 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:896 +#: builtin/branch.c:903 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:902 builtin/branch.c:941 +#: builtin/branch.c:909 builtin/branch.c:948 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:917 +#: builtin/branch.c:924 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:922 +#: builtin/branch.c:929 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:929 +#: builtin/branch.c:936 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:932 +#: builtin/branch.c:939 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:947 +#: builtin/branch.c:954 msgid "too many branches for a rename operation" msgstr "trop de branches pour une opération de renommage" -#: builtin/branch.c:952 +#: builtin/branch.c:959 msgid "too many branches to set new upstream" msgstr "trop de branches pour spécifier une branche amont" -#: builtin/branch.c:956 +#: builtin/branch.c:963 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3138,41 +3235,41 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 +#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:963 +#: builtin/branch.c:970 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:975 +#: builtin/branch.c:982 msgid "too many branches to unset upstream" msgstr "trop de branches pour désactiver un amont" -#: builtin/branch.c:979 +#: builtin/branch.c:986 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:985 +#: builtin/branch.c:992 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:999 +#: builtin/branch.c:1006 msgid "it does not make sense to create 'HEAD' manually" msgstr "créer manuellement 'HEAD' n'a pas de sens" -#: builtin/branch.c:1005 +#: builtin/branch.c:1012 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:1008 +#: builtin/branch.c:1015 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3181,7 +3278,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:1025 +#: builtin/branch.c:1032 #, c-format msgid "" "\n" @@ -3192,12 +3289,12 @@ msgstr "" "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n" "\n" -#: builtin/branch.c:1026 +#: builtin/branch.c:1033 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1027 +#: builtin/branch.c:1034 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3215,44 +3312,44 @@ msgstr "La création d'un colis requiert un dépôt." msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." -#: builtin/cat-file.c:331 +#: builtin/cat-file.c:332 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:332 +#: builtin/cat-file.c:333 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <liste_d_objets>" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:370 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:371 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:372 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:374 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:374 +#: builtin/cat-file.c:375 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:377 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:378 +#: builtin/cat-file.c:379 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:381 +#: builtin/cat-file.c:382 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" @@ -3273,7 +3370,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:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "lire les noms de fichier depuis l'entrée standard" @@ -3282,7 +3379,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:1083 builtin/gc.c:285 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -3450,46 +3547,46 @@ msgstr "le chemin '%s' n'est pas fusionné" msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:591 +#: builtin/checkout.c:597 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Impossible de faire un reflog pour '%s'\n" -#: builtin/checkout.c:629 +#: builtin/checkout.c:635 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:636 +#: builtin/checkout.c:642 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:639 +#: builtin/checkout.c:645 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:643 +#: builtin/checkout.c:649 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:645 builtin/checkout.c:1026 +#: builtin/checkout.c:651 builtin/checkout.c:1032 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:647 +#: builtin/checkout.c:653 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:699 +#: builtin/checkout.c:705 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:705 +#: builtin/checkout.c:711 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3512,7 +3609,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:723 +#: builtin/checkout.c:729 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3528,139 +3625,139 @@ msgstr "" "git branch nouvelle_branche %s\n" "\n" -#: builtin/checkout.c:753 +#: builtin/checkout.c:759 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:757 +#: builtin/checkout.c:763 msgid "Previous HEAD position was" -msgstr "La position précédente de HEAD était" +msgstr "La position précédente de HEAD était sur " -#: builtin/checkout.c:784 builtin/checkout.c:1021 +#: builtin/checkout.c:790 builtin/checkout.c:1027 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:928 +#: builtin/checkout.c:934 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:967 +#: builtin/checkout.c:973 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1002 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1041 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1038 builtin/checkout.c:1042 +#: builtin/checkout.c:1044 builtin/checkout.c:1048 #, 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:1046 builtin/checkout.c:1049 builtin/checkout.c:1054 -#: builtin/checkout.c:1057 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 +#: builtin/checkout.c:1063 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1068 #, 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:1084 builtin/checkout.c:1086 builtin/clone.c:88 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1085 +#: builtin/checkout.c:1091 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1087 +#: builtin/checkout.c:1093 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1088 +#: builtin/checkout.c:1094 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1089 +#: builtin/checkout.c:1095 msgid "detach the HEAD at named commit" msgstr "détacher la HEAD à la validation nommée" -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1096 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1099 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1101 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1097 +#: builtin/checkout.c:1103 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1104 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1099 builtin/merge.c:225 +#: builtin/checkout.c:1105 builtin/merge.c:226 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245 +#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245 msgid "style" msgstr "style" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1107 msgid "conflict style (merge or diff3)" msgstr "style de conflit (fusion ou diff3)" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1110 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:1106 +#: builtin/checkout.c:1112 msgid "second guess 'git checkout no-such-branch'" msgstr "deuxième chance 'git checkout branche-inexistante'" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1135 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1152 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1157 msgid "Missing branch name; try -b" msgstr "Nom de branche manquant ; essayez -b" -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1194 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1201 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3670,12 +3767,12 @@ msgstr "" "en même temps.\n" "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?" -#: builtin/checkout.c:1202 +#: builtin/checkout.c:1206 #, 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:1206 +#: builtin/checkout.c:1210 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3826,7 +3923,7 @@ msgstr "nettoyage interactif" msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714 +#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "motif" @@ -3863,145 +3960,145 @@ msgstr "" "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clone.c:36 +#: builtin/clone.c:37 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [options] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222 -#: builtin/push.c:503 +#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223 +#: builtin/push.c:514 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" -#: builtin/clone.c:66 +#: builtin/clone.c:67 msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 msgid "create a bare repository" msgstr "créer un dépôt nu" -#: builtin/clone.c:71 +#: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" msgstr "créer un dépôt miroir (implique dépôt nu)" -#: builtin/clone.c:73 +#: builtin/clone.c:74 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" -#: builtin/clone.c:75 +#: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, toujours copier" -#: builtin/clone.c:77 +#: builtin/clone.c:78 msgid "setup as shared repository" msgstr "régler comme dépôt partagé" -#: builtin/clone.c:79 builtin/clone.c:81 +#: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" -#: builtin/clone.c:82 builtin/init-db.c:483 +#: builtin/clone.c:83 builtin/init-db.c:485 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:83 builtin/init-db.c:484 +#: builtin/clone.c:84 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:85 +#: builtin/clone.c:86 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "nom" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "use <name> instead of 'origin' to track upstream" msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659 msgid "depth" msgstr "profondeur" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:95 +#: builtin/clone.c:96 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -#: builtin/clone.c:96 builtin/init-db.c:492 +#: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:97 builtin/init-db.c:493 +#: builtin/clone.c:98 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "key=value" msgstr "clé=valeur" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:252 +#: builtin/clone.c:253 #, 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:256 +#: builtin/clone.c:257 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: builtin/clone.c:259 +#: builtin/clone.c:260 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: builtin/clone.c:321 +#: builtin/clone.c:322 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/clone.c:323 builtin/diff.c:83 +#: builtin/clone.c:324 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:339 +#: builtin/clone.c:340 #, c-format msgid "failed to stat %s\n" msgstr "échec du stat de %s\n" -#: builtin/clone.c:361 +#: builtin/clone.c:362 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:365 +#: builtin/clone.c:366 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:388 builtin/clone.c:565 +#: builtin/clone.c:389 builtin/clone.c:563 #, c-format msgid "done.\n" msgstr "fait.\n" @@ -4016,112 +4113,112 @@ 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:480 +#: builtin/clone.c:478 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:560 +#: builtin/clone.c:558 #, c-format msgid "Checking connectivity... " msgstr "Vérification de la connectivité... " -#: builtin/clone.c:563 +#: builtin/clone.c:561 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: builtin/clone.c:627 +#: builtin/clone.c:625 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:658 +#: builtin/clone.c:656 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:768 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:772 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:783 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:786 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:799 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:805 builtin/fetch.c:1143 +#: builtin/clone.c:802 builtin/fetch.c:1155 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:815 +#: builtin/clone.c:812 #, 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:825 +#: builtin/clone.c:822 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:838 builtin/clone.c:850 +#: builtin/clone.c:835 builtin/clone.c:847 #, 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:841 +#: builtin/clone.c:838 #, 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:860 +#: builtin/clone.c:857 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:862 +#: builtin/clone.c:859 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:898 +#: builtin/clone.c:895 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:901 +#: builtin/clone.c:898 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:906 +#: builtin/clone.c:903 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:910 +#: builtin/clone.c:907 #, c-format msgid "Don't know how to clone %s" msgstr "Je ne sais pas cloner %s" -#: builtin/clone.c:961 builtin/clone.c:969 +#: builtin/clone.c:958 builtin/clone.c:966 #, 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:972 +#: builtin/clone.c:969 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -4157,15 +4254,42 @@ msgstr "Remplissage d'espace entre les colonnes" msgid "--command must be the first argument" msgstr "--command doit être le premier argument" -#: builtin/commit.c:36 +#: builtin/commit.c:37 msgid "git commit [options] [--] <pathspec>..." msgstr "git commit [options] [--] <spécification-de-chemin>..." -#: builtin/commit.c:41 +#: builtin/commit.c:42 msgid "git status [options] [--] <pathspec>..." msgstr "git status [options] [--] <spécification-de-chemin>..." -#: builtin/commit.c:46 +#: builtin/commit.c:47 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"Votre nom et votre adresse e-mail ont été configurés automatiquement en se\n" +"fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n" +"vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n" +"paramétrant explicitement. Lancez les commandes suivantes et suivez les\n" +"instruction dans votre éditeur pour éditer votre fichier de configuration :\n" +"\n" +" git config --global --edit\n" +"\n" +"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation " +"avec :\n" +"\n" +" git commit --amend --reset-author\n" + +#: builtin/commit.c:60 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4191,7 +4315,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:58 +#: builtin/commit.c:72 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -4202,7 +4326,7 @@ msgstr "" "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n" "supprimer complètement le commit avec \"git reset HEAD^\".\n" -#: builtin/commit.c:63 +#: builtin/commit.c:77 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4217,11 +4341,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:70 +#: builtin/commit.c:84 msgid "Otherwise, please use 'git reset'\n" msgstr "Sinon, veuillez utiliser 'git reset'\n" -#: builtin/commit.c:73 +#: builtin/commit.c:87 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4237,58 +4361,75 @@ msgstr "" "Puis \"git cherry-pick --continue\" continuera le picorage \n" "des commits restants.\n" -#: builtin/commit.c:288 +#: builtin/commit.c:302 msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" -#: builtin/commit.c:328 +#: builtin/commit.c:342 msgid "unable to create temporary index" msgstr "impossible de créer l'index temporaire" -#: builtin/commit.c:334 +#: builtin/commit.c:348 msgid "interactive add failed" msgstr "échec de l'ajout interactif" -#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435 +#: builtin/commit.c:359 +msgid "unable to write index file" +msgstr "impossible d'écrire le fichier d'index" + +#: builtin/commit.c:361 +msgid "unable to update temporary index" +msgstr "impossible de mettre à jour l'index temporaire" + +#: builtin/commit.c:363 +msgid "Failed to update main cache tree" +msgstr "Impossible de mettre à jour l'arbre de cache principal" + +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 msgid "unable to write new_index file" msgstr "impossible d'écrire le fichier new_index" -#: builtin/commit.c:418 +#: builtin/commit.c:443 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." -#: builtin/commit.c:420 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." -#: builtin/commit.c:429 +#: builtin/commit.c:454 msgid "cannot read the index" msgstr "impossible de lire l'index" -#: builtin/commit.c:447 +#: builtin/commit.c:473 msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" -#: builtin/commit.c:557 builtin/commit.c:563 +#: builtin/commit.c:592 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "entête d'auteur manquant dans le commit '%s'" + +#: builtin/commit.c:594 #, c-format -msgid "invalid commit: %s" -msgstr "commit invalide : %s" +msgid "commit '%s' has malformed author line" +msgstr "le commit '%s' a une ligne d'auteur malformée" -#: builtin/commit.c:585 +#: builtin/commit.c:613 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" -#: builtin/commit.c:592 +#: builtin/commit.c:621 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" -#: builtin/commit.c:609 +#: builtin/commit.c:642 #, c-format msgid "Malformed ident string: '%s'" msgstr "Chaîne ident mal formée : '%s'" -#: builtin/commit.c:642 +#: builtin/commit.c:675 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4296,43 +4437,43 @@ msgstr "" "impossible de sélectionner un caractère de commentaire\n" "qui n'est pas utilisé dans le message de validation actuel" -#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086 +#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:691 builtin/shortlog.c:273 +#: builtin/commit.c:724 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" -#: builtin/commit.c:693 +#: builtin/commit.c:726 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" -#: builtin/commit.c:697 +#: builtin/commit.c:730 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:719 +#: builtin/commit.c:752 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" -#: builtin/commit.c:723 +#: builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:727 +#: builtin/commit.c:760 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" -#: builtin/commit.c:798 +#: builtin/commit.c:831 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:816 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -4347,7 +4488,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -4362,7 +4503,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:834 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4372,7 +4513,7 @@ msgstr "" "commençant par '%c' seront ignorées, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:841 +#: builtin/commit.c:874 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4383,147 +4524,147 @@ msgstr "" "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n" "si vous le souhaitez. Un message vide abandonne la validation.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:888 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:863 +#: builtin/commit.c:896 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:870 +#: builtin/commit.c:903 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:888 +#: builtin/commit.c:921 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:945 +#: builtin/commit.c:978 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:960 builtin/tag.c:495 +#: builtin/commit.c:993 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" -#: builtin/commit.c:1061 +#: builtin/commit.c:1095 #, c-format msgid "No existing author found with '%s'" msgstr "Aucun auteur existant trouvé avec '%s'" -#: builtin/commit.c:1076 builtin/commit.c:1316 +#: builtin/commit.c:1110 builtin/commit.c:1350 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1113 +#: builtin/commit.c:1147 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1143 +#: builtin/commit.c:1177 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens" -#: builtin/commit.c:1152 +#: builtin/commit.c:1186 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1155 +#: builtin/commit.c:1189 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1157 +#: builtin/commit.c:1191 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." -#: builtin/commit.c:1160 +#: builtin/commit.c:1194 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble" -#: builtin/commit.c:1170 +#: builtin/commit.c:1204 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." -#: builtin/commit.c:1172 +#: builtin/commit.c:1206 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup." -#: builtin/commit.c:1180 +#: builtin/commit.c:1214 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." -#: builtin/commit.c:1197 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Une seule option parmi --include/--only/--all/--interactive/--patch peut " "être utilisée." -#: builtin/commit.c:1199 +#: builtin/commit.c:1233 msgid "No paths with --include/--only does not make sense." msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." -#: builtin/commit.c:1201 +#: builtin/commit.c:1235 msgid "Clever... amending the last one with dirty index." msgstr "Malin... correction du dernier avec un index sale." -#: builtin/commit.c:1203 +#: builtin/commit.c:1237 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..." -#: builtin/commit.c:1215 builtin/tag.c:727 +#: builtin/commit.c:1249 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" -#: builtin/commit.c:1220 +#: builtin/commit.c:1254 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:1330 builtin/commit.c:1595 +#: builtin/commit.c:1364 builtin/commit.c:1644 msgid "show status concisely" msgstr "afficher le statut avec concision" -#: builtin/commit.c:1332 builtin/commit.c:1597 +#: builtin/commit.c:1366 builtin/commit.c:1646 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489 +#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1337 builtin/commit.c:1601 +#: builtin/commit.c:1371 builtin/commit.c:1650 msgid "show status in long format (default)" msgstr "afficher le statut en format long (par défaut)" -#: builtin/commit.c:1340 builtin/commit.c:1604 +#: builtin/commit.c:1374 builtin/commit.c:1653 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703 -#: builtin/fast-export.c:706 builtin/tag.c:602 +#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980 +#: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "mode" -#: builtin/commit.c:1343 builtin/commit.c:1607 +#: builtin/commit.c:1377 builtin/commit.c:1656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " "no. (Défaut : all)" -#: builtin/commit.c:1346 +#: builtin/commit.c:1380 msgid "show ignored files" msgstr "afficher les fichiers ignorés" -#: builtin/commit.c:1347 parse-options.h:153 +#: builtin/commit.c:1381 parse-options.h:153 msgid "when" msgstr "quand" -#: builtin/commit.c:1348 +#: builtin/commit.c:1382 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4531,220 +4672,212 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1350 +#: builtin/commit.c:1384 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1419 +#: builtin/commit.c:1471 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: builtin/commit.c:1421 +#: builtin/commit.c:1473 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: builtin/commit.c:1469 +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "HEAD détachée" -#: builtin/commit.c:1471 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr " (commit racine)" -#: builtin/commit.c:1565 +#: builtin/commit.c:1614 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1566 +#: builtin/commit.c:1615 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1568 +#: builtin/commit.c:1617 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1569 builtin/tag.c:600 +#: builtin/commit.c:1618 builtin/tag.c:601 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "author" msgstr "auteur" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1571 builtin/gc.c:286 +#: builtin/commit.c:1620 builtin/gc.c:275 msgid "date" msgstr "date" -#: builtin/commit.c:1571 +#: builtin/commit.c:1620 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409 -#: builtin/notes.c:566 builtin/tag.c:598 +#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/tag.c:599 msgid "message" msgstr "message" -#: builtin/commit.c:1572 +#: builtin/commit.c:1621 msgid "commit message" msgstr "message de validation" -#: builtin/commit.c:1573 +#: builtin/commit.c:1622 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1574 +#: builtin/commit.c:1623 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1575 +#: builtin/commit.c:1624 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:1576 +#: builtin/commit.c:1625 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:1577 +#: builtin/commit.c:1626 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:1578 builtin/log.c:1188 builtin/revert.c:86 +#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1579 +#: builtin/commit.c:1628 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1580 +#: builtin/commit.c:1629 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1581 +#: builtin/commit.c:1630 msgid "default" msgstr "défaut" -#: builtin/commit.c:1581 builtin/tag.c:603 +#: builtin/commit.c:1630 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:1582 +#: builtin/commit.c:1631 msgid "include status in commit message template" msgstr "inclure le statut dans le modèle de message de validation" -#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92 -#: builtin/tag.c:604 +#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92 +#: builtin/tag.c:605 msgid "key-id" msgstr "id de clé" -#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93 +#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93 msgid "GPG sign commit" msgstr "signer la validation avec GPG" -#: builtin/commit.c:1587 +#: builtin/commit.c:1636 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1588 +#: builtin/commit.c:1637 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1589 +#: builtin/commit.c:1638 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1590 +#: builtin/commit.c:1639 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1591 +#: builtin/commit.c:1640 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1592 +#: builtin/commit.c:1641 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1593 +#: builtin/commit.c:1642 msgid "bypass pre-commit hook" msgstr "éviter d'utiliser le crochet pre-commit" -#: builtin/commit.c:1594 +#: builtin/commit.c:1643 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1605 +#: builtin/commit.c:1654 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1606 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1611 +#: builtin/commit.c:1660 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1613 +#: builtin/commit.c:1662 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1641 +#: builtin/commit.c:1691 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: builtin/commit.c:1680 builtin/merge.c:518 +#: builtin/commit.c:1730 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: builtin/commit.c:1687 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1694 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1713 +#: builtin/commit.c:1763 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1724 +#: builtin/commit.c:1774 #, 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:1729 +#: builtin/commit.c:1779 #, 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:1744 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: builtin/commit.c:1756 -msgid "cannot lock HEAD ref" -msgstr "impossible de verrouiller la référence HEAD" - -#: builtin/commit.c:1769 -msgid "cannot update HEAD ref" -msgstr "impossible de mettre à jour la référence HEAD" - -#: builtin/commit.c:1780 +#: builtin/commit.c:1827 msgid "" "Repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full or quota is\n" +"new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" "Le dépôt a été mis à jour, mais impossible d'écrire le fichier\n" @@ -4880,63 +5013,87 @@ msgstr "terminer les valeurs avec un caractère NUL" msgid "respect include directives on lookup" msgstr "respecter les directives d'inclusion lors de la recherche" -#: builtin/count-objects.c:82 +#: builtin/config.c:315 +msgid "unable to parse default color value" +msgstr "impossible de lire la valeur de couleur par défaut" + +#: builtin/config.c:455 +#, c-format +msgid "" +"# This is Git's per-user configuration file.\n" +"[core]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tuser = %s\n" +"#\temail = %s\n" +msgstr "" +"# Ceci est le fichier de configuration personnel.\n" +"[core]\n" +"# Veuillez adapter et décommenter les lignes suivantes :\n" +"#\tuser = %s\n" +"#\temail = %s\n" + +#: builtin/config.c:590 +#, c-format +msgid "cannot create configuration file %s" +msgstr "création impossible du fichier de configuration '%s'" + +#: builtin/count-objects.c:55 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:65 msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" -#: builtin/describe.c:16 +#: builtin/describe.c:17 msgid "git describe [options] <commit-ish>*" msgstr "git describe [options] <commit ou apparenté>*" -#: builtin/describe.c:17 +#: builtin/describe.c:18 msgid "git describe [options] --dirty" msgstr "git describe [options] --dirty" -#: builtin/describe.c:216 +#: builtin/describe.c:217 #, c-format msgid "annotated tag %s not available" msgstr "l'étiquette annotée %s n'est pas disponible" -#: builtin/describe.c:220 +#: builtin/describe.c:221 #, c-format msgid "annotated tag %s has no embedded name" msgstr "l'étiquette annotée %s n'a pas de nom embarqué" -#: builtin/describe.c:222 +#: builtin/describe.c:223 #, c-format msgid "tag '%s' is really '%s' here" msgstr "l'étiquette '%s' est en fait '%s'" -#: builtin/describe.c:249 +#: builtin/describe.c:250 builtin/log.c:452 #, c-format msgid "Not a valid object name %s" msgstr "%s n'est pas un nom d'objet valide" -#: builtin/describe.c:252 +#: builtin/describe.c:253 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" -#: builtin/describe.c:269 +#: builtin/describe.c:270 #, c-format msgid "no tag exactly matches '%s'" msgstr "aucune étiquette ne correspond parfaitement à '%s'" -#: builtin/describe.c:271 +#: builtin/describe.c:272 #, c-format msgid "searching to describe %s\n" msgstr "recherche de la description de %s\n" -#: builtin/describe.c:318 +#: builtin/describe.c:319 #, c-format msgid "finished search at %s\n" msgstr "recherche terminée à %s\n" -#: builtin/describe.c:345 +#: builtin/describe.c:346 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -4945,7 +5102,7 @@ msgstr "" "Aucune étiquette annotée ne peut décrire '%s'.\n" "Cependant, il existe des étiquettes non-annotées : essayez avec --tags." -#: builtin/describe.c:349 +#: builtin/describe.c:350 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -4954,12 +5111,12 @@ msgstr "" "Aucune étiquette ne peut décrire '%s'.\n" "Essayez --always, ou créez des étiquettes." -#: builtin/describe.c:370 +#: builtin/describe.c:371 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits parcourus\n" -#: builtin/describe.c:373 +#: builtin/describe.c:374 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -4969,145 +5126,149 @@ msgstr "" "affichées\n" "abandon de la recherche à %s\n" -#: builtin/describe.c:395 +#: builtin/describe.c:396 msgid "find the tag that comes after the commit" msgstr "rechercher l'étiquette qui suit le commit" -#: builtin/describe.c:396 +#: builtin/describe.c:397 msgid "debug search strategy on stderr" msgstr "déboguer la stratégie de recherche sur stderr" -#: builtin/describe.c:397 +#: builtin/describe.c:398 msgid "use any ref" msgstr "utiliser n'importe quelle référence" -#: builtin/describe.c:398 +#: builtin/describe.c:399 msgid "use any tag, even unannotated" msgstr "utiliser n'importe quelle étiquette, même non-annotée" -#: builtin/describe.c:399 +#: builtin/describe.c:400 msgid "always use long format" msgstr "toujours utiliser le format long" -#: builtin/describe.c:400 +#: builtin/describe.c:401 msgid "only follow first parent" msgstr "ne suivre que le premier parent" -#: builtin/describe.c:403 +#: builtin/describe.c:404 msgid "only output exact matches" msgstr "n'afficher que les correspondances exactes" -#: builtin/describe.c:405 +#: builtin/describe.c:406 msgid "consider <n> most recent tags (default: 10)" msgstr "" "considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)" -#: builtin/describe.c:407 +#: builtin/describe.c:408 msgid "only consider tags matching <pattern>" msgstr "ne considérer que les étiquettes correspondant à <motif>" -#: builtin/describe.c:409 builtin/name-rev.c:318 +#: builtin/describe.c:410 builtin/name-rev.c:318 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrégés en dernier recours" -#: builtin/describe.c:410 +#: builtin/describe.c:411 msgid "mark" msgstr "marque" -#: builtin/describe.c:411 +#: builtin/describe.c:412 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")" -#: builtin/describe.c:429 +#: builtin/describe.c:430 msgid "--long is incompatible with --abbrev=0" msgstr "--long et --abbrev=0 sont incompatibles" -#: builtin/describe.c:455 +#: builtin/describe.c:456 msgid "No names found, cannot describe anything." msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit." -#: builtin/describe.c:475 +#: builtin/describe.c:476 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty est incompatible avec la spécification de commits ou assimilés" -#: builtin/diff.c:85 +#: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique" -#: builtin/diff.c:236 +#: builtin/diff.c:237 #, c-format msgid "invalid option: %s" msgstr "option invalide : %s" -#: builtin/diff.c:357 +#: builtin/diff.c:358 msgid "Not a git repository" msgstr "Ce n'est pas un dépôt git !" -#: builtin/diff.c:400 +#: builtin/diff.c:401 #, c-format msgid "invalid object '%s' given." msgstr "objet spécifié '%s' invalide." -#: builtin/diff.c:409 +#: builtin/diff.c:410 #, c-format msgid "more than two blobs given: '%s'" msgstr "plus de deux blobs spécifiés : '%s'" -#: builtin/diff.c:416 +#: builtin/diff.c:417 #, c-format msgid "unhandled object '%s' given." msgstr "objet non géré '%s' spécifié." -#: builtin/fast-export.c:23 +#: builtin/fast-export.c:24 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [options-de-liste-de-révisions]" -#: builtin/fast-export.c:702 +#: builtin/fast-export.c:979 msgid "show progress after <n> objects" msgstr "afficher la progression après <n> objets" -#: builtin/fast-export.c:704 +#: builtin/fast-export.c:981 msgid "select handling of signed tags" msgstr "sélectionner la gestion des étiquettes signées" -#: builtin/fast-export.c:707 +#: builtin/fast-export.c:984 msgid "select handling of tags that tag filtered objects" msgstr "" "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés" -#: builtin/fast-export.c:710 +#: builtin/fast-export.c:987 msgid "Dump marks to this file" msgstr "Enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:712 +#: builtin/fast-export.c:989 msgid "Import marks from this file" msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:714 +#: builtin/fast-export.c:991 msgid "Fake a tagger when tags lack one" msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas" -#: builtin/fast-export.c:716 +#: builtin/fast-export.c:993 msgid "Output full tree for each commit" msgstr "Afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:718 +#: builtin/fast-export.c:995 msgid "Use the done feature to terminate the stream" msgstr "Utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:719 +#: builtin/fast-export.c:996 msgid "Skip output of blob data" msgstr "Sauter l'affichage de données de blob" -#: builtin/fast-export.c:720 +#: builtin/fast-export.c:997 msgid "refspec" msgstr "spécificateur de référence" -#: builtin/fast-export.c:721 +#: builtin/fast-export.c:998 msgid "Apply refspec to exported refs" msgstr "Appliquer le spécificateur de référence aux références exportées" +#: builtin/fast-export.c:999 +msgid "anonymize output" +msgstr "anonymise la sortie" + #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" @@ -5182,7 +5343,7 @@ msgstr "approfondir l'historique d'un clone superficiel" msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:118 builtin/log.c:1205 +#: builtin/fetch.c:118 builtin/log.c:1208 msgid "dir" msgstr "dir" @@ -5210,78 +5371,78 @@ msgstr "spécifier une correspondance de référence pour la récupération" msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:440 +#: builtin/fetch.c:454 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:445 +#: builtin/fetch.c:459 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:459 +#: builtin/fetch.c:473 #, 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:460 builtin/fetch.c:546 +#: builtin/fetch.c:474 builtin/fetch.c:560 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:471 +#: builtin/fetch.c:485 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526 +#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 msgid " (unable to update local ref)" msgstr " (impossible de mettre à jour la référence locale)" -#: builtin/fetch.c:491 +#: builtin/fetch.c:505 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:494 +#: builtin/fetch.c:508 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:497 +#: builtin/fetch.c:511 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:548 +#: builtin/fetch.c:562 msgid "(non-fast-forward)" msgstr "(pas d'avance rapide)" -#: builtin/fetch.c:581 builtin/fetch.c:814 +#: builtin/fetch.c:595 builtin/fetch.c:828 #, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir %s : %s\n" -#: builtin/fetch.c:590 +#: builtin/fetch.c:604 #, 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:608 +#: builtin/fetch.c:622 #, 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:696 builtin/fetch.c:779 +#: builtin/fetch.c:710 builtin/fetch.c:793 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:707 +#: builtin/fetch.c:721 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5290,55 +5451,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:759 +#: builtin/fetch.c:773 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:760 +#: builtin/fetch.c:774 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:784 +#: builtin/fetch.c:798 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:785 builtin/remote.c:1059 +#: builtin/fetch.c:799 builtin/remote.c:1063 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:804 +#: builtin/fetch.c:818 #, 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:823 +#: builtin/fetch.c:837 #, 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:826 +#: builtin/fetch.c:840 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:882 +#: builtin/fetch.c:896 #, c-format msgid "Don't know how to fetch from %s" msgstr "Je ne sais pas récupérer depuis %s" -#: builtin/fetch.c:1044 +#: builtin/fetch.c:1058 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1046 builtin/remote.c:90 +#: builtin/fetch.c:1060 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1064 +#: builtin/fetch.c:1078 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5346,32 +5507,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:1087 +#: builtin/fetch.c:1101 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1131 +#: builtin/fetch.c:1143 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1133 +#: builtin/fetch.c:1145 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:1156 +#: builtin/fetch.c:1168 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1170 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:1169 +#: builtin/fetch.c:1181 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1189 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 " @@ -5383,8 +5544,8 @@ msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <fichier>]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698 -#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589 +#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590 #: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "n" @@ -5409,100 +5570,104 @@ msgstr "utiliser <texte> comme début de message" msgid "file to read from" msgstr "fichier d'où lire" -#: builtin/for-each-ref.c:1051 +#: builtin/for-each-ref.c:676 +msgid "unable to parse format" +msgstr "impossible d'analyser le format" + +#: builtin/for-each-ref.c:1057 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [options] [<motif>]" -#: builtin/for-each-ref.c:1066 +#: builtin/for-each-ref.c:1072 msgid "quote placeholders suitably for shells" msgstr "échapper les champs réservés pour les interpréteurs de commandes" -#: builtin/for-each-ref.c:1068 +#: builtin/for-each-ref.c:1074 msgid "quote placeholders suitably for perl" msgstr "échapper les champs réservés pour perl" -#: builtin/for-each-ref.c:1070 +#: builtin/for-each-ref.c:1076 msgid "quote placeholders suitably for python" msgstr "échapper les champs réservés pour python" -#: builtin/for-each-ref.c:1072 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for tcl" msgstr "échapper les champs réservés pour tcl" -#: builtin/for-each-ref.c:1075 +#: builtin/for-each-ref.c:1081 msgid "show only <n> matched refs" msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:1076 builtin/replace.c:435 +#: builtin/for-each-ref.c:1082 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1076 +#: builtin/for-each-ref.c:1082 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/for-each-ref.c:1077 +#: builtin/for-each-ref.c:1083 msgid "key" msgstr "clé" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1084 msgid "field name to sort on" msgstr "nom du champ servant à trier" -#: builtin/fsck.c:147 builtin/prune.c:172 +#: builtin/fsck.c:147 builtin/prune.c:136 msgid "Checking connectivity" msgstr "Vérification de la connectivité" -#: builtin/fsck.c:538 +#: builtin/fsck.c:540 msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" -#: builtin/fsck.c:601 +#: builtin/fsck.c:603 msgid "git fsck [options] [<object>...]" msgstr "git fsck [options] [<objet>...]" -#: builtin/fsck.c:607 +#: builtin/fsck.c:609 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:608 +#: builtin/fsck.c:610 msgid "show dangling objects" msgstr "afficher les objets en suspens" -#: builtin/fsck.c:609 +#: builtin/fsck.c:611 msgid "report tags" msgstr "afficher les étiquettes" -#: builtin/fsck.c:610 +#: builtin/fsck.c:612 msgid "report root nodes" msgstr "signaler les nœuds racines" -#: builtin/fsck.c:611 +#: builtin/fsck.c:613 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:612 +#: builtin/fsck.c:614 msgid "make reflogs head nodes (default)" msgstr "considérer les reflogs comme nœuds tête (par défaut)" -#: builtin/fsck.c:613 +#: builtin/fsck.c:615 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:614 +#: builtin/fsck.c:616 msgid "enable more strict checking" msgstr "activer une vérification plus strict" -#: builtin/fsck.c:616 +#: builtin/fsck.c:618 msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:617 builtin/prune.c:144 +#: builtin/fsck.c:619 builtin/prune.c:108 msgid "show progress" msgstr "afficher la progression" -#: builtin/fsck.c:667 +#: builtin/fsck.c:669 msgid "Checking objects" msgstr "Vérification des objets" @@ -5510,52 +5675,52 @@ msgstr "Vérification des objets" msgid "git gc [options]" msgstr "git gc [options]" -#: builtin/gc.c:91 +#: builtin/gc.c:79 #, c-format -msgid "Invalid %s: '%s'" -msgstr "%s invalide : '%s'" +msgid "Invalid gc.pruneexpire: '%s'" +msgstr "gc.pruneexpire invalide : '%s'" -#: builtin/gc.c:118 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "objet répertoire démentiellement long %.*s" -#: builtin/gc.c:287 +#: builtin/gc.c:276 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:289 +#: builtin/gc.c:278 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:290 +#: builtin/gc.c:279 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:291 +#: builtin/gc.c:280 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:332 +#: builtin/gc.c:321 #, 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:334 +#: builtin/gc.c:323 #, 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:335 +#: builtin/gc.c:324 #, 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:353 +#: builtin/gc.c:342 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5563,7 +5728,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:375 +#: builtin/gc.c:364 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5804,7 +5969,7 @@ msgstr "" msgid "both --cached and trees are given." msgstr "--cached et des arbres sont fournis en même temps." -#: builtin/hash-object.c:60 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." @@ -5812,31 +5977,38 @@ msgstr "" "git hash-object [-t <type>] [-w] [--path=<fichier>|--no-filters] [--stdin] " "[--] <fichier>..." -#: builtin/hash-object.c:61 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <liste-de-chemins>" -#: builtin/hash-object.c:72 builtin/tag.c:609 +#: builtin/hash-object.c:94 builtin/tag.c:610 msgid "type" msgstr "type" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:94 msgid "object type" msgstr "type d'objet" -#: builtin/hash-object.c:73 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "écrire l'objet dans la base de donnée d'objets" -#: builtin/hash-object.c:74 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "lire l'objet depuis l'entrée standard" -#: builtin/hash-object.c:76 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "stocker le fichier tel quel sans filtrage" -#: builtin/hash-object.c:77 +#: builtin/hash-object.c:100 +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 msgid "process file as it were from this path" msgstr "traiter le fichier comme s'il venait de ce chemin" @@ -5869,25 +6041,25 @@ msgstr "git help [--all] [--guides] [--man|--web|--info] [commande]" msgid "unrecognized help format '%s'" msgstr "format d'aide non reconnu '%s'" -#: builtin/help.c:92 +#: builtin/help.c:91 msgid "Failed to start emacsclient." msgstr "échec de démarrage d'emacsclient." -#: builtin/help.c:105 +#: builtin/help.c:104 msgid "Failed to parse emacsclient version." msgstr "échec d'analyse de la version d'emacsclient." -#: builtin/help.c:113 +#: builtin/help.c:112 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la version d'emacsclient '%d' est trop ancienne (<22)." -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 #, c-format msgid "failed to exec '%s': %s" msgstr "échec de l'exécution de '%s' : %s" -#: builtin/help.c:216 +#: builtin/help.c:215 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -5896,7 +6068,7 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n" "Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:228 +#: builtin/help.c:227 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -5905,23 +6077,27 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n" "Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:353 +#: builtin/help.c:352 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s' : visualiseur de manuel inconnu." -#: builtin/help.c:370 +#: builtin/help.c:369 msgid "no man viewer handled the request" msgstr "aucun visualiseur de manuel n'a pris en charge la demande" -#: builtin/help.c:378 +#: builtin/help.c:377 msgid "no info viewer handled the request" msgstr "aucun visualiseur de 'info' n'a pris en charge la demande" -#: builtin/help.c:424 +#: builtin/help.c:423 msgid "Defining attributes per path" msgstr "Définition des attributs par chemin" +#: builtin/help.c:424 +msgid "Everyday Git With 20 Commands Or So" +msgstr "Git de tous les jours avec à peu près 20 commandes" + #: builtin/help.c:425 msgid "A Git glossary" msgstr "Un glossaire Git" @@ -5961,292 +6137,292 @@ msgstr "usage : %s%s" msgid "`git %s' is aliased to `%s'" msgstr "`git %s\" est un alias de `%s'" -#: builtin/index-pack.c:145 +#: builtin/index-pack.c:150 #, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" -#: builtin/index-pack.c:191 +#: builtin/index-pack.c:200 #, c-format msgid "object type mismatch at %s" msgstr "type d'objet non correspondant à %s" -#: builtin/index-pack.c:211 +#: builtin/index-pack.c:220 #, c-format msgid "did not receive expected object %s" msgstr "objet attendu non reçu %s" -#: builtin/index-pack.c:214 +#: builtin/index-pack.c:223 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objet %s : type attendu %s, reçu %s" -#: builtin/index-pack.c:256 +#: builtin/index-pack.c:265 #, 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:266 +#: builtin/index-pack.c:275 msgid "early EOF" msgstr "fin de fichier prématurée" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:276 msgid "read error on input" msgstr "erreur de lecture sur l'entrée" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:288 msgid "used more bytes than were available" msgstr "plus d'octets utilisés que disponibles" -#: builtin/index-pack.c:286 +#: builtin/index-pack.c:295 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:302 +#: builtin/index-pack.c:311 #, c-format msgid "unable to create '%s'" msgstr "impossible de créer '%s'" -#: builtin/index-pack.c:307 +#: builtin/index-pack.c:316 #, c-format msgid "cannot open packfile '%s'" msgstr "impossible d'ouvrir le fichier paquet '%s'" -#: builtin/index-pack.c:321 +#: builtin/index-pack.c:330 msgid "pack signature mismatch" msgstr "la signature du paquet ne correspond pas" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:332 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "la version de paquet %<PRIu32> non supportée" -#: builtin/index-pack.c:341 +#: builtin/index-pack.c:350 #, 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:462 +#: builtin/index-pack.c:471 #, c-format msgid "inflate returned %d" msgstr "la décompression (inflate) a retourné %d" -#: builtin/index-pack.c:511 +#: builtin/index-pack.c:520 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:519 +#: builtin/index-pack.c:528 msgid "delta base offset is out of bound" msgstr "l'objet delta de base est hors limite" -#: builtin/index-pack.c:527 +#: builtin/index-pack.c:536 #, c-format msgid "unknown object type %d" msgstr "type d'objet inconnu %d" -#: builtin/index-pack.c:558 +#: builtin/index-pack.c:567 msgid "cannot pread pack file" msgstr "impossible de lire (pread) le fichier paquet" -#: builtin/index-pack.c:560 +#: builtin/index-pack.c:569 #, 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:586 +#: builtin/index-pack.c:595 msgid "serious inflate inconsistency" msgstr "grave incohérence dans la décompression (inflate)" -#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706 -#: builtin/index-pack.c:740 builtin/index-pack.c:749 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:680 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:689 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" -#: builtin/index-pack.c:746 +#: builtin/index-pack.c:755 #, c-format msgid "cannot read existing object %s" msgstr "impossible de lire l'objet existant %s" -#: builtin/index-pack.c:760 +#: builtin/index-pack.c:769 #, c-format msgid "invalid blob object %s" msgstr "objet blob invalide %s" -#: builtin/index-pack.c:774 +#: builtin/index-pack.c:783 #, c-format msgid "invalid %s" msgstr "%s invalide" -#: builtin/index-pack.c:777 +#: builtin/index-pack.c:787 msgid "Error in object" msgstr "Erreur dans l'objet" -#: builtin/index-pack.c:779 +#: builtin/index-pack.c:789 #, 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:851 builtin/index-pack.c:881 +#: builtin/index-pack.c:861 builtin/index-pack.c:890 msgid "failed to apply delta" msgstr "échec d'application du delta" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Receiving objects" msgstr "Réception d'objets" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Indexing objects" msgstr "Indexation d'objets" -#: builtin/index-pack.c:1048 +#: builtin/index-pack.c:1081 msgid "pack is corrupted (SHA1 mismatch)" msgstr "le paquet est corrompu (SHA1 ne correspond pas)" -#: builtin/index-pack.c:1053 +#: builtin/index-pack.c:1086 msgid "cannot fstat packfile" msgstr "impossible d'obtenir le statut (fstat) du fichier paquet" -#: builtin/index-pack.c:1056 +#: builtin/index-pack.c:1089 msgid "pack has junk at the end" msgstr "le paquet est invalide à la fin" -#: builtin/index-pack.c:1067 +#: builtin/index-pack.c:1100 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusion extrême dans parse_pack_objects()" -#: builtin/index-pack.c:1090 +#: builtin/index-pack.c:1123 msgid "Resolving deltas" msgstr "Résolution des deltas" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1133 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" -#: builtin/index-pack.c:1142 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity" msgstr "confusion extrême" -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1181 #, c-format msgid "completed with %d local objects" msgstr "complété avec %d objets locaux" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1191 #, 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:1164 +#: builtin/index-pack.c:1195 #, 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:1189 +#: builtin/index-pack.c:1220 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1299 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1323 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1336 #, c-format msgid "cannot write keep file '%s'" msgstr "impossible d'écrire le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1313 +#: builtin/index-pack.c:1344 #, c-format msgid "cannot close written keep file '%s'" msgstr "impossible de fermer le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1326 +#: builtin/index-pack.c:1357 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1337 +#: builtin/index-pack.c:1368 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1370 +#: builtin/index-pack.c:1401 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1376 +#: builtin/index-pack.c:1407 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/index-pack.c:1380 builtin/index-pack.c:1559 +#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1469 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1471 #, 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:1487 +#: builtin/index-pack.c:1518 #, 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:1494 +#: builtin/index-pack.c:1525 #, 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:1523 +#: builtin/index-pack.c:1554 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1571 builtin/index-pack.c:1574 -#: builtin/index-pack.c:1586 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 +#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1604 +#: builtin/index-pack.c:1635 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1608 builtin/index-pack.c:1617 +#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 #, 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:1625 +#: builtin/index-pack.c:1656 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" @@ -6356,11 +6532,7 @@ msgstr "vide initialisé" msgid " shared" msgstr " partagé" -#: builtin/init-db.c:439 -msgid "cannot tell cwd" -msgstr "impossible de déterminer le répertoire de travail courant" - -#: builtin/init-db.c:465 +#: builtin/init-db.c:467 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [directory]" @@ -6368,29 +6540,29 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--" "shared[=<permissions>]] [répertoire]" -#: builtin/init-db.c:488 +#: builtin/init-db.c:490 msgid "permissions" msgstr "permissions" -#: builtin/init-db.c:489 +#: builtin/init-db.c:491 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:491 builtin/prune-packed.c:79 builtin/repack.c:172 +#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172 msgid "be quiet" msgstr "être silencieux" -#: builtin/init-db.c:523 builtin/init-db.c:528 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "impossible de créer le répertoire (mkdir) %s" -#: builtin/init-db.c:532 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se déplacer vers le répertoire (chdir) %s" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6399,15 +6571,31 @@ msgstr "" "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --" "git-dir=<répertoire>)" -#: builtin/init-db.c:578 -msgid "Cannot access current working directory" -msgstr "Impossible d'accéder au répertoire de travail courant" - -#: builtin/init-db.c:585 +#: builtin/init-db.c:583 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accéder à l'arbre de travail '%s'" +#: builtin/interpret-trailers.c:15 +msgid "" +"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " +"[<file>...]" +msgstr "" +"git interpret-trailers [--trim-empty] [(--trailer " +"<symbole>[(=|:)<valeur>])...] [<fichier>...]" + +#: builtin/interpret-trailers.c:25 +msgid "trim empty trailers" +msgstr "éliminer les lignes de fin vides" + +#: builtin/interpret-trailers.c:26 +msgid "trailer" +msgstr "ligne de fin" + +#: builtin/interpret-trailers.c:27 +msgid "trailer(s) to add" +msgstr "ligne(s) de fin à ajouter" + #: builtin/log.c:41 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "git log [<options>] [<page de révisions>] [[--] <chemin>...]\n" @@ -6416,6 +6604,11 @@ msgstr "git log [<options>] [<page de révisions>] [[--] <chemin>...]\n" msgid " or: git show [options] <object>..." msgstr " ou : git show [options] <objet>..." +#: builtin/log.c:81 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "option --decorate invalide : %s" + #: builtin/log.c:127 msgid "suppress diff output" msgstr "supprimer la sortie des différences" @@ -6432,242 +6625,253 @@ msgstr "Utiliser le fichier de correspondance de mail" msgid "decorate options" msgstr "décorer les options" +#: builtin/log.c:133 +msgid "Process line range n,m in file, counting from 1" +msgstr "" +"Traiter seulement l'intervalle de lignes n,m du fichier en commençant le " +"compte à 1" + #: builtin/log.c:229 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:470 builtin/log.c:562 +#: builtin/log.c:458 +#, c-format +msgid "git show %s: bad file" +msgstr "git show %s : fichier incorrect" + +#: builtin/log.c:472 builtin/log.c:564 #, c-format msgid "Could not read object %s" msgstr "Impossible de lire l'objet %s" -#: builtin/log.c:586 +#: builtin/log.c:588 #, c-format msgid "Unknown type: %d" msgstr "Type inconnu : %d" -#: builtin/log.c:687 +#: builtin/log.c:689 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:771 +#: builtin/log.c:773 msgid "name of output directory is too long" msgstr "le nom du répertoire de sortie est trop long" -#: builtin/log.c:787 +#: builtin/log.c:789 #, c-format msgid "Cannot open patch file %s" msgstr "Impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:801 +#: builtin/log.c:803 msgid "Need exactly one range." msgstr "Exactement une plage nécessaire." -#: builtin/log.c:809 +#: builtin/log.c:811 msgid "Not a range." msgstr "Ceci n'est pas une plage." -#: builtin/log.c:916 +#: builtin/log.c:919 msgid "Cover letter needs email format" msgstr "La lettre de motivation doit être au format e-mail" -#: builtin/log.c:995 +#: builtin/log.c:998 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1023 +#: builtin/log.c:1026 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [options] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1068 +#: builtin/log.c:1071 msgid "Two output directories?" msgstr "Deux répertoires de sortie ?" -#: builtin/log.c:1183 +#: builtin/log.c:1186 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1186 +#: builtin/log.c:1189 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1190 +#: builtin/log.c:1193 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1192 +#: builtin/log.c:1195 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1194 +#: builtin/log.c:1197 msgid "use simple number sequence for output file names" msgstr "" "utiliser une séquence simple de nombres pour les nom des fichiers de sortie" -#: builtin/log.c:1195 +#: builtin/log.c:1198 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1196 +#: builtin/log.c:1199 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1198 +#: builtin/log.c:1201 msgid "start numbering patches at <n> instead of 1" msgstr "démarrer la numérotation des patchs à <n> au lieu de 1" -#: builtin/log.c:1200 +#: builtin/log.c:1203 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1202 +#: builtin/log.c:1205 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1205 +#: builtin/log.c:1208 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1208 +#: builtin/log.c:1211 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1211 +#: builtin/log.c:1214 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1213 +#: builtin/log.c:1216 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1215 +#: builtin/log.c:1218 msgid "show patch format instead of default (patch + stat)" msgstr "afficher le format du patch au lieu du défaut (patch + stat)" -#: builtin/log.c:1217 +#: builtin/log.c:1220 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1218 +#: builtin/log.c:1221 msgid "header" msgstr "en-tête" -#: builtin/log.c:1219 +#: builtin/log.c:1222 msgid "add email header" msgstr "ajouter l'en-tête d'e-mail" -#: builtin/log.c:1220 builtin/log.c:1222 +#: builtin/log.c:1223 builtin/log.c:1225 msgid "email" msgstr "e-mail" -#: builtin/log.c:1220 +#: builtin/log.c:1223 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1222 +#: builtin/log.c:1225 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1224 +#: builtin/log.c:1227 msgid "ident" msgstr "ident" -#: builtin/log.c:1225 +#: builtin/log.c:1228 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" -#: builtin/log.c:1227 +#: builtin/log.c:1230 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1228 +#: builtin/log.c:1231 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1229 builtin/log.c:1232 +#: builtin/log.c:1232 builtin/log.c:1235 msgid "boundary" msgstr "limite" -#: builtin/log.c:1230 +#: builtin/log.c:1233 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1233 +#: builtin/log.c:1236 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1237 +#: builtin/log.c:1240 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1239 +#: builtin/log.c:1242 msgid "signature" msgstr "signature" -#: builtin/log.c:1240 +#: builtin/log.c:1243 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1242 +#: builtin/log.c:1245 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1243 +#: builtin/log.c:1246 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1317 +#: builtin/log.c:1320 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/log.c:1332 +#: builtin/log.c:1335 msgid "-n and -k are mutually exclusive." msgstr "-n et -k sont mutuellement exclusifs." -#: builtin/log.c:1334 +#: builtin/log.c:1337 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix et -k sont mutuellement exclusifs." -#: builtin/log.c:1342 +#: builtin/log.c:1345 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1344 +#: builtin/log.c:1347 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1346 +#: builtin/log.c:1349 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1369 +#: builtin/log.c:1372 msgid "standard output, or directory, which one?" msgstr "sortie standard, ou répertoire, lequel ?" -#: builtin/log.c:1371 +#: builtin/log.c:1374 #, c-format msgid "Could not create directory '%s'" msgstr "Impossible de créer le répertoire '%s'" -#: builtin/log.c:1468 +#: builtin/log.c:1472 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:1531 +#: builtin/log.c:1535 msgid "Failed to create output files" msgstr "Échec de création des fichiers en sortie" -#: builtin/log.c:1579 +#: builtin/log.c:1583 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:1634 +#: builtin/log.c:1638 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -6675,7 +6879,7 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spécifier " "<branche_amont> manuellement.\n" -#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661 +#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 #, c-format msgid "Unknown commit %s" msgstr "Commit inconnu %s" @@ -6722,7 +6926,7 @@ msgstr "" "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés" #: builtin/ls-files.c:477 -msgid "show 'other' directories' name only" +msgid "show 'other' directories' names only" msgstr "afficher seulement les noms des répertoires 'other'" #: builtin/ls-files.c:480 @@ -6813,101 +7017,101 @@ msgstr "" "afficher l'arbre entier ; pas seulement le répertoire courant (implique --" "full-name)" -#: builtin/merge.c:43 +#: builtin/merge.c:44 msgid "git merge [options] [<commit>...]" msgstr "git merge [options] [<commit>...]" -#: builtin/merge.c:44 +#: builtin/merge.c:45 msgid "git merge [options] <msg> HEAD <commit>" msgstr "git merge [options] <message> HEAD <commit>" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:98 +#: builtin/merge.c:99 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:135 +#: builtin/merge.c:136 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" -#: builtin/merge.c:136 +#: builtin/merge.c:137 #, c-format msgid "Available strategies are:" msgstr "Les stratégies disponibles sont :" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:191 +#: builtin/merge.c:192 msgid "do not show a diffstat at the end of the merge" msgstr "ne pas afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:194 +#: builtin/merge.c:195 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:195 +#: builtin/merge.c:196 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:197 +#: builtin/merge.c:198 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "ajouter (au plus <n>) éléments du journal court au message de validation de " "la fusion" -#: builtin/merge.c:200 +#: builtin/merge.c:201 msgid "create a single commit instead of doing a merge" msgstr "créer une validation unique au lieu de faire une fusion" -#: builtin/merge.c:202 +#: builtin/merge.c:203 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:204 +#: builtin/merge.c:205 msgid "edit message before committing" msgstr "éditer le message avant la validation" -#: builtin/merge.c:205 +#: builtin/merge.c:206 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:211 +#: builtin/merge.c:212 msgid "Verify that the named commit has a valid GPG signature" msgstr "Vérifier que la validation a une signature GPG valide" -#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89 +#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:214 +#: builtin/merge.c:215 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:215 +#: builtin/merge.c:216 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:217 +#: builtin/merge.c:218 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "message de validation de la fusion (pour une fusion sans avance rapide)" -#: builtin/merge.c:221 +#: builtin/merge.c:222 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" @@ -6964,33 +7168,33 @@ msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" 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:677 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:691 #, 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:704 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:794 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:803 +#: builtin/merge.c:802 #, 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:808 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7007,164 +7211,164 @@ 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:832 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:845 +#: builtin/merge.c:844 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:908 +#: builtin/merge.c:907 #, 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:924 +#: builtin/merge.c:923 #, c-format msgid "'%s' is not a commit" msgstr "'%s' n'est pas une validation" -#: builtin/merge.c:965 +#: builtin/merge.c:964 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:967 +#: builtin/merge.c:966 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:969 +#: builtin/merge.c:968 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:974 +#: builtin/merge.c:973 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1130 +#: builtin/merge.c:1129 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:1146 git-pull.sh:31 +#: builtin/merge.c:1145 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" -"Veuillez valider vos changements avant de pouvoir fusionner." +"Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1149 git-pull.sh:34 +#: builtin/merge.c:1148 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: builtin/merge.c:1153 +#: builtin/merge.c:1152 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" -"Veuillez valider vos changements avant de pouvoir fusionner." +"Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1156 +#: builtin/merge.c:1155 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:1165 +#: builtin/merge.c:1164 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1174 +#: builtin/merge.c:1173 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:1206 +#: builtin/merge.c:1205 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:1209 +#: builtin/merge.c:1208 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:1211 +#: builtin/merge.c:1210 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:1216 +#: builtin/merge.c:1215 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1267 +#: builtin/merge.c:1266 #, 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:1270 +#: builtin/merge.c:1269 #, 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:1273 +#: builtin/merge.c:1272 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: builtin/merge.c:1276 +#: builtin/merge.c:1275 #, 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:1357 +#: builtin/merge.c:1356 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1396 +#: builtin/merge.c:1395 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1403 +#: builtin/merge.c:1402 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1435 +#: builtin/merge.c:1434 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1458 builtin/merge.c:1537 +#: builtin/merge.c:1457 builtin/merge.c:1536 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1462 +#: builtin/merge.c:1461 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1528 +#: builtin/merge.c:1527 #, 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:1530 +#: builtin/merge.c:1529 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1538 #, 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:1551 +#: builtin/merge.c:1550 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7270,88 +7474,92 @@ msgstr "autoriser la création de plus d'un arbre" msgid "git mv [options] <source>... <destination>" msgstr "git mv [options] <source>... <destination>" +#: builtin/mv.c:69 +#, c-format +msgid "Directory %s is in index and no submodule?" +msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?" + #: builtin/mv.c:71 +msgid "Please stage your changes to .gitmodules or stash them to proceed" +msgstr "" +"Veuillez indexer vos modifications de .gitmodules ou les remiser pour " +"continuer" + +#: builtin/mv.c:89 +#, c-format +msgid "%.*s is in index" +msgstr "%.*s est dans l'index" + +#: builtin/mv.c:111 msgid "force move/rename even if target exists" msgstr "forcer le déplacement/renommage même si la cible existe" -#: builtin/mv.c:72 +#: builtin/mv.c:112 msgid "skip move/rename errors" msgstr "sauter les erreurs de déplacement/renommage" -#: builtin/mv.c:122 +#: builtin/mv.c:151 +#, c-format +msgid "destination '%s' is not a directory" +msgstr "la destination '%s' n'est pas un répertoire" + +#: builtin/mv.c:162 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Vérification du renommage de '%s' en '%s'\n" -#: builtin/mv.c:126 +#: builtin/mv.c:166 msgid "bad source" msgstr "mauvaise source" -#: builtin/mv.c:129 +#: builtin/mv.c:169 msgid "can not move directory into itself" msgstr "impossible de déplacer un répertoire dans lui-même" -#: builtin/mv.c:132 +#: builtin/mv.c:172 msgid "cannot move directory over file" msgstr "impossible de déplacer un répertoire sur un fichier" -#: builtin/mv.c:138 -#, c-format -msgid "Huh? Directory %s is in index and no submodule?" -msgstr "" -"Hein ? Le répertoire %s est dans l'index et pourtant aucun sous-module ?" - -#: builtin/mv.c:140 builtin/rm.c:318 -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/mv.c:156 -#, c-format -msgid "Huh? %.*s is in index?" -msgstr "Hein ? %.*s est dans l'index ?" - -#: builtin/mv.c:169 +#: builtin/mv.c:181 msgid "source directory is empty" msgstr "le répertoire source est vide" -#: builtin/mv.c:205 +#: builtin/mv.c:206 msgid "not under version control" msgstr "pas sous le contrôle de version" -#: builtin/mv.c:208 +#: builtin/mv.c:209 msgid "destination exists" msgstr "la destination existe" -#: builtin/mv.c:216 +#: builtin/mv.c:217 #, c-format msgid "overwriting '%s'" msgstr "écrasement de '%s'" -#: builtin/mv.c:219 +#: builtin/mv.c:220 msgid "Cannot overwrite" msgstr "Impossible d'écraser" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "multiple sources for the same target" msgstr "multiples sources pour la même destination" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "destination directory does not exist" msgstr "le répertoire de destination n'existe pas" -#: builtin/mv.c:244 +#: builtin/mv.c:232 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, source=%s, destination=%s" -#: builtin/mv.c:254 +#: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" @@ -7509,118 +7717,118 @@ msgstr "git notes prune [<options>]" msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:137 +#: builtin/notes.c:136 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "impossible de démarrer 'show' pour l'objet '%s'" -#: builtin/notes.c:141 +#: builtin/notes.c:140 msgid "could not read 'show' output" msgstr "impossible de lire la sortie de 'show'" -#: builtin/notes.c:149 +#: builtin/notes.c:148 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "impossible de finir 'show' pour l'objet '%s'" -#: builtin/notes.c:167 builtin/tag.c:477 +#: builtin/notes.c:166 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" -#: builtin/notes.c:186 +#: builtin/notes.c:185 msgid "Please supply the note contents using either -m or -F option" msgstr "Veuillez fournir le contenu de la note en utilisant l'option -m ou -F" -#: builtin/notes.c:207 builtin/notes.c:848 +#: builtin/notes.c:206 builtin/notes.c:847 #, c-format msgid "Removing note for object %s\n" msgstr "Suppression de la note pour l'objet %s\n" -#: builtin/notes.c:212 +#: builtin/notes.c:211 msgid "unable to write note object" msgstr "impossible d'écrire l'objet note" -#: builtin/notes.c:214 +#: builtin/notes.c:213 #, c-format -msgid "The note contents has been left in %s" +msgid "The note contents have been left in %s" msgstr "Le contenu de la note a été laissé dans %s" -#: builtin/notes.c:248 builtin/tag.c:692 +#: builtin/notes.c:247 builtin/tag.c:693 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: builtin/notes.c:250 builtin/tag.c:695 +#: builtin/notes.c:249 builtin/tag.c:696 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" -#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322 -#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519 -#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641 -#: builtin/notes.c:843 builtin/tag.c:708 +#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321 +#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518 +#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640 +#: builtin/notes.c:842 builtin/tag.c:709 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Impossible de résoudre '%s' comme une référence valide." -#: builtin/notes.c:272 +#: builtin/notes.c:271 #, c-format msgid "Failed to read object '%s'." msgstr "Impossible de lire l'objet '%s'." -#: builtin/notes.c:276 +#: builtin/notes.c:275 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "Impossible de lire les informations de note d'un objet non-blob '%s'." -#: builtin/notes.c:316 +#: builtin/notes.c:315 #, c-format msgid "Malformed input line: '%s'." msgstr "Ligne en entrée malformée : '%s'." -#: builtin/notes.c:331 +#: builtin/notes.c:330 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Impossible de copier les notes de '%s' vers '%s'" -#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502 -#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634 -#: builtin/notes.c:908 +#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501 +#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633 +#: builtin/notes.c:907 msgid "too many parameters" msgstr "trop de paramètres" -#: builtin/notes.c:388 builtin/notes.c:647 +#: builtin/notes.c:387 builtin/notes.c:646 #, c-format msgid "No note found for object %s." msgstr "Pas de note trouvée pour l'objet %s." -#: builtin/notes.c:410 builtin/notes.c:567 +#: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents as a string" msgstr "contenu de la note sous forme de chaîne" -#: builtin/notes.c:413 builtin/notes.c:570 +#: builtin/notes.c:412 builtin/notes.c:569 msgid "note contents in a file" msgstr "contenu de la note dans un fichier" -#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572 -#: builtin/notes.c:575 builtin/tag.c:627 +#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571 +#: builtin/notes.c:574 builtin/tag.c:628 msgid "object" msgstr "objet" -#: builtin/notes.c:416 builtin/notes.c:573 +#: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "réutiliser et éditer l'objet de note spécifié" -#: builtin/notes.c:419 builtin/notes.c:576 +#: builtin/notes.c:418 builtin/notes.c:575 msgid "reuse specified note object" msgstr "réutiliser l'objet de note spécifié" -#: builtin/notes.c:421 builtin/notes.c:489 +#: builtin/notes.c:420 builtin/notes.c:488 msgid "replace existing notes" msgstr "remplacer les notes existantes" -#: builtin/notes.c:455 +#: builtin/notes.c:454 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7629,25 +7837,25 @@ msgstr "" "Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. " "Utilisez '-f' pour écraser les notes existantes" -#: builtin/notes.c:460 builtin/notes.c:537 +#: builtin/notes.c:459 builtin/notes.c:536 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Écrasement des notes existantes pour l'objet %s\n" -#: builtin/notes.c:490 +#: builtin/notes.c:489 msgid "read objects from stdin" msgstr "lire les objets depuis l'entrée standard" -#: builtin/notes.c:492 +#: builtin/notes.c:491 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "charger la configuration de réécriture pour <commande> (implique --stdin)" -#: builtin/notes.c:510 +#: builtin/notes.c:509 msgid "too few parameters" msgstr "pas assez de paramètres" -#: builtin/notes.c:531 +#: builtin/notes.c:530 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7656,12 +7864,12 @@ msgstr "" "Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. " "Utilisez '-f' pour écraser les notes existantes" -#: builtin/notes.c:543 +#: builtin/notes.c:542 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Notes manquantes sur l'objet source %s. Impossible de copier." -#: builtin/notes.c:592 +#: builtin/notes.c:591 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -7670,15 +7878,15 @@ msgstr "" "Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n" "Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n" -#: builtin/notes.c:739 +#: builtin/notes.c:738 msgid "General options" msgstr "Options générales" -#: builtin/notes.c:741 +#: builtin/notes.c:740 msgid "Merge options" msgstr "Options de fusion" -#: builtin/notes.c:743 +#: builtin/notes.c:742 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -7686,235 +7894,239 @@ msgstr "" "résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:745 +#: builtin/notes.c:744 msgid "Committing unmerged notes" msgstr "Validation des notes non fusionnées" -#: builtin/notes.c:747 +#: builtin/notes.c:746 msgid "finalize notes merge by committing unmerged notes" msgstr "finaliser la fusion de notes en validant les notes non fusionnées" -#: builtin/notes.c:749 +#: builtin/notes.c:748 msgid "Aborting notes merge resolution" msgstr "Abandon de la résolution de fusion des notes" -#: builtin/notes.c:751 +#: builtin/notes.c:750 msgid "abort notes merge" msgstr "abandonner la fusion de notes" -#: builtin/notes.c:846 +#: builtin/notes.c:845 #, c-format msgid "Object %s has no note\n" msgstr "L'objet %s n'a pas de note\n" -#: builtin/notes.c:858 +#: builtin/notes.c:857 msgid "attempt to remove non-existent note is not an error" msgstr "" "la tentative de suppression d'une note non existante n'est pas une erreur" -#: builtin/notes.c:861 +#: builtin/notes.c:860 msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:942 +#: builtin/notes.c:941 msgid "notes-ref" msgstr "références-notes" -#: builtin/notes.c:943 +#: builtin/notes.c:942 msgid "use notes from <notes_ref>" msgstr "utiliser les notes depuis <références_notes>" -#: builtin/notes.c:978 builtin/remote.c:1616 +#: builtin/notes.c:977 builtin/remote.c:1624 #, c-format msgid "Unknown subcommand: %s" msgstr "Sous-commande inconnue : %s" -#: builtin/pack-objects.c:25 +#: builtin/pack-objects.c:28 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "" "git pack-objects --stdout [options...] [< liste-références | < liste-objets]" -#: builtin/pack-objects.c:26 +#: builtin/pack-objects.c:29 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" "git pack-objects [options...] base-name [< liste-références | < liste-objets]" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: builtin/pack-objects.c:771 +#: builtin/pack-objects.c:773 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1015 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:2174 +#: builtin/pack-objects.c:2175 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2526 +#: builtin/pack-objects.c:2572 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2530 +#: builtin/pack-objects.c:2576 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2553 +#: builtin/pack-objects.c:2599 #, 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:2557 +#: builtin/pack-objects.c:2603 #, 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:2576 +#: builtin/pack-objects.c:2622 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2578 +#: builtin/pack-objects.c:2624 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c:2626 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:2583 +#: builtin/pack-objects.c:2629 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:2584 +#: builtin/pack-objects.c:2630 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2585 +#: builtin/pack-objects.c:2631 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:2588 +#: builtin/pack-objects.c:2634 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2590 +#: builtin/pack-objects.c:2636 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2638 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2640 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2642 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:2598 +#: builtin/pack-objects.c:2644 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:2600 +#: builtin/pack-objects.c:2646 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2602 +#: builtin/pack-objects.c:2648 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2650 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2652 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:2608 +#: builtin/pack-objects.c:2654 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2656 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2658 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:2615 +#: builtin/pack-objects.c:2661 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2664 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:2621 +#: builtin/pack-objects.c:2667 +msgid "include objects referred to by the index" +msgstr "inclure les objets référencés par l'index" + +#: builtin/pack-objects.c:2670 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2672 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:2625 +#: builtin/pack-objects.c:2674 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2626 parse-options.h:140 +#: builtin/pack-objects.c:2675 parse-options.h:140 msgid "time" msgstr "heure" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2676 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2679 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2681 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2683 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2685 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:2638 +#: builtin/pack-objects.c:2687 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:2640 +#: builtin/pack-objects.c:2689 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:2719 +#: builtin/pack-objects.c:2778 msgid "Counting objects" msgstr "Décompte des objets" @@ -7934,7 +8146,7 @@ msgstr "éliminer les références perdues (défaut)" msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" -#: builtin/prune-packed.c:49 +#: builtin/prune-packed.c:40 msgid "Removing duplicate objects" msgstr "Suppression des objets dupliqués" @@ -7942,15 +8154,15 @@ msgstr "Suppression des objets dupliqués" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]" -#: builtin/prune.c:142 +#: builtin/prune.c:106 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" -#: builtin/prune.c:143 +#: builtin/prune.c:107 msgid "report pruned objects" msgstr "afficher les objets éliminés" -#: builtin/prune.c:146 +#: builtin/prune.c:110 msgid "expire objects older than <time>" msgstr "faire expirer les objets plus vieux que <heure>" @@ -8227,80 +8439,80 @@ msgstr "--mirror ne peut pas être combiné avec des spécifications de référe msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:482 +#: builtin/push.c:493 msgid "repository" msgstr "dépôt" -#: builtin/push.c:483 +#: builtin/push.c:494 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:484 +#: builtin/push.c:495 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:486 +#: builtin/push.c:497 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:487 +#: builtin/push.c:498 msgid "push tags (can't be used with --all or --mirror)" msgstr "" "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)" -#: builtin/push.c:490 +#: builtin/push.c:501 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:492 +#: builtin/push.c:503 msgid "refname>:<expect" msgstr "nom de référence>:<attendu" -#: builtin/push.c:493 +#: builtin/push.c:504 msgid "require old value of ref to be at this value" msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur" -#: builtin/push.c:495 -msgid "check" -msgstr "check" - -#: builtin/push.c:496 +#: builtin/push.c:507 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:498 +#: builtin/push.c:509 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:499 builtin/push.c:500 +#: builtin/push.c:510 builtin/push.c:511 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:501 +#: builtin/push.c:512 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:504 +#: builtin/push.c:515 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:506 +#: builtin/push.c:517 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:507 +#: builtin/push.c:518 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:517 +#: builtin/push.c:520 +msgid "GPG sign the push" +msgstr "signer la poussée avec GPG" + +#: builtin/push.c:529 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:519 +#: builtin/push.c:531 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" -#: builtin/read-tree.c:36 +#: builtin/read-tree.c:37 msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -8311,67 +8523,67 @@ msgstr "" "sparse-checkout] [--index-output=<fichier>] (--empty | <arbre ou apparenté " "1> [<arbre ou apparenté 2> [<arbre ou apparenté 3>]])" -#: builtin/read-tree.c:109 +#: builtin/read-tree.c:110 msgid "write resulting index to <file>" msgstr "écrire l'index résultant dans <fichier>" -#: builtin/read-tree.c:112 +#: builtin/read-tree.c:113 msgid "only empty the index" msgstr "juste vider l'index" -#: builtin/read-tree.c:114 +#: builtin/read-tree.c:115 msgid "Merging" msgstr "Fusion" -#: builtin/read-tree.c:116 +#: builtin/read-tree.c:117 msgid "perform a merge in addition to a read" msgstr "effectuer une fusion en plus d'une lecture" -#: builtin/read-tree.c:118 +#: builtin/read-tree.c:119 msgid "3-way merge if no file level merging required" msgstr "fusion à 3 points si aucune fusion de niveau fichier n'est requise" -#: builtin/read-tree.c:120 +#: builtin/read-tree.c:121 msgid "3-way merge in presence of adds and removes" msgstr "fusion à 3 points en présence d'ajouts et suppressions" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:123 msgid "same as -m, but discard unmerged entries" msgstr "comme -m, mais annule les éléments non fusionnés" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "<subdirectory>/" msgstr "<sous-répertoire>/" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:125 msgid "read the tree into the index under <subdirectory>/" msgstr "lire l'arbre dans l'index dans <sous-répertoire>/" -#: builtin/read-tree.c:127 +#: builtin/read-tree.c:128 msgid "update working tree with merge result" msgstr "mettre à jour la copie de travail avec le résultat de la fusion" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:131 msgid "allow explicitly ignored files to be overwritten" msgstr "autoriser explicitement les fichiers ignorés à être écrasés" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't check the working tree after merging" msgstr "ne pas vérifier la copie de travail après la fusion" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:135 msgid "don't update the index or the work tree" msgstr "ne pas mettre à jour l'index ou la copie de travail" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" msgstr "sauter l'application du filtre d'extraction creuse" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "déboguer unpack-trees" @@ -8526,12 +8738,12 @@ msgstr "" "spécifier les branches à suivre n'a de sens qu'avec des miroirs de " "rapatriement" -#: builtin/remote.c:185 builtin/remote.c:640 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "la distante %s existe déjà." -#: builtin/remote.c:189 builtin/remote.c:644 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' n'est pas un nom valide de distante" @@ -8541,11 +8753,6 @@ msgstr "'%s' n'est pas un nom valide de distante" msgid "Could not setup master '%s'" msgstr "Impossible de paramétrer la maîtresse '%s'" -#: builtin/remote.c:288 -#, c-format -msgid "more than one %s" -msgstr "plus d'un %s" - #: builtin/remote.c:333 #, c-format msgid "Could not get fetch map for refspec %s" @@ -8561,27 +8768,27 @@ msgstr "(correspond)" msgid "(delete)" msgstr "(supprimer)" -#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Impossible d'ajouter '%s' à '%s'" -#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894 +#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898 #, c-format msgid "No such remote: %s" msgstr "Distante inconnue : %s" -#: builtin/remote.c:650 +#: builtin/remote.c:651 #, 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:656 builtin/remote.c:846 +#: builtin/remote.c:657 builtin/remote.c:850 #, c-format msgid "Could not remove config section '%s'" msgstr "Impossible de supprimer la section de configuration '%s'" -#: builtin/remote.c:671 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8592,32 +8799,32 @@ msgstr "" "\t%s\n" "\tVeuillez mettre à jour la configuration manuellement si nécessaire." -#: builtin/remote.c:677 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "Impossible d'ajouter '%s'" -#: builtin/remote.c:688 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "Impossible de définir '%s'" -#: builtin/remote.c:710 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "échec de suppression de '%s'" -#: builtin/remote.c:744 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "échec de création de '%s'" -#: builtin/remote.c:765 +#: builtin/remote.c:769 #, c-format msgid "Could not remove branch %s" msgstr "Impossible de supprimer la branche %s" -#: builtin/remote.c:832 +#: builtin/remote.c:836 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8632,120 +8839,120 @@ msgstr[1] "" "supprimées ;\n" "pour les supprimer, utilisez :" -#: builtin/remote.c:947 +#: builtin/remote.c:951 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)" -#: builtin/remote.c:950 +#: builtin/remote.c:954 msgid " tracked" msgstr " suivi" -#: builtin/remote.c:952 +#: builtin/remote.c:956 msgid " stale (use 'git remote prune' to remove)" msgstr " dépassé (utilisez 'git remote prune' pour supprimer)" -#: builtin/remote.c:954 +#: builtin/remote.c:958 msgid " ???" msgstr " ???" -#: builtin/remote.c:995 +#: builtin/remote.c:999 #, 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:1002 +#: builtin/remote.c:1006 #, c-format msgid "rebases onto remote %s" msgstr "rebase sur la distante %s" -#: builtin/remote.c:1005 +#: builtin/remote.c:1009 #, c-format msgid " merges with remote %s" msgstr " fusionne avec la distante %s" -#: builtin/remote.c:1006 +#: builtin/remote.c:1010 msgid " and with remote" msgstr " et avec la distante" -#: builtin/remote.c:1008 +#: builtin/remote.c:1012 #, c-format msgid "merges with remote %s" msgstr "fusionne avec la distante %s" -#: builtin/remote.c:1009 +#: builtin/remote.c:1013 msgid " and with remote" msgstr " et avec la distante" -#: builtin/remote.c:1055 +#: builtin/remote.c:1059 msgid "create" msgstr "créer" -#: builtin/remote.c:1058 +#: builtin/remote.c:1062 msgid "delete" msgstr "supprimer" -#: builtin/remote.c:1062 +#: builtin/remote.c:1066 msgid "up to date" msgstr "à jour" -#: builtin/remote.c:1065 +#: builtin/remote.c:1069 msgid "fast-forwardable" msgstr "peut être mis à jour en avance rapide" -#: builtin/remote.c:1068 +#: builtin/remote.c:1072 msgid "local out of date" msgstr "le local n'est pas à jour" -#: builtin/remote.c:1075 +#: builtin/remote.c:1079 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s force vers %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1082 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s pousse vers %-*s (%s)" -#: builtin/remote.c:1082 +#: builtin/remote.c:1086 #, c-format msgid " %-*s forces to %s" msgstr " %-*s force vers %s" -#: builtin/remote.c:1085 +#: builtin/remote.c:1089 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s pousse vers %s" -#: builtin/remote.c:1153 +#: builtin/remote.c:1157 msgid "do not query remotes" msgstr "ne pas interroger les distantes" -#: builtin/remote.c:1180 +#: builtin/remote.c:1184 #, c-format msgid "* remote %s" msgstr "* distante %s" -#: builtin/remote.c:1181 +#: builtin/remote.c:1185 #, c-format msgid " Fetch URL: %s" msgstr " URL de rapatriement : %s" -#: builtin/remote.c:1182 builtin/remote.c:1329 +#: builtin/remote.c:1186 builtin/remote.c:1333 msgid "(no URL)" msgstr "(pas d'URL)" -#: builtin/remote.c:1191 builtin/remote.c:1193 +#: builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " Push URL: %s" msgstr " URL push : %s" -#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199 +#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203 #, c-format msgid " HEAD branch: %s" msgstr " Branche HEAD : %s" -#: builtin/remote.c:1201 +#: builtin/remote.c:1205 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -8753,145 +8960,145 @@ msgstr "" " Branche HEAD (la HEAD distante est ambiguë, peut être l'une des " "suivantes) :\n" -#: builtin/remote.c:1213 +#: builtin/remote.c:1217 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branche distante :%s" msgstr[1] " Branches distantes :%s" -#: builtin/remote.c:1216 builtin/remote.c:1243 +#: builtin/remote.c:1220 builtin/remote.c:1247 msgid " (status not queried)" msgstr " (statut non demandé)" -#: builtin/remote.c:1225 +#: builtin/remote.c:1229 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:1233 +#: builtin/remote.c:1237 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:1240 +#: builtin/remote.c:1244 #, 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:1261 +#: builtin/remote.c:1265 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "définir refs/remotes/<nom>/HEAD selon la distante" -#: builtin/remote.c:1263 +#: builtin/remote.c:1267 msgid "delete refs/remotes/<name>/HEAD" msgstr "supprimer refs/remotes/<nom>/HEAD" -#: builtin/remote.c:1278 +#: builtin/remote.c:1282 msgid "Cannot determine remote HEAD" msgstr "Impossible de déterminer la HEAD distante" -#: builtin/remote.c:1280 +#: builtin/remote.c:1284 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:1290 +#: builtin/remote.c:1294 #, c-format msgid "Could not delete %s" msgstr "Impossible de supprimer %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1302 #, c-format msgid "Not a valid ref: %s" msgstr "Référence non valide : %s" -#: builtin/remote.c:1300 +#: builtin/remote.c:1304 #, c-format msgid "Could not setup %s" msgstr "Impossible de paramétrer %s" -#: builtin/remote.c:1318 +#: builtin/remote.c:1322 #, c-format msgid " %s will become dangling!" msgstr " %s se retrouvera en suspens !" -#: builtin/remote.c:1319 +#: builtin/remote.c:1323 #, c-format msgid " %s has become dangling!" msgstr " %s se retrouve en suspens !" -#: builtin/remote.c:1325 +#: builtin/remote.c:1329 #, c-format msgid "Pruning %s" msgstr "Élimination de %s" -#: builtin/remote.c:1326 +#: builtin/remote.c:1330 #, c-format msgid "URL: %s" msgstr "URL : %s" -#: builtin/remote.c:1349 +#: builtin/remote.c:1357 #, c-format msgid " * [would prune] %s" msgstr " * [serait éliminé] %s" -#: builtin/remote.c:1352 +#: builtin/remote.c:1360 #, c-format msgid " * [pruned] %s" msgstr " * [éliminé] %s" -#: builtin/remote.c:1397 +#: builtin/remote.c:1405 msgid "prune remotes after fetching" msgstr "éliminer les distants après le rapatriement" -#: builtin/remote.c:1463 builtin/remote.c:1537 +#: builtin/remote.c:1471 builtin/remote.c:1545 #, c-format msgid "No such remote '%s'" msgstr "Pas de serveur remote '%s'" -#: builtin/remote.c:1483 +#: builtin/remote.c:1491 msgid "add branch" msgstr "ajouter une branche" -#: builtin/remote.c:1490 +#: builtin/remote.c:1498 msgid "no remote specified" msgstr "pas de serveur distant spécifié" -#: builtin/remote.c:1512 +#: builtin/remote.c:1520 msgid "manipulate push URLs" msgstr "manipuler les URLs push" -#: builtin/remote.c:1514 +#: builtin/remote.c:1522 msgid "add URL" msgstr "ajouter une URL" -#: builtin/remote.c:1516 +#: builtin/remote.c:1524 msgid "delete URLs" msgstr "supprimer des URLs" -#: builtin/remote.c:1523 +#: builtin/remote.c:1531 msgid "--add --delete doesn't make sense" msgstr "--add --delete n'a aucun sens" -#: builtin/remote.c:1563 +#: builtin/remote.c:1571 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Motif d'URL ancien invalide : %s" -#: builtin/remote.c:1571 +#: builtin/remote.c:1579 #, c-format msgid "No such URL found: %s" msgstr "Pas d'URL trouvée : %s" -#: builtin/remote.c:1573 +#: builtin/remote.c:1581 msgid "Will not delete all non-push URLs" msgstr "Pas de suppression de toutes les URLs non-push" -#: builtin/remote.c:1587 +#: builtin/remote.c:1595 msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" @@ -8989,67 +9196,69 @@ msgstr "git replace -d <objet>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<motif>]]" -#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388 +#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 #, c-format msgid "Not a valid object name: '%s'" msgstr "Nom d'objet invalide : '%s'" -#: builtin/replace.c:352 +#: builtin/replace.c:355 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mauvaise étiquette de fusion dans le commit '%s'" -#: builtin/replace.c:354 +#: builtin/replace.c:357 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "étiquette de fusion malformée dans le commit '%s'" -#: builtin/replace.c:365 +#: builtin/replace.c:368 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" -msgstr "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; utilisez --edit au lieu de --graft" +msgstr "" +"le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; " +"utilisez --edit au lieu de --graft" -#: builtin/replace.c:398 +#: builtin/replace.c:401 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "le commit original '%s' contient une signature GPG." -#: builtin/replace.c:399 +#: builtin/replace.c:402 msgid "the signature will be removed in the replacement commit!" msgstr "la signature sera éliminée dans la validation de remplacement !" -#: builtin/replace.c:405 +#: builtin/replace.c:408 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Impossible d'écrire le commit de remplacement pour '%s'" -#: builtin/replace.c:429 +#: builtin/replace.c:432 msgid "list replace refs" msgstr "afficher les références de remplacement" -#: builtin/replace.c:430 +#: builtin/replace.c:433 msgid "delete replace refs" msgstr "supprimer les références de remplacement" -#: builtin/replace.c:431 +#: builtin/replace.c:434 msgid "edit existing object" msgstr "éditer l'objet existant" -#: builtin/replace.c:432 +#: builtin/replace.c:435 msgid "change a commit's parents" msgstr "Modifier les parents d'un commit" -#: builtin/replace.c:433 +#: builtin/replace.c:436 msgid "replace the ref if it exists" msgstr "remplacer la référence si elle existe" -#: builtin/replace.c:434 +#: builtin/replace.c:437 msgid "do not pretty-print contents for --edit" msgstr "afficher sans mise en forme pour --edit" -#: builtin/replace.c:435 +#: builtin/replace.c:438 msgid "use this format" msgstr "utiliser ce format" @@ -9061,158 +9270,158 @@ msgstr "git rerere [clear | forget chemin... | status | remaining | diff | gc]" msgid "register clean resolutions in index" msgstr "enregistrer des résolutions propres dans l'index" -#: builtin/reset.c:25 +#: builtin/reset.c:26 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -#: builtin/reset.c:26 +#: builtin/reset.c:27 msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "git reset [-q] <arbre ou apparenté> [--] <chemins>..." -#: builtin/reset.c:27 +#: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<arbre ou apparenté>] [--] [<chemins>...]" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "mixed" msgstr "mixed" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "soft" msgstr "soft" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "hard" msgstr "hard" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "merge" msgstr "merge" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "keep" msgstr "keep" -#: builtin/reset.c:73 +#: builtin/reset.c:74 msgid "You do not have a valid HEAD." msgstr "Vous n'avez pas une HEAD valide." -#: builtin/reset.c:75 +#: builtin/reset.c:76 msgid "Failed to find tree of HEAD." msgstr "Impossible de trouver l'arbre pour HEAD." -#: builtin/reset.c:81 +#: builtin/reset.c:82 #, c-format msgid "Failed to find tree of %s." msgstr "Impossible de trouver l'arbre pour %s." -#: builtin/reset.c:99 +#: builtin/reset.c:100 #, c-format msgid "HEAD is now at %s" msgstr "HEAD est maintenant à %s" -#: builtin/reset.c:182 +#: builtin/reset.c:183 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion." -#: builtin/reset.c:275 +#: builtin/reset.c:276 msgid "be quiet, only report errors" msgstr "être silencieux, afficher seulement les erreurs" -#: builtin/reset.c:277 +#: builtin/reset.c:278 msgid "reset HEAD and index" msgstr "réinitialiser HEAD et l'index" -#: builtin/reset.c:278 +#: builtin/reset.c:279 msgid "reset only HEAD" msgstr "réinitialiser seulement HEAD" -#: builtin/reset.c:280 builtin/reset.c:282 +#: builtin/reset.c:281 builtin/reset.c:283 msgid "reset HEAD, index and working tree" msgstr "réinitialiser HEAD, l'index et la copie de travail" -#: builtin/reset.c:284 +#: builtin/reset.c:285 msgid "reset HEAD but keep local changes" msgstr "réinitialiser HEAD mais garder les changements locaux" -#: builtin/reset.c:287 +#: builtin/reset.c:288 msgid "record only the fact that removed paths will be added later" msgstr "" "enregistrer seulement le fait que les chemins effacés seront ajoutés plus " "tard" -#: builtin/reset.c:304 +#: builtin/reset.c:305 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Échec de résolution de '%s' comme une révision valide." -#: builtin/reset.c:307 builtin/reset.c:315 +#: builtin/reset.c:308 builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/reset.c:312 +#: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Échec de résolution de '%s' comme un arbre valide." -#: builtin/reset.c:321 +#: builtin/reset.c:322 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch est incompatible avec --{hard,mixed,soft}" -#: builtin/reset.c:330 +#: builtin/reset.c:331 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la " "place." -#: builtin/reset.c:332 +#: builtin/reset.c:333 #, c-format msgid "Cannot do %s reset with paths." msgstr "Impossible de faire un \"%s reset\" avec des chemins." -#: builtin/reset.c:342 +#: builtin/reset.c:343 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu" -#: builtin/reset.c:346 +#: builtin/reset.c:347 msgid "-N can only be used with --mixed" msgstr "-N ne peut être utilisé qu'avec --mixed" -#: builtin/reset.c:363 +#: builtin/reset.c:364 msgid "Unstaged changes after reset:" msgstr "Modifications non indexées après reset :" -#: builtin/reset.c:369 +#: builtin/reset.c:370 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'." -#: builtin/reset.c:373 +#: builtin/reset.c:374 msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." -#: builtin/rev-parse.c:360 +#: builtin/rev-parse.c:361 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [options] -- [<arguments>...]" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" msgstr "garder le `--` passé en argument" -#: builtin/rev-parse.c:367 +#: builtin/rev-parse.c:368 msgid "stop parsing after the first non-option argument" msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option" -#: builtin/rev-parse.c:370 +#: builtin/rev-parse.c:371 msgid "output in stuck long form" msgstr "sortie en forme longue fixée" -#: builtin/rev-parse.c:498 +#: builtin/rev-parse.c:499 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -9325,13 +9534,13 @@ msgid "" "the following submodule (or one of its nested submodules)\n" "uses a .git directory:" msgid_plural "" -"the following submodules (or one of its nested submodules)\n" +"the following submodules (or one of their nested submodules)\n" "use a .git directory:" msgstr[0] "" "le sous-module suivant (ou un de ses sous-modules imbriqués)\n" "utilise un répertoire .git :" msgstr[1] "" -"les sous-modules suivants (ou un de ses sous-modules imbriqués)\n" +"les sous-modules suivants (ou un de leurs sous-modules imbriqués)\n" "utilisent un répertoire .git :" #: builtin/rm.c:71 @@ -9405,6 +9614,12 @@ msgstr "autoriser la suppression récursive" msgid "exit with a zero status even if nothing matched" msgstr "sortir avec un statut zéro même si rien ne correspondait" +#: builtin/rm.c:318 +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 #, c-format msgid "not removing '%s' recursively without -r" @@ -9598,11 +9813,11 @@ msgstr "supprimer la référence symbolique" msgid "shorten ref output" msgstr "raccourcir l'affichage de la référence" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "raison" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "raison de la mise à jour" @@ -9647,7 +9862,7 @@ msgstr "étiquette '%s' non trouvée." #: builtin/tag.c:321 #, c-format msgid "Deleted tag '%s' (was %s)\n" -msgstr "Étiquette '%s' supprimée (elle était %s)\n" +msgstr "Étiquette '%s' supprimée (elle était sur %s)\n" #: builtin/tag.c:333 #, c-format @@ -9679,7 +9894,8 @@ msgstr "" "\n" "Écrivez un message pour l'étiquette :\n" " %s\n" -"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-même si vous le souhaitez.\n" +"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-" +"même si vous le souhaitez.\n" #: builtin/tag.c:371 #, c-format @@ -9725,240 +9941,230 @@ msgstr "le commutateur 'points-at' a besoin d'un objet" msgid "malformed object name '%s'" msgstr "nom d'objet malformé '%s'" -#: builtin/tag.c:588 +#: builtin/tag.c:589 msgid "list tag names" msgstr "afficher les noms des étiquettes" -#: builtin/tag.c:590 +#: builtin/tag.c:591 msgid "print <n> lines of each tag message" msgstr "affiche <n> lignes de chaque message d'étiquette" -#: builtin/tag.c:592 +#: builtin/tag.c:593 msgid "delete tags" msgstr "supprimer des étiquettes" -#: builtin/tag.c:593 +#: builtin/tag.c:594 msgid "verify tags" msgstr "vérifier des étiquettes" -#: builtin/tag.c:595 +#: builtin/tag.c:596 msgid "Tag creation options" msgstr "Options de création de l'étiquette" -#: builtin/tag.c:597 +#: builtin/tag.c:598 msgid "annotated tag, needs a message" msgstr "étiquette annotée, nécessite un message" -#: builtin/tag.c:599 +#: builtin/tag.c:600 msgid "tag message" msgstr "message pour l'étiquette" -#: builtin/tag.c:601 +#: builtin/tag.c:602 msgid "annotated and GPG-signed tag" msgstr "étiquette annotée et signée avec GPG" -#: builtin/tag.c:605 +#: builtin/tag.c:606 msgid "use another key to sign the tag" msgstr "utiliser une autre clé pour signer l'étiquette" -#: builtin/tag.c:606 +#: builtin/tag.c:607 msgid "replace the tag if exists" msgstr "remplacer l'étiquette si elle existe" -#: builtin/tag.c:607 +#: builtin/tag.c:608 msgid "show tag list in columns" msgstr "afficher la liste des étiquettes sous forme de colonnes" -#: builtin/tag.c:609 +#: builtin/tag.c:610 msgid "sort tags" msgstr "trier les étiquettes" -#: builtin/tag.c:613 +#: builtin/tag.c:614 msgid "Tag listing options" msgstr "Options d'affichage des étiquettes" -#: builtin/tag.c:616 builtin/tag.c:622 +#: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "afficher seulement les étiquettes qui contiennent la validation" -#: builtin/tag.c:628 +#: builtin/tag.c:629 msgid "print only tags of the object" msgstr "afficher seulement les étiquettes de l'objet" -#: builtin/tag.c:654 +#: builtin/tag.c:655 msgid "--column and -n are incompatible" msgstr "--column et -n sont incompatibles" -#: builtin/tag.c:666 +#: builtin/tag.c:667 msgid "--sort and -n are incompatible" msgstr "--sort et -n sont incompatibles" -#: builtin/tag.c:673 +#: builtin/tag.c:674 msgid "-n option is only allowed with -l." msgstr "l'option -n est autorisée seulement avec -l." -#: builtin/tag.c:675 +#: builtin/tag.c:676 msgid "--contains option is only allowed with -l." msgstr "l'option --contains est autorisée seulement avec -l." -#: builtin/tag.c:677 +#: builtin/tag.c:678 msgid "--points-at option is only allowed with -l." msgstr "l'option --points-at est autorisée seulement avec -l." -#: builtin/tag.c:685 +#: builtin/tag.c:686 msgid "only one -F or -m option is allowed." msgstr "une seule option -F ou -m est autorisée." -#: builtin/tag.c:705 +#: builtin/tag.c:706 msgid "too many params" msgstr "trop de paramètres" -#: builtin/tag.c:711 +#: builtin/tag.c:712 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' n'est pas un nom d'étiquette valide." -#: builtin/tag.c:716 +#: builtin/tag.c:717 #, c-format msgid "tag '%s' already exists" msgstr "l'étiquette '%s' existe déjà" -#: builtin/tag.c:734 -#, c-format -msgid "%s: cannot lock the ref" -msgstr "%s : impossible de verrouiller la référence" - -#: builtin/tag.c:736 -#, c-format -msgid "%s: cannot update the ref" -msgstr "%s : impossible de mettre à jour la référence" - -#: builtin/tag.c:738 +#: builtin/tag.c:741 #, c-format msgid "Updated tag '%s' (was %s)\n" -msgstr "Étiquette '%s' mise à jour (elle était %s)\n" +msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" -#: builtin/unpack-objects.c:483 +#: builtin/unpack-objects.c:489 msgid "Unpacking objects" msgstr "Dépaquetage des objets" -#: builtin/update-index.c:402 +#: builtin/update-index.c:403 msgid "git update-index [options] [--] [<file>...]" msgstr "git update-index [options] [--] [<fichier>...]" -#: builtin/update-index.c:755 +#: builtin/update-index.c:756 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:758 +#: builtin/update-index.c:759 msgid "refresh: ignore submodules" msgstr "rafraîchir : ignorer les sous-modules" -#: builtin/update-index.c:761 +#: builtin/update-index.c:762 msgid "do not ignore new files" msgstr "ne pas ignorer les nouveaux fichiers" -#: builtin/update-index.c:763 +#: builtin/update-index.c:764 msgid "let files replace directories and vice-versa" msgstr "laisser les fichiers remplacer des répertoires et vice-versa" -#: builtin/update-index.c:765 +#: builtin/update-index.c:766 msgid "notice files missing from worktree" msgstr "aviser des fichiers manquants dans la copie de travail" -#: builtin/update-index.c:767 +#: builtin/update-index.c:768 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:770 +#: builtin/update-index.c:771 msgid "refresh stat information" msgstr "rafraîchir l'information de stat" -#: builtin/update-index.c:774 +#: builtin/update-index.c:775 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "comme --refresh, mais en ignorant l'option assume-unchanged" -#: builtin/update-index.c:778 +#: builtin/update-index.c:779 msgid "<mode>,<object>,<path>" msgstr "<mode>, <objet>, <chemin>" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "add the specified entry to the index" msgstr "ajouter l'élément spécifié dans l'index" -#: builtin/update-index.c:783 +#: builtin/update-index.c:784 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exécutable pour les fichiers listés" -#: builtin/update-index.c:788 +#: builtin/update-index.c:789 msgid "mark files as \"not changing\"" msgstr "marquer les fichiers comme \"non changeants\"" -#: builtin/update-index.c:791 +#: builtin/update-index.c:792 msgid "clear assumed-unchanged bit" msgstr "mettre à zéro le bit supposé-non-modifié" -#: builtin/update-index.c:794 +#: builtin/update-index.c:795 msgid "mark files as \"index-only\"" msgstr "marquer les fichiers comme \"index seulement\"" -#: builtin/update-index.c:797 +#: builtin/update-index.c:798 msgid "clear skip-worktree bit" msgstr "mettre à zéro le bit sauter-la-copie-de travail" -#: builtin/update-index.c:800 +#: builtin/update-index.c:801 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:802 +#: builtin/update-index.c:803 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:804 +#: builtin/update-index.c:805 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:806 +#: builtin/update-index.c:807 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:810 +#: builtin/update-index.c:811 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:814 +#: builtin/update-index.c:815 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:818 +#: builtin/update-index.c:819 msgid "only update entries that differ from HEAD" msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD" -#: builtin/update-index.c:822 +#: builtin/update-index.c:823 msgid "ignore files missing from worktree" msgstr "ignorer les fichiers manquants dans la copie de travail" -#: builtin/update-index.c:825 +#: builtin/update-index.c:826 msgid "report actions to standard output" msgstr "afficher les actions sur la sortie standard" -#: builtin/update-index.c:827 +#: builtin/update-index.c:828 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus" -#: builtin/update-index.c:831 +#: builtin/update-index.c:832 msgid "write index in this format" msgstr "écrire l'index dans ce format" -#: builtin/update-index.c:833 +#: builtin/update-index.c:834 msgid "enable or disable split index" msgstr "activer ou désactiver l'index divisé" @@ -9976,19 +10182,19 @@ msgstr "" msgid "git update-ref [options] --stdin [-z]" msgstr "git update-ref [options] --stdin [-z]" -#: builtin/update-ref.c:350 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "supprimer la référence" -#: builtin/update-ref.c:352 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "mettre à jour <nomréférence> et non la référence pointée par lui" -#: builtin/update-ref.c:353 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "l'entrée standard a des arguments qui se terminent par NUL" -#: builtin/update-ref.c:354 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "lire les mises à jour depuis l'entrée standard" @@ -10008,15 +10214,15 @@ msgstr "git verify-commit [-v|--verbose] <commit>..." msgid "print commit contents" msgstr "afficher le contenu du commit" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:54 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:64 msgid "verbose" msgstr "verbeux" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:66 msgid "show statistics only" msgstr "afficher seulement les statistiques" @@ -10044,36 +10250,20 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le débogage" +#: credential-cache--daemon.c:267 +msgid "print debugging messages to stderr" +msgstr "afficher les messages de debug sur stderr" + #: git.c:17 msgid "" -"'git help -a' and 'git help -g' lists available subcommands and some\n" +"'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" "'git help -a' et 'git help -g' listent les sous-commandes disponibles et\n" -"quelques concepts. Voir 'git help <command>' ou 'git help <concept>'\n" +"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." -#: parse-options.h:143 -msgid "expiry-date" -msgstr "date-d'expiration" - -#: parse-options.h:158 -msgid "no-op (backward compatibility)" -msgstr "sans action (rétrocompatibilité)" - -#: parse-options.h:232 -msgid "be more verbose" -msgstr "être plus verbeux" - -#: parse-options.h:234 -msgid "be more quiet" -msgstr "être plus silencieux" - -#: parse-options.h:240 -msgid "use <n> digits to display SHA-1s" -msgstr "utiliser <n> chiffres pour afficher les SHA-1s" - #: common-cmds.h:8 msgid "Add file contents to the index" msgstr "Ajouter le contenu de fichiers dans l'index" @@ -10162,6 +10352,31 @@ 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 +msgid "expiry-date" +msgstr "date-d'expiration" + +#: parse-options.h:158 +msgid "no-op (backward compatibility)" +msgstr "sans action (rétrocompatibilité)" + +#: parse-options.h:232 +msgid "be more verbose" +msgstr "être plus verbeux" + +#: parse-options.h:234 +msgid "be more quiet" +msgstr "être plus silencieux" + +#: parse-options.h:240 +msgid "use <n> digits to display SHA-1s" +msgstr "utiliser <n> chiffres pour afficher les SHA-1s" + +#: rerere.h:27 +msgid "update the index with reused conflict resolution if possible" +msgstr "" +"met à jour l'index avec les résolutions de conflit réutilisées si possible" + #: git-am.sh:52 msgid "You need to set your committer info first" msgstr "Vous devez d'abord définir vos informations de validateur" @@ -10423,7 +10638,7 @@ msgstr "Êtes-vous sûr [Y/n] ? " #: git-bisect.sh:289 msgid "" -"You need to give me at least one good and one bad revisions.\n" +"You need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Vous devez me donner au moins une bonne et une mauvaise révision.\n" @@ -10432,7 +10647,7 @@ msgstr "" #: git-bisect.sh:292 msgid "" "You need to start by \"git bisect start\".\n" -"You then need to give me at least one good and one bad revisions.\n" +"You then need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Vous devez démarrer avec \"git bisect start\".\n" @@ -10505,17 +10720,25 @@ msgstr "succès de la bissection" 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, or use 'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" -"Le pull n'est pas possible car vous avez des fichiers non fusionnés.\n" -"Veuillez les corriger dans votre copie de travail, et utilisez alors 'git " -"add/rm <file>'\n" -"si nécessaire pour marquer comme résolu, ou utilisez 'git commit -a'." +"Le tirage n'est pas possible car vous avez des fichiers non fusionnés.\n" +"Veuillez les corriger dans votre copie de travail, utiliser alors 'git add/" +"rm <fichier>'\n" +"si nécessaire pour marquer comme résolu et valider." #: git-pull.sh:25 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 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" +"Veuillez valider vos changements avant de pouvoir fusionner." + #: git-pull.sh:245 msgid "updating an unborn branch with changes added to the index" msgstr "" @@ -10775,7 +10998,7 @@ msgstr "Trop de révisions spécifiées : $REV" #: git-stash.sh:397 #, sh-format -msgid "$reference is not valid reference" +msgid "$reference is not a valid reference" msgstr "$reference n'est pas une référence valide" #: git-stash.sh:425 @@ -10822,11 +11045,11 @@ msgstr "${REV} supprimé ($s)" msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Impossible de supprimer l'élément de stash" -#: git-stash.sh:538 +#: git-stash.sh:539 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: git-stash.sh:610 +#: git-stash.sh:611 msgid "(To restore them type \"git stash apply\")" msgstr "(Pour les restaurer tapez \"git stash apply\")" @@ -11147,6 +11370,36 @@ 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 "Failed to lock ref for update" +#~ msgstr "Échec du verrouillage de la référence pour mise à jour" + +#~ msgid "Failed to write ref" +#~ msgstr "Échec de l'écriture de la référence" + +#~ msgid "Failed to lock HEAD during fast_forward_to" +#~ msgstr "Échec du verrouillage de HEAD pendant l'avance rapide" + +#~ msgid "invalid commit: %s" +#~ msgstr "commit invalide : %s" + +#~ msgid "cannot lock HEAD ref" +#~ msgstr "impossible de verrouiller la référence HEAD" + +#~ 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" + +#~ msgid "%s: cannot lock the ref" +#~ msgstr "%s : impossible de verrouiller la référence" + +#~ msgid "%s: cannot update the ref" +#~ msgstr "%s : impossible de mettre à jour la référence" + #~ msgid "commit has empty message" #~ msgstr "le commit a un message vide" @@ -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: 2014-08-04 14:48+0800\n" +"POT-Creation-Date: 2014-11-20 09:42+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -26,101 +26,100 @@ msgstr "" #: advice.c:88 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, or use\n" -"'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" -#: archive.c:10 +#: archive.c:11 msgid "git archive [options] <tree-ish> [<path>...]" msgstr "" -#: archive.c:11 +#: archive.c:12 msgid "git archive --list" msgstr "" -#: archive.c:12 +#: archive.c:13 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" msgstr "" -#: archive.c:13 +#: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:328 +#: archive.c:419 msgid "fmt" msgstr "" -#: archive.c:328 +#: archive.c:419 msgid "archive format" msgstr "" -#: archive.c:329 builtin/log.c:1201 +#: archive.c:420 builtin/log.c:1204 msgid "prefix" msgstr "" -#: archive.c:330 +#: archive.c:421 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709 -#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412 -#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151 +#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411 +#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "" -#: archive.c:332 builtin/archive.c:89 +#: archive.c:423 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:334 +#: archive.c:425 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:335 +#: archive.c:426 msgid "report archived files on stderr" msgstr "" -#: archive.c:336 +#: archive.c:427 msgid "store only" msgstr "" -#: archive.c:337 +#: archive.c:428 msgid "compress faster" msgstr "" -#: archive.c:345 +#: archive.c:436 msgid "compress better" msgstr "" -#: archive.c:348 +#: archive.c:439 msgid "list supported archive formats" msgstr "" -#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 +#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85 msgid "repo" msgstr "" -#: archive.c:351 builtin/archive.c:91 +#: archive.c:442 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 +#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490 msgid "command" msgstr "" -#: archive.c:353 builtin/archive.c:93 +#: archive.c:444 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" -#: attr.c:259 +#: attr.c:258 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -176,31 +175,31 @@ msgstr "" msgid "Not tracking: ambiguous information for ref %s" msgstr "" -#: branch.c:178 +#: branch.c:162 #, c-format msgid "'%s' is not a valid branch name." msgstr "" -#: branch.c:183 +#: branch.c:167 #, c-format msgid "A branch named '%s' already exists." msgstr "" -#: branch.c:191 +#: branch.c:175 msgid "Cannot force update the current branch." msgstr "" -#: branch.c:211 +#: branch.c:195 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -#: branch.c:213 +#: branch.c:197 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" -#: branch.c:215 +#: branch.c:199 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -212,107 +211,105 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:260 +#: branch.c:243 #, c-format msgid "Not a valid object name: '%s'." msgstr "" -#: branch.c:280 +#: branch.c:263 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" -#: branch.c:285 +#: branch.c:268 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:291 -msgid "Failed to lock ref for update" -msgstr "" - -#: branch.c:309 -msgid "Failed to write ref" -msgstr "" - -#: bundle.c:33 +#: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "" -#: bundle.c:60 +#: bundle.c:61 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:86 builtin/commit.c:755 +#: bundle.c:87 builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "" -#: bundle.c:138 +#: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330 -#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357 +#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706 +#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "" -#: bundle.c:184 +#: bundle.c:185 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:191 +#: bundle.c:192 msgid "The bundle records a complete history." msgstr "" -#: bundle.c:193 +#: bundle.c:194 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:289 -msgid "rev-list died" +#: bundle.c:251 +msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261 -#, c-format -msgid "unrecognized argument: %s" +#: bundle.c:269 +msgid "pack-objects died" msgstr "" -#: bundle.c:330 -#, c-format -msgid "ref '%s' is excluded by the rev-list options" +#: bundle.c:309 +msgid "rev-list died" msgstr "" -#: bundle.c:375 -msgid "Refusing to create empty bundle." +#: bundle.c:358 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:390 -msgid "Could not spawn pack-objects" +#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#, c-format +msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:408 -msgid "pack-objects died" +#: bundle.c:444 +msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:411 +#: bundle.c:454 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:433 +#: bundle.c:475 msgid "index-pack died" msgstr "" +#: color.c:157 +#, c-format +msgid "invalid color value: %.*s" +msgstr "" + #: commit.c:40 #, c-format msgid "could not parse %s" @@ -327,16 +324,69 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: connected.c:70 +#: config.c:469 config.c:471 +#, c-format +msgid "bad config file line %d in %s" +msgstr "" + +#: config.c:587 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "" + +#: config.c:589 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "" + +#: config.c:674 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "" + +#: config.c:752 config.c:763 +#, c-format +msgid "bad zlib compression level %d" +msgstr "" + +#: config.c:885 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "" + +#: config.c:1201 +msgid "unable to parse command-line config" +msgstr "" + +#: config.c:1262 +msgid "unknown error occured while reading the configuration files" +msgstr "" + +#: config.c:1586 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "" + +#: config.c:1588 +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "" + +#: config.c:1647 +#, c-format +msgid "%s has multiple values" +msgstr "" + +#: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:90 +#: connected.c:89 #, c-format msgid "failed write to rev-list: %s" msgstr "" -#: connected.c:98 +#: connected.c:97 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "" @@ -414,7 +464,7 @@ msgstr[1] "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:514 +#: diffcore-rename.c:516 msgid "Performing inexact rename detection" msgstr "" @@ -433,67 +483,67 @@ msgstr "" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:267 +#: diff.c:266 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:2934 +#: diff.c:2957 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:3329 +#: diff.c:3352 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:3492 +#: diff.c:3515 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3506 +#: diff.c:3529 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: gpg-interface.c:73 gpg-interface.c:145 +#: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "" -#: gpg-interface.c:85 +#: gpg-interface.c:141 msgid "gpg did not accept the data" msgstr "" -#: gpg-interface.c:96 +#: gpg-interface.c:152 msgid "gpg failed to sign the data" msgstr "" -#: gpg-interface.c:129 +#: gpg-interface.c:185 #, c-format msgid "could not create temporary file '%s': %s" msgstr "" -#: gpg-interface.c:132 +#: gpg-interface.c:188 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "" -#: grep.c:1703 +#: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1720 +#: grep.c:1735 #, c-format msgid "'%s': %s" msgstr "" -#: grep.c:1731 +#: grep.c:1746 #, c-format msgid "'%s': short read %s" msgstr "" @@ -554,256 +604,264 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "" -#: merge.c:40 +#: lockfile.c:275 +msgid "BUG: reopen a lockfile that is still open" +msgstr "" + +#: lockfile.c:277 +msgid "BUG: reopen a lockfile that has been committed" +msgstr "" + +#: merge.c:41 msgid "failed to read the cache" msgstr "" -#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556 -#: builtin/clone.c:661 +#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562 +#: builtin/clone.c:659 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:190 +#: merge-recursive.c:189 #, c-format msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:210 +#: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "" -#: merge-recursive.c:271 +#: merge-recursive.c:270 msgid "error building trees" msgstr "" -#: merge-recursive.c:692 +#: merge-recursive.c:691 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:703 +#: merge-recursive.c:702 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:717 merge-recursive.c:738 +#: merge-recursive.c:716 merge-recursive.c:737 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:728 +#: merge-recursive.c:727 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:768 +#: merge-recursive.c:767 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:770 +#: merge-recursive.c:769 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:793 builtin/clone.c:317 +#: merge-recursive.c:792 builtin/clone.c:318 #, c-format msgid "failed to open '%s'" msgstr "" -#: merge-recursive.c:801 +#: merge-recursive.c:800 #, c-format msgid "failed to symlink '%s'" msgstr "" -#: merge-recursive.c:804 +#: merge-recursive.c:803 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:942 +#: merge-recursive.c:941 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:946 +#: merge-recursive.c:945 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:962 +#: merge-recursive.c:961 msgid "unsupported object type in the tree" msgstr "" -#: merge-recursive.c:1037 merge-recursive.c:1051 +#: merge-recursive.c:1036 merge-recursive.c:1050 #, 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:1043 merge-recursive.c:1056 +#: merge-recursive.c:1042 merge-recursive.c:1055 #, 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:1097 +#: merge-recursive.c:1096 msgid "rename" msgstr "" -#: merge-recursive.c:1097 +#: merge-recursive.c:1096 msgid "renamed" msgstr "" -#: merge-recursive.c:1153 +#: merge-recursive.c:1152 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1175 +#: merge-recursive.c:1174 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1180 +#: merge-recursive.c:1179 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1234 +#: merge-recursive.c:1233 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1264 +#: merge-recursive.c:1263 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1463 +#: merge-recursive.c:1462 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1473 +#: merge-recursive.c:1472 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1478 merge-recursive.c:1676 +#: merge-recursive.c:1477 merge-recursive.c:1675 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1529 +#: merge-recursive.c:1528 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1532 +#: merge-recursive.c:1531 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modify" msgstr "" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modified" msgstr "" -#: merge-recursive.c:1590 +#: merge-recursive.c:1589 msgid "content" msgstr "" -#: merge-recursive.c:1597 +#: merge-recursive.c:1596 msgid "add/add" msgstr "" -#: merge-recursive.c:1631 +#: merge-recursive.c:1630 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1645 +#: merge-recursive.c:1644 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1649 git-submodule.sh:1150 +#: merge-recursive.c:1648 git-submodule.sh:1150 msgid "submodule" msgstr "" -#: merge-recursive.c:1650 +#: merge-recursive.c:1649 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1740 +#: merge-recursive.c:1735 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1765 +#: merge-recursive.c:1760 msgid "file/directory" msgstr "" -#: merge-recursive.c:1771 +#: merge-recursive.c:1766 msgid "directory/file" msgstr "" -#: merge-recursive.c:1776 +#: merge-recursive.c:1771 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1786 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1803 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1822 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1831 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1861 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1906 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "" -#: merge-recursive.c:1919 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1956 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2013 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2024 builtin/merge.c:666 +#: merge-recursive.c:2019 builtin/merge.c:666 msgid "Unable to write index." msgstr "" @@ -828,33 +886,33 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "" -#: object.c:234 +#: object.c:241 #, c-format msgid "unable to parse object: %s" msgstr "" -#: parse-options.c:534 +#: parse-options.c:546 msgid "..." msgstr "" -#: parse-options.c:552 +#: parse-options.c:564 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:556 +#: parse-options.c:568 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:559 +#: parse-options.c:571 #, c-format msgid " %s" msgstr "" -#: parse-options.c:593 +#: parse-options.c:605 msgid "-NUM" msgstr "" @@ -918,69 +976,73 @@ msgid "" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "" +#: pretty.c:968 +msgid "unable to parse --pretty format" +msgstr "" + #: progress.c:225 msgid "done" msgstr "" -#: read-cache.c:1260 +#: read-cache.c:1261 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1270 +#: read-cache.c:1271 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: remote.c:753 +#: remote.c:782 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:757 +#: remote.c:786 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:761 +#: remote.c:790 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:769 +#: remote.c:798 msgid "Internal error" msgstr "" -#: remote.c:1943 +#: remote.c:1968 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:1947 +#: remote.c:1972 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:1950 +#: remote.c:1975 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" -#: remote.c:1954 +#: remote.c:1979 #, 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:1960 +#: remote.c:1985 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:1963 +#: remote.c:1988 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -988,11 +1050,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1971 +#: remote.c:1996 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:1974 +#: remote.c:1999 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1003,266 +1065,270 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1984 +#: remote.c:2009 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: run-command.c:80 +#: run-command.c:87 msgid "open /dev/null failed" msgstr "" -#: run-command.c:82 +#: run-command.c:89 #, c-format msgid "dup2(%d,%d) failed" msgstr "" -#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893 -#: builtin/merge.c:1003 builtin/merge.c:1013 +#: send-pack.c:265 +msgid "failed to sign the push certificate" +msgstr "" + +#: send-pack.c:322 +msgid "the receiving end does not support --signed push" +msgstr "" + +#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892 +#: builtin/merge.c:1002 builtin/merge.c:1012 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785 -#: builtin/merge.c:1005 builtin/merge.c:1018 +#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784 +#: builtin/merge.c:1004 builtin/merge.c:1017 #, c-format msgid "Could not write to '%s'" msgstr "" -#: sequencer.c:194 +#: sequencer.c:195 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:197 +#: sequencer.c:198 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:210 sequencer.c:841 sequencer.c:924 +#: sequencer.c:211 sequencer.c:852 sequencer.c:935 #, c-format msgid "Could not write to %s" msgstr "" -#: sequencer.c:213 +#: sequencer.c:214 #, c-format msgid "Error wrapping up %s" msgstr "" -#: sequencer.c:228 +#: sequencer.c:229 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" -#: sequencer.c:230 +#: sequencer.c:231 msgid "Your local changes would be overwritten by revert." msgstr "" -#: sequencer.c:233 +#: sequencer.c:234 msgid "Commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:250 -msgid "Failed to lock HEAD during fast_forward_to" -msgstr "" - #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:293 +#: sequencer.c:304 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:324 +#: sequencer.c:335 msgid "Could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:344 +#: sequencer.c:355 msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:391 +#: sequencer.c:402 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:396 +#: sequencer.c:407 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:462 +#: sequencer.c:473 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:481 +#: sequencer.c:492 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:489 +#: sequencer.c:500 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:493 +#: sequencer.c:504 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:506 +#: sequencer.c:517 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:510 +#: sequencer.c:521 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:596 +#: sequencer.c:607 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:597 +#: sequencer.c:608 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:633 +#: sequencer.c:644 msgid "empty commit set passed" msgstr "" -#: sequencer.c:641 +#: sequencer.c:652 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:645 +#: sequencer.c:656 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:705 +#: sequencer.c:716 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:727 +#: sequencer.c:738 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:732 +#: sequencer.c:743 msgid "No commits parsed." msgstr "" -#: sequencer.c:745 +#: sequencer.c:756 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:749 +#: sequencer.c:760 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:756 +#: sequencer.c:767 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:786 +#: sequencer.c:797 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:789 +#: sequencer.c:800 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:801 +#: sequencer.c:812 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:822 +#: sequencer.c:833 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:823 +#: sequencer.c:834 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:827 +#: sequencer.c:838 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:843 sequencer.c:928 +#: sequencer.c:854 sequencer.c:939 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:873 sequencer.c:1009 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:864 +#: sequencer.c:875 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:866 +#: sequencer.c:877 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:888 builtin/apply.c:4062 +#: sequencer.c:899 builtin/apply.c:4128 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:891 +#: sequencer.c:902 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:892 +#: sequencer.c:903 msgid "unexpected end of file" msgstr "" -#: sequencer.c:898 +#: sequencer.c:909 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:921 +#: sequencer.c:932 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1066 +#: sequencer.c:1077 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:1069 +#: sequencer.c:1080 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:1103 +#: sequencer.c:1114 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1104 +#: sequencer.c:1115 msgid "Can't cherry-pick into empty head" msgstr "" -#: sha1_name.c:439 +#: sha1_name.c:440 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" @@ -1275,21 +1341,21 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: sha1_name.c:1060 +#: sha1_name.c:1068 msgid "HEAD does not point to a branch" msgstr "" -#: sha1_name.c:1063 +#: sha1_name.c:1071 #, c-format msgid "No such branch: '%s'" msgstr "" -#: sha1_name.c:1065 +#: sha1_name.c:1073 #, c-format msgid "No upstream configured for branch '%s'" msgstr "" -#: sha1_name.c:1069 +#: sha1_name.c:1077 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" @@ -1317,16 +1383,41 @@ msgstr "" msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:1118 builtin/init-db.c:363 +#: submodule.c:1111 builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "" -#: submodule.c:1129 +#: submodule.c:1122 #, c-format msgid "Could not set core.worktree in %s" msgstr "" +#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565 +#: trailer.c:569 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "" + +#: trailer.c:551 trailer.c:556 builtin/remote.c:288 +#, c-format +msgid "more than one %s" +msgstr "" + +#: trailer.c:589 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "" + +#: trailer.c:709 +#, c-format +msgid "could not read input file '%s'" +msgstr "" + +#: trailer.c:712 +msgid "could not read from stdin" +msgstr "" + #: unpack-trees.c:202 msgid "Checking out files" msgstr "" @@ -1360,25 +1451,29 @@ msgstr "" msgid "invalid '..' path segment" msgstr "" -#: wrapper.c:460 +#: wrapper.c:509 #, c-format msgid "unable to access '%s': %s" msgstr "" -#: wrapper.c:481 +#: wrapper.c:530 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:492 +#: wrapper.c:541 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" -#: wrapper.c:493 +#: wrapper.c:542 msgid "no such user" msgstr "" +#: wrapper.c:550 +msgid "unable to get current working directory" +msgstr "" + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "" @@ -1516,193 +1611,193 @@ msgstr "" msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:764 +#: wt-status.c:761 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:766 +#: wt-status.c:763 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:845 +#: wt-status.c:842 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" -#: wt-status.c:936 +#: wt-status.c:933 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:939 +#: wt-status.c:936 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:942 +#: wt-status.c:939 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:945 +#: wt-status.c:942 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:955 +#: wt-status.c:952 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:958 +#: wt-status.c:955 msgid "The current patch is empty." msgstr "" -#: wt-status.c:962 +#: wt-status.c:959 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:964 +#: wt-status.c:961 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:966 +#: wt-status.c:963 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1026 wt-status.c:1043 +#: wt-status.c:1023 wt-status.c:1040 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1031 wt-status.c:1048 +#: wt-status.c:1028 wt-status.c:1045 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1034 +#: wt-status.c:1031 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1036 +#: wt-status.c:1033 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1038 +#: wt-status.c:1035 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1051 +#: wt-status.c:1048 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1055 +#: wt-status.c:1052 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1060 +#: wt-status.c:1057 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1063 +#: wt-status.c:1060 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1067 +#: wt-status.c:1064 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1072 +#: wt-status.c:1069 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1075 +#: wt-status.c:1072 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1077 +#: wt-status.c:1074 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1087 +#: wt-status.c:1084 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1092 +#: wt-status.c:1089 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1095 +#: wt-status.c:1092 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1097 +#: wt-status.c:1094 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1106 +#: wt-status.c:1103 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1111 +#: wt-status.c:1108 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1114 +#: wt-status.c:1111 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1116 +#: wt-status.c:1113 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1127 +#: wt-status.c:1124 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1131 +#: wt-status.c:1128 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1134 +#: wt-status.c:1131 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1309 +#: wt-status.c:1306 msgid "On branch " msgstr "" -#: wt-status.c:1316 +#: wt-status.c:1313 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1323 +#: wt-status.c:1320 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1325 +#: wt-status.c:1322 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1328 +#: wt-status.c:1325 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1345 +#: wt-status.c:1342 msgid "Initial commit" msgstr "" -#: wt-status.c:1359 +#: wt-status.c:1356 msgid "Untracked files" msgstr "" -#: wt-status.c:1361 +#: wt-status.c:1358 msgid "Ignored files" msgstr "" -#: wt-status.c:1365 +#: wt-status.c:1362 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1710,123 +1805,123 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1368 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1373 +#: wt-status.c:1370 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1379 +#: wt-status.c:1376 msgid "No changes" msgstr "" -#: wt-status.c:1384 +#: wt-status.c:1381 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1387 +#: wt-status.c:1384 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1390 +#: wt-status.c:1387 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1393 +#: wt-status.c:1390 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1396 +#: wt-status.c:1393 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1399 wt-status.c:1404 +#: wt-status.c:1396 wt-status.c:1401 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1402 +#: wt-status.c:1399 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1406 +#: wt-status.c:1403 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1515 +#: wt-status.c:1512 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1521 +#: wt-status.c:1518 msgid "Initial commit on " msgstr "" -#: wt-status.c:1553 +#: wt-status.c:1550 msgid "gone" msgstr "" -#: wt-status.c:1555 wt-status.c:1563 +#: wt-status.c:1552 wt-status.c:1560 msgid "behind " msgstr "" -#: compat/precompose_utf8.c:55 builtin/clone.c:356 +#: compat/precompose_utf8.c:55 builtin/clone.c:357 #, c-format msgid "failed to unlink '%s'" msgstr "" -#: builtin/add.c:21 +#: builtin/add.c:22 msgid "git add [options] [--] <pathspec>..." msgstr "" -#: builtin/add.c:64 +#: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:69 builtin/commit.c:261 +#: builtin/add.c:70 builtin/commit.c:275 msgid "updating files failed" msgstr "" -#: builtin/add.c:79 +#: builtin/add.c:80 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:133 +#: builtin/add.c:134 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:193 builtin/rev-parse.c:781 +#: builtin/add.c:194 builtin/rev-parse.c:785 msgid "Could not read the index" msgstr "" -#: builtin/add.c:204 +#: builtin/add.c:205 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:208 +#: builtin/add.c:209 msgid "Could not write patch" msgstr "" -#: builtin/add.c:213 +#: builtin/add.c:214 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:215 +#: builtin/add.c:216 msgid "Empty patch. Aborted." msgstr "" @@ -1839,15 +1934,15 @@ msgstr "" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70 -#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375 #: builtin/rm.c:269 msgid "dry run" msgstr "" -#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19 -#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606 -#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113 +#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 +#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "" @@ -1855,7 +1950,7 @@ msgstr "" msgid "interactive picking" msgstr "" -#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286 msgid "select hunks interactively" msgstr "" @@ -1927,74 +2022,74 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "" -#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "" -#: builtin/apply.c:57 +#: builtin/apply.c:58 msgid "git apply [options] [<patch>...]" msgstr "" -#: builtin/apply.c:110 +#: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: builtin/apply.c:125 +#: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: builtin/apply.c:825 +#: builtin/apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: builtin/apply.c:834 +#: builtin/apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: builtin/apply.c:915 +#: builtin/apply.c:916 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:947 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:951 +#: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:952 +#: builtin/apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:959 +#: builtin/apply.c:960 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1422 +#: builtin/apply.c:1423 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1479 +#: builtin/apply.c:1480 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1496 +#: builtin/apply.c:1497 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2005,394 +2100,394 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1656 +#: builtin/apply.c:1657 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1658 +#: builtin/apply.c:1659 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1684 +#: builtin/apply.c:1685 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1720 +#: builtin/apply.c:1721 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1722 +#: builtin/apply.c:1723 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1725 +#: builtin/apply.c:1726 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1871 +#: builtin/apply.c:1872 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: builtin/apply.c:1900 +#: builtin/apply.c:1901 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:1986 +#: builtin/apply.c:2052 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2076 +#: builtin/apply.c:2142 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2080 +#: builtin/apply.c:2146 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2688 +#: builtin/apply.c:2754 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2806 +#: builtin/apply.c:2872 #, 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:2818 +#: builtin/apply.c:2884 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2824 +#: builtin/apply.c:2890 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2843 +#: builtin/apply.c:2909 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:2944 +#: builtin/apply.c:3010 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:2950 +#: builtin/apply.c:3016 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:2971 +#: builtin/apply.c:3037 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3095 +#: builtin/apply.c:3161 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 +#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3174 builtin/apply.c:3396 +#: builtin/apply.c:3240 builtin/apply.c:3462 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3255 builtin/apply.c:3410 +#: builtin/apply.c:3321 builtin/apply.c:3476 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 +#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3264 builtin/apply.c:3418 +#: builtin/apply.c:3330 builtin/apply.c:3484 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3366 +#: builtin/apply.c:3432 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3435 +#: builtin/apply.c:3501 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3437 +#: builtin/apply.c:3503 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3538 +#: builtin/apply.c:3604 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3541 +#: builtin/apply.c:3607 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3561 +#: builtin/apply.c:3627 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3566 +#: builtin/apply.c:3632 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3574 +#: builtin/apply.c:3640 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3587 +#: builtin/apply.c:3653 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134 +#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3823 +#: builtin/apply.c:3889 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3852 +#: builtin/apply.c:3918 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: builtin/apply.c:3856 +#: builtin/apply.c:3922 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3861 +#: builtin/apply.c:3927 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3864 builtin/apply.c:3972 +#: builtin/apply.c:3930 builtin/apply.c:4038 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3897 +#: builtin/apply.c:3963 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3946 +#: builtin/apply.c:4012 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:4033 +#: builtin/apply.c:4099 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:4041 +#: builtin/apply.c:4107 msgid "internal error" msgstr "" -#: builtin/apply.c:4044 +#: builtin/apply.c:4110 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4054 +#: builtin/apply.c:4120 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4075 +#: builtin/apply.c:4141 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4078 +#: builtin/apply.c:4144 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4228 +#: builtin/apply.c:4234 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4239 +#: builtin/apply.c:4245 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91 #: builtin/fetch.c:93 msgid "path" msgstr "" -#: builtin/apply.c:4359 +#: builtin/apply.c:4363 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4362 +#: builtin/apply.c:4366 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4364 +#: builtin/apply.c:4368 msgid "num" msgstr "" -#: builtin/apply.c:4365 +#: builtin/apply.c:4369 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4368 +#: builtin/apply.c:4372 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4370 +#: builtin/apply.c:4374 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4374 +#: builtin/apply.c:4378 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4376 +#: builtin/apply.c:4380 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4378 +#: builtin/apply.c:4382 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4380 +#: builtin/apply.c:4384 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4382 +#: builtin/apply.c:4386 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4384 +#: builtin/apply.c:4388 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4386 +#: builtin/apply.c:4390 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4388 +#: builtin/apply.c:4392 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4393 +#: builtin/apply.c:4397 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4394 +#: builtin/apply.c:4398 msgid "action" msgstr "" -#: builtin/apply.c:4395 +#: builtin/apply.c:4399 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4398 builtin/apply.c:4401 +#: builtin/apply.c:4402 builtin/apply.c:4405 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4404 +#: builtin/apply.c:4408 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4406 +#: builtin/apply.c:4410 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4408 +#: builtin/apply.c:4412 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4410 +#: builtin/apply.c:4414 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4413 +#: builtin/apply.c:4417 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4416 +#: builtin/apply.c:4420 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4418 +#: builtin/apply.c:4422 msgid "root" msgstr "" -#: builtin/apply.c:4419 +#: builtin/apply.c:4423 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4441 +#: builtin/apply.c:4445 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4449 +#: builtin/apply.c:4453 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4452 +#: builtin/apply.c:4456 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4468 +#: builtin/apply.c:4472 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4482 +#: builtin/apply.c:4486 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4488 builtin/apply.c:4498 +#: builtin/apply.c:4492 builtin/apply.c:4502 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2552,7 +2647,7 @@ msgstr "" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2599 +#: builtin/blame.c:2602 msgid "4 years, 11 months ago" msgstr "" @@ -2572,371 +2667,371 @@ msgstr "" msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "" -#: builtin/branch.c:150 +#: builtin/branch.c:152 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:154 +#: builtin/branch.c:156 #, 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:168 +#: builtin/branch.c:170 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:172 +#: builtin/branch.c:174 #, 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:185 +#: builtin/branch.c:187 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:213 +#: builtin/branch.c:215 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:219 +#: builtin/branch.c:221 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:227 +#: builtin/branch.c:229 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" -#: builtin/branch.c:240 +#: builtin/branch.c:245 #, c-format msgid "remote branch '%s' not found." msgstr "" -#: builtin/branch.c:241 +#: builtin/branch.c:246 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:255 +#: builtin/branch.c:260 #, c-format msgid "Error deleting remote branch '%s'" msgstr "" -#: builtin/branch.c:256 +#: builtin/branch.c:261 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:263 +#: builtin/branch.c:268 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:366 +#: builtin/branch.c:370 #, c-format msgid "branch '%s' does not point at a commit" msgstr "" -#: builtin/branch.c:454 +#: builtin/branch.c:459 #, c-format msgid "[%s: gone]" msgstr "" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s]" msgstr "" -#: builtin/branch.c:464 +#: builtin/branch.c:469 #, c-format msgid "[%s: behind %d]" msgstr "" -#: builtin/branch.c:466 +#: builtin/branch.c:471 #, c-format msgid "[behind %d]" msgstr "" -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d]" msgstr "" -#: builtin/branch.c:472 +#: builtin/branch.c:477 #, c-format msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:475 +#: builtin/branch.c:480 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:478 +#: builtin/branch.c:483 #, c-format msgid "[ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:502 +#: builtin/branch.c:496 msgid " **** invalid ref ****" msgstr "" -#: builtin/branch.c:594 +#: builtin/branch.c:587 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: builtin/branch.c:597 +#: builtin/branch.c:590 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" -#: builtin/branch.c:600 +#: builtin/branch.c:593 #, c-format msgid "(detached from %s)" msgstr "" -#: builtin/branch.c:603 +#: builtin/branch.c:596 msgid "(no branch)" msgstr "" -#: builtin/branch.c:649 +#: builtin/branch.c:643 #, c-format msgid "object '%s' does not point to a commit" msgstr "" -#: builtin/branch.c:681 +#: builtin/branch.c:691 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:694 +#: builtin/branch.c:704 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:704 +#: builtin/branch.c:714 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:719 +#: builtin/branch.c:729 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:727 +#: builtin/branch.c:737 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:734 +#: builtin/branch.c:744 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:749 +#: builtin/branch.c:759 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:773 +#: builtin/branch.c:783 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:803 +#: builtin/branch.c:813 msgid "Generic options" msgstr "" -#: builtin/branch.c:805 +#: builtin/branch.c:815 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:806 +#: builtin/branch.c:816 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:807 +#: builtin/branch.c:817 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:809 +#: builtin/branch.c:819 msgid "change upstream info" msgstr "" -#: builtin/branch.c:813 +#: builtin/branch.c:823 msgid "use colored output" msgstr "" -#: builtin/branch.c:814 +#: builtin/branch.c:824 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 -#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574 -#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615 -#: builtin/tag.c:621 +#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 +#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623 +#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616 +#: builtin/tag.c:622 msgid "commit" msgstr "" -#: builtin/branch.c:818 builtin/branch.c:824 +#: builtin/branch.c:828 builtin/branch.c:834 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:830 +#: builtin/branch.c:840 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:831 +#: builtin/branch.c:841 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:833 +#: builtin/branch.c:843 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:834 +#: builtin/branch.c:844 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:835 +#: builtin/branch.c:845 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:836 +#: builtin/branch.c:846 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:837 +#: builtin/branch.c:847 msgid "list branch names" msgstr "" -#: builtin/branch.c:838 +#: builtin/branch.c:848 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:840 +#: builtin/branch.c:850 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:841 +#: builtin/branch.c:851 msgid "force creation (when already exists)" msgstr "" -#: builtin/branch.c:844 +#: builtin/branch.c:854 msgid "print only not merged branches" msgstr "" -#: builtin/branch.c:850 +#: builtin/branch.c:860 msgid "print only merged branches" msgstr "" -#: builtin/branch.c:854 +#: builtin/branch.c:864 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:867 +#: builtin/branch.c:877 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:872 builtin/clone.c:636 +#: builtin/branch.c:881 builtin/clone.c:634 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:896 +#: builtin/branch.c:903 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:902 builtin/branch.c:941 +#: builtin/branch.c:909 builtin/branch.c:948 msgid "branch name required" msgstr "" -#: builtin/branch.c:917 +#: builtin/branch.c:924 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:922 +#: builtin/branch.c:929 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:929 +#: builtin/branch.c:936 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:932 +#: builtin/branch.c:939 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:947 +#: builtin/branch.c:954 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:952 +#: builtin/branch.c:959 msgid "too many branches to set new upstream" msgstr "" -#: builtin/branch.c:956 +#: builtin/branch.c:963 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 +#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:963 +#: builtin/branch.c:970 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:975 +#: builtin/branch.c:982 msgid "too many branches to unset upstream" msgstr "" -#: builtin/branch.c:979 +#: builtin/branch.c:986 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:985 +#: builtin/branch.c:992 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:999 +#: builtin/branch.c:1006 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:1005 +#: builtin/branch.c:1012 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:1008 +#: builtin/branch.c:1015 #, 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:1025 +#: builtin/branch.c:1032 #, c-format msgid "" "\n" @@ -2944,12 +3039,12 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:1026 +#: builtin/branch.c:1033 #, c-format msgid " git branch -d %s\n" msgstr "" -#: builtin/branch.c:1027 +#: builtin/branch.c:1034 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr "" @@ -2967,43 +3062,43 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:331 +#: builtin/cat-file.c:332 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "" -#: builtin/cat-file.c:332 +#: builtin/cat-file.c:333 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:370 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:371 msgid "show object type" msgstr "" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:372 msgid "show object size" msgstr "" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:374 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:374 +#: builtin/cat-file.c:375 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:377 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:379 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:381 +#: builtin/cat-file.c:382 msgid "show info about objects fed from the standard input" msgstr "" @@ -3023,7 +3118,7 @@ msgstr "" msgid "use .gitattributes only from the index" msgstr "" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "" @@ -3031,7 +3126,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274 msgid "suppress progress reporting" msgstr "" @@ -3195,46 +3290,46 @@ msgstr "" msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:591 +#: builtin/checkout.c:597 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:629 +#: builtin/checkout.c:635 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:636 +#: builtin/checkout.c:642 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:639 +#: builtin/checkout.c:645 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:643 +#: builtin/checkout.c:649 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:645 builtin/checkout.c:1026 +#: builtin/checkout.c:651 builtin/checkout.c:1032 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:647 +#: builtin/checkout.c:653 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:699 +#: builtin/checkout.c:705 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:705 +#: builtin/checkout.c:711 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3249,7 +3344,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:723 +#: builtin/checkout.c:729 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3259,151 +3354,151 @@ msgid "" "\n" msgstr "" -#: builtin/checkout.c:753 +#: builtin/checkout.c:759 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:757 +#: builtin/checkout.c:763 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:784 builtin/checkout.c:1021 +#: builtin/checkout.c:790 builtin/checkout.c:1027 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:928 +#: builtin/checkout.c:934 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:967 +#: builtin/checkout.c:973 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1002 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1041 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1038 builtin/checkout.c:1042 +#: builtin/checkout.c:1044 builtin/checkout.c:1048 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054 -#: builtin/checkout.c:1057 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 +#: builtin/checkout.c:1063 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1068 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "" -#: builtin/checkout.c:1085 +#: builtin/checkout.c:1091 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1087 +#: builtin/checkout.c:1093 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1088 +#: builtin/checkout.c:1094 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1089 +#: builtin/checkout.c:1095 msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1096 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1099 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1101 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1097 +#: builtin/checkout.c:1103 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1104 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1099 builtin/merge.c:225 +#: builtin/checkout.c:1105 builtin/merge.c:226 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245 +#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245 msgid "style" msgstr "" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1107 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1110 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1112 msgid "second guess 'git checkout no-such-branch'" msgstr "" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1135 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1152 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1157 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1194 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1201 #, 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:1202 +#: builtin/checkout.c:1206 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1206 +#: builtin/checkout.c:1210 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3532,7 +3627,7 @@ msgstr "" msgid "remove whole directories" msgstr "" -#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714 +#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "" @@ -3565,145 +3660,145 @@ msgid "" "refusing to clean" msgstr "" -#: builtin/clone.c:36 +#: builtin/clone.c:37 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222 -#: builtin/push.c:503 +#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223 +#: builtin/push.c:514 msgid "force progress reporting" msgstr "" -#: builtin/clone.c:66 +#: builtin/clone.c:67 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:71 +#: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:73 +#: builtin/clone.c:74 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:75 +#: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:77 +#: builtin/clone.c:78 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:79 builtin/clone.c:81 +#: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:82 builtin/init-db.c:483 +#: builtin/clone.c:83 builtin/init-db.c:485 msgid "template-directory" msgstr "" -#: builtin/clone.c:83 builtin/init-db.c:484 +#: builtin/clone.c:84 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:85 +#: builtin/clone.c:86 msgid "reference repository" msgstr "" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659 msgid "depth" msgstr "" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:95 +#: builtin/clone.c:96 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:96 builtin/init-db.c:492 +#: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" msgstr "" -#: builtin/clone.c:97 builtin/init-db.c:493 +#: builtin/clone.c:98 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "key=value" msgstr "" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:252 +#: builtin/clone.c:253 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: builtin/clone.c:256 +#: builtin/clone.c:257 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: builtin/clone.c:259 +#: builtin/clone.c:260 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: builtin/clone.c:321 +#: builtin/clone.c:322 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/clone.c:323 builtin/diff.c:83 +#: builtin/clone.c:324 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:339 +#: builtin/clone.c:340 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:361 +#: builtin/clone.c:362 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:365 +#: builtin/clone.c:366 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:388 builtin/clone.c:565 +#: builtin/clone.c:389 builtin/clone.c:563 #, c-format msgid "done.\n" msgstr "" @@ -3715,108 +3810,108 @@ msgid "" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:480 +#: builtin/clone.c:478 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:560 +#: builtin/clone.c:558 #, c-format msgid "Checking connectivity... " msgstr "" -#: builtin/clone.c:563 +#: builtin/clone.c:561 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:627 +#: builtin/clone.c:625 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:658 +#: builtin/clone.c:656 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:768 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:772 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:783 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:786 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:799 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:805 builtin/fetch.c:1143 +#: builtin/clone.c:802 builtin/fetch.c:1155 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:815 +#: builtin/clone.c:812 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:825 +#: builtin/clone.c:822 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:838 builtin/clone.c:850 +#: builtin/clone.c:835 builtin/clone.c:847 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:841 +#: builtin/clone.c:838 #, c-format msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:860 +#: builtin/clone.c:857 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:862 +#: builtin/clone.c:859 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:898 +#: builtin/clone.c:895 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:901 +#: builtin/clone.c:898 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:906 +#: builtin/clone.c:903 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:910 +#: builtin/clone.c:907 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:961 builtin/clone.c:969 +#: builtin/clone.c:958 builtin/clone.c:966 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:972 +#: builtin/clone.c:969 msgid "You appear to have cloned an empty repository." msgstr "" @@ -3852,15 +3947,30 @@ msgstr "" msgid "--command must be the first argument" msgstr "" -#: builtin/commit.c:36 +#: builtin/commit.c:37 msgid "git commit [options] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:41 +#: builtin/commit.c:42 msgid "git status [options] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:46 +#: builtin/commit.c:47 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" + +#: builtin/commit.c:60 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3874,14 +3984,14 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:58 +#: builtin/commit.c:72 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -#: builtin/commit.c:63 +#: builtin/commit.c:77 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -3890,11 +4000,11 @@ msgid "" "\n" msgstr "" -#: builtin/commit.c:70 +#: builtin/commit.c:84 msgid "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:73 +#: builtin/commit.c:87 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -3904,100 +4014,117 @@ msgid "" "the remaining commits.\n" msgstr "" -#: builtin/commit.c:288 +#: builtin/commit.c:302 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:328 +#: builtin/commit.c:342 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:334 +#: builtin/commit.c:348 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435 +#: builtin/commit.c:359 +msgid "unable to write index file" +msgstr "" + +#: builtin/commit.c:361 +msgid "unable to update temporary index" +msgstr "" + +#: builtin/commit.c:363 +msgid "Failed to update main cache tree" +msgstr "" + +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:418 +#: builtin/commit.c:443 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:420 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:429 +#: builtin/commit.c:454 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:447 +#: builtin/commit.c:473 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:557 builtin/commit.c:563 +#: builtin/commit.c:592 #, c-format -msgid "invalid commit: %s" +msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:585 +#: builtin/commit.c:594 +#, c-format +msgid "commit '%s' has malformed author line" +msgstr "" + +#: builtin/commit.c:613 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:592 +#: builtin/commit.c:621 #, c-format msgid "invalid date format: %s" msgstr "" -#: builtin/commit.c:609 +#: builtin/commit.c:642 #, c-format msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/commit.c:642 +#: builtin/commit.c:675 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086 +#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:691 builtin/shortlog.c:273 +#: builtin/commit.c:724 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:693 +#: builtin/commit.c:726 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:697 +#: builtin/commit.c:730 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:719 +#: builtin/commit.c:752 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:723 +#: builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:727 +#: builtin/commit.c:760 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:798 +#: builtin/commit.c:831 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:816 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -4007,7 +4134,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:821 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -4017,14 +4144,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:834 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:841 +#: builtin/commit.c:874 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4032,359 +4159,351 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:855 +#: builtin/commit.c:888 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:863 +#: builtin/commit.c:896 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:870 +#: builtin/commit.c:903 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:888 +#: builtin/commit.c:921 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:945 +#: builtin/commit.c:978 msgid "Error building trees" msgstr "" -#: builtin/commit.c:960 builtin/tag.c:495 +#: builtin/commit.c:993 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1061 +#: builtin/commit.c:1095 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:1076 builtin/commit.c:1316 +#: builtin/commit.c:1110 builtin/commit.c:1350 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1113 +#: builtin/commit.c:1147 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1143 +#: builtin/commit.c:1177 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1152 +#: builtin/commit.c:1186 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1155 +#: builtin/commit.c:1189 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1157 +#: builtin/commit.c:1191 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1160 +#: builtin/commit.c:1194 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1170 +#: builtin/commit.c:1204 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1172 +#: builtin/commit.c:1206 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1180 +#: builtin/commit.c:1214 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1197 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1199 +#: builtin/commit.c:1233 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1201 +#: builtin/commit.c:1235 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1203 +#: builtin/commit.c:1237 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1215 builtin/tag.c:727 +#: builtin/commit.c:1249 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1220 +#: builtin/commit.c:1254 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1330 builtin/commit.c:1595 +#: builtin/commit.c:1364 builtin/commit.c:1644 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1332 builtin/commit.c:1597 +#: builtin/commit.c:1366 builtin/commit.c:1646 msgid "show branch information" msgstr "" -#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489 +#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1337 builtin/commit.c:1601 +#: builtin/commit.c:1371 builtin/commit.c:1650 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1340 builtin/commit.c:1604 +#: builtin/commit.c:1374 builtin/commit.c:1653 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703 -#: builtin/fast-export.c:706 builtin/tag.c:602 +#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980 +#: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "" -#: builtin/commit.c:1343 builtin/commit.c:1607 +#: builtin/commit.c:1377 builtin/commit.c:1656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1346 +#: builtin/commit.c:1380 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1347 parse-options.h:153 +#: builtin/commit.c:1381 parse-options.h:153 msgid "when" msgstr "" -#: builtin/commit.c:1348 +#: builtin/commit.c:1382 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1350 +#: builtin/commit.c:1384 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1419 +#: builtin/commit.c:1471 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1421 +#: builtin/commit.c:1473 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1469 +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1471 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1565 +#: builtin/commit.c:1614 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1566 +#: builtin/commit.c:1615 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1568 +#: builtin/commit.c:1617 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1569 builtin/tag.c:600 +#: builtin/commit.c:1618 builtin/tag.c:601 msgid "read message from file" msgstr "" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "author" msgstr "" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1571 builtin/gc.c:286 +#: builtin/commit.c:1620 builtin/gc.c:275 msgid "date" msgstr "" -#: builtin/commit.c:1571 +#: builtin/commit.c:1620 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409 -#: builtin/notes.c:566 builtin/tag.c:598 +#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/tag.c:599 msgid "message" msgstr "" -#: builtin/commit.c:1572 +#: builtin/commit.c:1621 msgid "commit message" msgstr "" -#: builtin/commit.c:1573 +#: builtin/commit.c:1622 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1574 +#: builtin/commit.c:1623 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1575 +#: builtin/commit.c:1624 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1576 +#: builtin/commit.c:1625 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1577 +#: builtin/commit.c:1626 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86 +#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1579 +#: builtin/commit.c:1628 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1580 +#: builtin/commit.c:1629 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1581 +#: builtin/commit.c:1630 msgid "default" msgstr "" -#: builtin/commit.c:1581 builtin/tag.c:603 +#: builtin/commit.c:1630 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1582 +#: builtin/commit.c:1631 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92 -#: builtin/tag.c:604 +#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92 +#: builtin/tag.c:605 msgid "key-id" msgstr "" -#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93 +#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1636 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1588 +#: builtin/commit.c:1637 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1589 +#: builtin/commit.c:1638 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1639 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1591 +#: builtin/commit.c:1640 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1592 +#: builtin/commit.c:1641 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1593 +#: builtin/commit.c:1642 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1594 +#: builtin/commit.c:1643 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1605 +#: builtin/commit.c:1654 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1606 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1611 +#: builtin/commit.c:1660 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1613 +#: builtin/commit.c:1662 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1641 +#: builtin/commit.c:1691 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1680 builtin/merge.c:518 +#: builtin/commit.c:1730 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1687 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1694 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1713 +#: builtin/commit.c:1763 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1724 +#: builtin/commit.c:1774 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1729 +#: builtin/commit.c:1779 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1756 -msgid "cannot lock HEAD ref" -msgstr "" - -#: builtin/commit.c:1769 -msgid "cannot update HEAD ref" -msgstr "" - -#: builtin/commit.c:1780 +#: builtin/commit.c:1827 msgid "" "Repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full or quota is\n" +"new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" @@ -4516,225 +4635,248 @@ msgstr "" msgid "respect include directives on lookup" msgstr "" -#: builtin/count-objects.c:82 +#: builtin/config.c:315 +msgid "unable to parse default color value" +msgstr "" + +#: builtin/config.c:455 +#, c-format +msgid "" +"# This is Git's per-user configuration file.\n" +"[core]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tuser = %s\n" +"#\temail = %s\n" +msgstr "" + +#: builtin/config.c:590 +#, c-format +msgid "cannot create configuration file %s" +msgstr "" + +#: builtin/count-objects.c:55 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:65 msgid "print sizes in human readable format" msgstr "" -#: builtin/describe.c:16 +#: builtin/describe.c:17 msgid "git describe [options] <commit-ish>*" msgstr "" -#: builtin/describe.c:17 +#: builtin/describe.c:18 msgid "git describe [options] --dirty" msgstr "" -#: builtin/describe.c:216 +#: builtin/describe.c:217 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:220 +#: builtin/describe.c:221 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:222 +#: builtin/describe.c:223 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:249 +#: builtin/describe.c:250 builtin/log.c:452 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:252 +#: builtin/describe.c:253 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/describe.c:269 +#: builtin/describe.c:270 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:271 +#: builtin/describe.c:272 #, c-format msgid "searching to describe %s\n" msgstr "" -#: builtin/describe.c:318 +#: builtin/describe.c:319 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:345 +#: builtin/describe.c:346 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:349 +#: builtin/describe.c:350 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:370 +#: builtin/describe.c:371 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:373 +#: builtin/describe.c:374 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:395 +#: builtin/describe.c:396 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:396 +#: builtin/describe.c:397 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:397 +#: builtin/describe.c:398 msgid "use any ref" msgstr "" -#: builtin/describe.c:398 +#: builtin/describe.c:399 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:399 +#: builtin/describe.c:400 msgid "always use long format" msgstr "" -#: builtin/describe.c:400 +#: builtin/describe.c:401 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:403 +#: builtin/describe.c:404 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:405 +#: builtin/describe.c:406 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:407 +#: builtin/describe.c:408 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:409 builtin/name-rev.c:318 +#: builtin/describe.c:410 builtin/name-rev.c:318 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:410 +#: builtin/describe.c:411 msgid "mark" msgstr "" -#: builtin/describe.c:411 +#: builtin/describe.c:412 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:429 +#: builtin/describe.c:430 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:455 +#: builtin/describe.c:456 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:475 +#: builtin/describe.c:476 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/diff.c:85 +#: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:236 +#: builtin/diff.c:237 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:357 +#: builtin/diff.c:358 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:400 +#: builtin/diff.c:401 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:409 +#: builtin/diff.c:410 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:416 +#: builtin/diff.c:417 #, c-format msgid "unhandled object '%s' given." msgstr "" -#: builtin/fast-export.c:23 +#: builtin/fast-export.c:24 msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:702 +#: builtin/fast-export.c:979 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:704 +#: builtin/fast-export.c:981 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:707 +#: builtin/fast-export.c:984 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:710 +#: builtin/fast-export.c:987 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:712 +#: builtin/fast-export.c:989 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:714 +#: builtin/fast-export.c:991 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:716 +#: builtin/fast-export.c:993 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:718 +#: builtin/fast-export.c:995 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:719 +#: builtin/fast-export.c:996 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:720 +#: builtin/fast-export.c:997 msgid "refspec" msgstr "" -#: builtin/fast-export.c:721 +#: builtin/fast-export.c:998 msgid "Apply refspec to exported refs" msgstr "" +#: builtin/fast-export.c:999 +msgid "anonymize output" +msgstr "" + #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" @@ -4807,7 +4949,7 @@ msgstr "" msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:118 builtin/log.c:1205 +#: builtin/fetch.c:118 builtin/log.c:1208 msgid "dir" msgstr "" @@ -4835,163 +4977,163 @@ msgstr "" msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:440 +#: builtin/fetch.c:454 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:445 +#: builtin/fetch.c:459 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:459 +#: builtin/fetch.c:473 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:460 builtin/fetch.c:546 +#: builtin/fetch.c:474 builtin/fetch.c:560 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:471 +#: builtin/fetch.c:485 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526 +#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:491 +#: builtin/fetch.c:505 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:494 +#: builtin/fetch.c:508 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:497 +#: builtin/fetch.c:511 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "forced update" msgstr "" -#: builtin/fetch.c:548 +#: builtin/fetch.c:562 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:581 builtin/fetch.c:814 +#: builtin/fetch.c:595 builtin/fetch.c:828 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:590 +#: builtin/fetch.c:604 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:608 +#: builtin/fetch.c:622 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:696 builtin/fetch.c:779 +#: builtin/fetch.c:710 builtin/fetch.c:793 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:707 +#: builtin/fetch.c:721 #, 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:759 +#: builtin/fetch.c:773 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:760 +#: builtin/fetch.c:774 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:784 +#: builtin/fetch.c:798 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:785 builtin/remote.c:1059 +#: builtin/fetch.c:799 builtin/remote.c:1063 msgid "(none)" msgstr "" -#: builtin/fetch.c:804 +#: builtin/fetch.c:818 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:823 +#: builtin/fetch.c:837 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:826 +#: builtin/fetch.c:840 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:882 +#: builtin/fetch.c:896 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:1044 +#: builtin/fetch.c:1058 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1046 builtin/remote.c:90 +#: builtin/fetch.c:1060 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1064 +#: builtin/fetch.c:1078 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:1087 +#: builtin/fetch.c:1101 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1131 +#: builtin/fetch.c:1143 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1133 +#: builtin/fetch.c:1145 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1156 +#: builtin/fetch.c:1168 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1170 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1181 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1189 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -5000,8 +5142,8 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698 -#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589 +#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590 #: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "" @@ -5026,99 +5168,103 @@ msgstr "" msgid "file to read from" msgstr "" -#: builtin/for-each-ref.c:1051 +#: builtin/for-each-ref.c:676 +msgid "unable to parse format" +msgstr "" + +#: builtin/for-each-ref.c:1057 msgid "git for-each-ref [options] [<pattern>]" msgstr "" -#: builtin/for-each-ref.c:1066 +#: builtin/for-each-ref.c:1072 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:1068 +#: builtin/for-each-ref.c:1074 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:1070 +#: builtin/for-each-ref.c:1076 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:1072 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for tcl" msgstr "" -#: builtin/for-each-ref.c:1075 +#: builtin/for-each-ref.c:1081 msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:1076 builtin/replace.c:435 +#: builtin/for-each-ref.c:1082 builtin/replace.c:438 msgid "format" msgstr "" -#: builtin/for-each-ref.c:1076 +#: builtin/for-each-ref.c:1082 msgid "format to use for the output" msgstr "" -#: builtin/for-each-ref.c:1077 +#: builtin/for-each-ref.c:1083 msgid "key" msgstr "" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1084 msgid "field name to sort on" msgstr "" -#: builtin/fsck.c:147 builtin/prune.c:172 +#: builtin/fsck.c:147 builtin/prune.c:136 msgid "Checking connectivity" msgstr "" -#: builtin/fsck.c:538 +#: builtin/fsck.c:540 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:601 +#: builtin/fsck.c:603 msgid "git fsck [options] [<object>...]" msgstr "" -#: builtin/fsck.c:607 +#: builtin/fsck.c:609 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:608 +#: builtin/fsck.c:610 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:609 +#: builtin/fsck.c:611 msgid "report tags" msgstr "" -#: builtin/fsck.c:610 +#: builtin/fsck.c:612 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:611 +#: builtin/fsck.c:613 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:612 +#: builtin/fsck.c:614 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:613 +#: builtin/fsck.c:615 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:614 +#: builtin/fsck.c:616 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:616 +#: builtin/fsck.c:618 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:617 builtin/prune.c:144 +#: builtin/fsck.c:619 builtin/prune.c:108 msgid "show progress" msgstr "" -#: builtin/fsck.c:667 +#: builtin/fsck.c:669 msgid "Checking objects" msgstr "" @@ -5126,54 +5272,54 @@ msgstr "" msgid "git gc [options]" msgstr "" -#: builtin/gc.c:91 +#: builtin/gc.c:79 #, c-format -msgid "Invalid %s: '%s'" +msgid "Invalid gc.pruneexpire: '%s'" msgstr "" -#: builtin/gc.c:118 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "" -#: builtin/gc.c:287 +#: builtin/gc.c:276 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:289 +#: builtin/gc.c:278 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:290 +#: builtin/gc.c:279 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:291 +#: builtin/gc.c:280 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:332 +#: builtin/gc.c:321 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:334 +#: builtin/gc.c:323 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:335 +#: builtin/gc.c:324 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:353 +#: builtin/gc.c:342 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:375 +#: builtin/gc.c:364 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5403,37 +5549,42 @@ msgstr "" msgid "both --cached and trees are given." msgstr "" -#: builtin/hash-object.c:60 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." msgstr "" -#: builtin/hash-object.c:61 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "" -#: builtin/hash-object.c:72 builtin/tag.c:609 +#: builtin/hash-object.c:94 builtin/tag.c:610 msgid "type" msgstr "" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:94 msgid "object type" msgstr "" -#: builtin/hash-object.c:73 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "" -#: builtin/hash-object.c:74 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "" -#: builtin/hash-object.c:76 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "" -#: builtin/hash-object.c:77 +#: builtin/hash-object.c:100 +msgid "" +"just hash any random garbage to create corrupt objects for debugging Git" +msgstr "" + +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "" @@ -5466,55 +5617,59 @@ msgstr "" msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:92 +#: builtin/help.c:91 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:105 +#: builtin/help.c:104 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:113 +#: builtin/help.c:112 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 #, c-format msgid "failed to exec '%s': %s" msgstr "" -#: builtin/help.c:216 +#: builtin/help.c:215 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:228 +#: builtin/help.c:227 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:353 +#: builtin/help.c:352 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:370 +#: builtin/help.c:369 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:378 +#: builtin/help.c:377 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:424 +#: builtin/help.c:423 msgid "Defining attributes per path" msgstr "" +#: builtin/help.c:424 +msgid "Everyday Git With 20 Commands Or So" +msgstr "" + #: builtin/help.c:425 msgid "A Git glossary" msgstr "" @@ -5553,291 +5708,291 @@ msgstr "" msgid "`git %s' is aliased to `%s'" msgstr "" -#: builtin/index-pack.c:145 +#: builtin/index-pack.c:150 #, c-format msgid "unable to open %s" msgstr "" -#: builtin/index-pack.c:191 +#: builtin/index-pack.c:200 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:211 +#: builtin/index-pack.c:220 #, c-format msgid "did not receive expected object %s" msgstr "" -#: builtin/index-pack.c:214 +#: builtin/index-pack.c:223 #, c-format msgid "object %s: expected type %s, found %s" msgstr "" -#: builtin/index-pack.c:256 +#: builtin/index-pack.c:265 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:266 +#: builtin/index-pack.c:275 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:276 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:288 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:286 +#: builtin/index-pack.c:295 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:302 +#: builtin/index-pack.c:311 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:307 +#: builtin/index-pack.c:316 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:321 +#: builtin/index-pack.c:330 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:332 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:341 +#: builtin/index-pack.c:350 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "" -#: builtin/index-pack.c:462 +#: builtin/index-pack.c:471 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:511 +#: builtin/index-pack.c:520 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:519 +#: builtin/index-pack.c:528 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:527 +#: builtin/index-pack.c:536 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:558 +#: builtin/index-pack.c:567 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:560 +#: builtin/index-pack.c:569 #, 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:586 +#: builtin/index-pack.c:595 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706 -#: builtin/index-pack.c:740 builtin/index-pack.c:749 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:680 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:689 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:746 +#: builtin/index-pack.c:755 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:760 +#: builtin/index-pack.c:769 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:774 +#: builtin/index-pack.c:783 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:777 +#: builtin/index-pack.c:787 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:779 +#: builtin/index-pack.c:789 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:851 builtin/index-pack.c:881 +#: builtin/index-pack.c:861 builtin/index-pack.c:890 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1048 +#: builtin/index-pack.c:1081 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1053 +#: builtin/index-pack.c:1086 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1056 +#: builtin/index-pack.c:1089 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1067 +#: builtin/index-pack.c:1100 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1090 +#: builtin/index-pack.c:1123 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1133 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1142 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1181 #, c-format msgid "completed with %d local objects" msgstr "" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1191 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1164 +#: builtin/index-pack.c:1195 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1189 +#: builtin/index-pack.c:1220 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1299 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1323 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1336 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1313 +#: builtin/index-pack.c:1344 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1326 +#: builtin/index-pack.c:1357 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1337 +#: builtin/index-pack.c:1368 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1370 +#: builtin/index-pack.c:1401 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1376 +#: builtin/index-pack.c:1407 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/index-pack.c:1380 builtin/index-pack.c:1559 +#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1469 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1471 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1487 +#: builtin/index-pack.c:1518 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1494 +#: builtin/index-pack.c:1525 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1523 +#: builtin/index-pack.c:1554 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1571 builtin/index-pack.c:1574 -#: builtin/index-pack.c:1586 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 +#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1604 +#: builtin/index-pack.c:1635 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1608 builtin/index-pack.c:1617 +#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1625 +#: builtin/index-pack.c:1656 msgid "--verify with no packfile name given" msgstr "" @@ -5946,54 +6101,64 @@ msgstr "" msgid " shared" msgstr "" -#: builtin/init-db.c:439 -msgid "cannot tell cwd" -msgstr "" - -#: builtin/init-db.c:465 +#: builtin/init-db.c:467 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [directory]" msgstr "" -#: builtin/init-db.c:488 +#: builtin/init-db.c:490 msgid "permissions" msgstr "" -#: builtin/init-db.c:489 +#: builtin/init-db.c:491 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172 +#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172 msgid "be quiet" msgstr "" -#: builtin/init-db.c:523 builtin/init-db.c:528 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:532 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:578 -msgid "Cannot access current working directory" -msgstr "" - -#: builtin/init-db.c:585 +#: builtin/init-db.c:583 #, c-format msgid "Cannot access work tree '%s'" msgstr "" +#: builtin/interpret-trailers.c:15 +msgid "" +"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " +"[<file>...]" +msgstr "" + +#: builtin/interpret-trailers.c:25 +msgid "trim empty trailers" +msgstr "" + +#: builtin/interpret-trailers.c:26 +msgid "trailer" +msgstr "" + +#: builtin/interpret-trailers.c:27 +msgid "trailer(s) to add" +msgstr "" + #: builtin/log.c:41 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "" @@ -6002,6 +6167,11 @@ msgstr "" msgid " or: git show [options] <object>..." msgstr "" +#: builtin/log.c:81 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "" + #: builtin/log.c:127 msgid "suppress diff output" msgstr "" @@ -6018,245 +6188,254 @@ msgstr "" msgid "decorate options" msgstr "" +#: builtin/log.c:133 +msgid "Process line range n,m in file, counting from 1" +msgstr "" + #: builtin/log.c:229 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:470 builtin/log.c:562 +#: builtin/log.c:458 +#, c-format +msgid "git show %s: bad file" +msgstr "" + +#: builtin/log.c:472 builtin/log.c:564 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:586 +#: builtin/log.c:588 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:687 +#: builtin/log.c:689 msgid "format.headers without value" msgstr "" -#: builtin/log.c:771 +#: builtin/log.c:773 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:787 +#: builtin/log.c:789 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:801 +#: builtin/log.c:803 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:809 +#: builtin/log.c:811 msgid "Not a range." msgstr "" -#: builtin/log.c:916 +#: builtin/log.c:919 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:995 +#: builtin/log.c:998 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1023 +#: builtin/log.c:1026 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "" -#: builtin/log.c:1068 +#: builtin/log.c:1071 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1183 +#: builtin/log.c:1186 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1186 +#: builtin/log.c:1189 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1190 +#: builtin/log.c:1193 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1192 +#: builtin/log.c:1195 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1194 +#: builtin/log.c:1197 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1195 +#: builtin/log.c:1198 msgid "sfx" msgstr "" -#: builtin/log.c:1196 +#: builtin/log.c:1199 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1198 +#: builtin/log.c:1201 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1200 +#: builtin/log.c:1203 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1202 +#: builtin/log.c:1205 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1205 +#: builtin/log.c:1208 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1208 +#: builtin/log.c:1211 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1211 +#: builtin/log.c:1214 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1213 +#: builtin/log.c:1216 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1215 +#: builtin/log.c:1218 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1217 +#: builtin/log.c:1220 msgid "Messaging" msgstr "" -#: builtin/log.c:1218 +#: builtin/log.c:1221 msgid "header" msgstr "" -#: builtin/log.c:1219 +#: builtin/log.c:1222 msgid "add email header" msgstr "" -#: builtin/log.c:1220 builtin/log.c:1222 +#: builtin/log.c:1223 builtin/log.c:1225 msgid "email" msgstr "" -#: builtin/log.c:1220 +#: builtin/log.c:1223 msgid "add To: header" msgstr "" -#: builtin/log.c:1222 +#: builtin/log.c:1225 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1224 +#: builtin/log.c:1227 msgid "ident" msgstr "" -#: builtin/log.c:1225 +#: builtin/log.c:1228 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1227 +#: builtin/log.c:1230 msgid "message-id" msgstr "" -#: builtin/log.c:1228 +#: builtin/log.c:1231 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1229 builtin/log.c:1232 +#: builtin/log.c:1232 builtin/log.c:1235 msgid "boundary" msgstr "" -#: builtin/log.c:1230 +#: builtin/log.c:1233 msgid "attach the patch" msgstr "" -#: builtin/log.c:1233 +#: builtin/log.c:1236 msgid "inline the patch" msgstr "" -#: builtin/log.c:1237 +#: builtin/log.c:1240 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1239 +#: builtin/log.c:1242 msgid "signature" msgstr "" -#: builtin/log.c:1240 +#: builtin/log.c:1243 msgid "add a signature" msgstr "" -#: builtin/log.c:1242 +#: builtin/log.c:1245 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1243 +#: builtin/log.c:1246 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1317 +#: builtin/log.c:1320 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1332 +#: builtin/log.c:1335 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1334 +#: builtin/log.c:1337 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1342 +#: builtin/log.c:1345 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1344 +#: builtin/log.c:1347 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1346 +#: builtin/log.c:1349 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1369 +#: builtin/log.c:1372 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1371 +#: builtin/log.c:1374 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1468 +#: builtin/log.c:1472 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1531 +#: builtin/log.c:1535 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1579 +#: builtin/log.c:1583 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1634 +#: builtin/log.c:1638 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661 +#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 #, c-format msgid "Unknown commit %s" msgstr "" @@ -6302,7 +6481,7 @@ msgid "show files on the filesystem that need to be removed" msgstr "" #: builtin/ls-files.c:477 -msgid "show 'other' directories' name only" +msgid "show 'other' directories' names only" msgstr "" #: builtin/ls-files.c:480 @@ -6389,98 +6568,98 @@ msgstr "" msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" -#: builtin/merge.c:43 +#: builtin/merge.c:44 msgid "git merge [options] [<commit>...]" msgstr "" -#: builtin/merge.c:44 +#: builtin/merge.c:45 msgid "git merge [options] <msg> HEAD <commit>" msgstr "" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge --abort" msgstr "" -#: builtin/merge.c:98 +#: builtin/merge.c:99 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:135 +#: builtin/merge.c:136 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:136 +#: builtin/merge.c:137 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:191 +#: builtin/merge.c:192 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:194 +#: builtin/merge.c:195 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:195 +#: builtin/merge.c:196 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:197 +#: builtin/merge.c:198 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:200 +#: builtin/merge.c:201 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:202 +#: builtin/merge.c:203 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:204 +#: builtin/merge.c:205 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:205 +#: builtin/merge.c:206 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:211 +#: builtin/merge.c:212 msgid "Verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89 +#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89 msgid "strategy" msgstr "" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:214 +#: builtin/merge.c:215 msgid "option=value" msgstr "" -#: builtin/merge.c:215 +#: builtin/merge.c:216 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:217 +#: builtin/merge.c:218 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:221 +#: builtin/merge.c:222 msgid "abort the current in-progress merge" msgstr "" @@ -6537,31 +6716,31 @@ msgstr "" msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:678 +#: builtin/merge.c:677 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:692 +#: builtin/merge.c:691 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:705 +#: builtin/merge.c:704 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:794 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:803 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:809 +#: builtin/merge.c:808 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6571,156 +6750,156 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:833 +#: builtin/merge.c:832 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:845 +#: builtin/merge.c:844 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:908 +#: builtin/merge.c:907 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:924 +#: builtin/merge.c:923 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:965 +#: builtin/merge.c:964 msgid "No current branch." msgstr "" -#: builtin/merge.c:967 +#: builtin/merge.c:966 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:969 +#: builtin/merge.c:968 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:974 +#: builtin/merge.c:973 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1130 +#: builtin/merge.c:1129 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1146 git-pull.sh:31 +#: builtin/merge.c:1145 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1149 git-pull.sh:34 +#: builtin/merge.c:1148 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:1153 +#: builtin/merge.c:1152 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1156 +#: builtin/merge.c:1155 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1165 +#: builtin/merge.c:1164 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1174 +#: builtin/merge.c:1173 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1206 +#: builtin/merge.c:1205 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1209 +#: builtin/merge.c:1208 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1211 +#: builtin/merge.c:1210 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1216 +#: builtin/merge.c:1215 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1267 +#: builtin/merge.c:1266 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1270 +#: builtin/merge.c:1269 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1273 +#: builtin/merge.c:1272 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1276 +#: builtin/merge.c:1275 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1357 +#: builtin/merge.c:1356 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1396 +#: builtin/merge.c:1395 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1403 +#: builtin/merge.c:1402 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1435 +#: builtin/merge.c:1434 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1458 builtin/merge.c:1537 +#: builtin/merge.c:1457 builtin/merge.c:1536 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1462 +#: builtin/merge.c:1461 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1528 +#: builtin/merge.c:1527 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1530 +#: builtin/merge.c:1529 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1539 +#: builtin/merge.c:1538 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1551 +#: builtin/merge.c:1550 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6823,85 +7002,90 @@ msgstr "" msgid "git mv [options] <source>... <destination>" msgstr "" -#: builtin/mv.c:71 -msgid "force move/rename even if target exists" +#: builtin/mv.c:69 +#, c-format +msgid "Directory %s is in index and no submodule?" msgstr "" -#: builtin/mv.c:72 -msgid "skip move/rename errors" +#: builtin/mv.c:71 +msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" -#: builtin/mv.c:122 +#: builtin/mv.c:89 #, c-format -msgid "Checking rename of '%s' to '%s'\n" +msgid "%.*s is in index" msgstr "" -#: builtin/mv.c:126 -msgid "bad source" +#: builtin/mv.c:111 +msgid "force move/rename even if target exists" msgstr "" -#: builtin/mv.c:129 -msgid "can not move directory into itself" +#: builtin/mv.c:112 +msgid "skip move/rename errors" msgstr "" -#: builtin/mv.c:132 -msgid "cannot move directory over file" +#: builtin/mv.c:151 +#, c-format +msgid "destination '%s' is not a directory" msgstr "" -#: builtin/mv.c:138 +#: builtin/mv.c:162 #, c-format -msgid "Huh? Directory %s is in index and no submodule?" +msgid "Checking rename of '%s' to '%s'\n" msgstr "" -#: builtin/mv.c:140 builtin/rm.c:318 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" +#: builtin/mv.c:166 +msgid "bad source" msgstr "" -#: builtin/mv.c:156 -#, c-format -msgid "Huh? %.*s is in index?" +#: builtin/mv.c:169 +msgid "can not move directory into itself" msgstr "" -#: builtin/mv.c:169 +#: builtin/mv.c:172 +msgid "cannot move directory over file" +msgstr "" + +#: builtin/mv.c:181 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:205 +#: builtin/mv.c:206 msgid "not under version control" msgstr "" -#: builtin/mv.c:208 +#: builtin/mv.c:209 msgid "destination exists" msgstr "" -#: builtin/mv.c:216 +#: builtin/mv.c:217 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:219 +#: builtin/mv.c:220 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "destination directory does not exist" msgstr "" -#: builtin/mv.c:244 +#: builtin/mv.c:232 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:254 +#: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358 #, c-format msgid "renaming '%s' failed" msgstr "" @@ -7051,390 +7235,394 @@ msgstr "" msgid "git notes get-ref" msgstr "" -#: builtin/notes.c:137 +#: builtin/notes.c:136 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:141 +#: builtin/notes.c:140 msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:149 +#: builtin/notes.c:148 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:167 builtin/tag.c:477 +#: builtin/notes.c:166 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "" -#: builtin/notes.c:186 +#: builtin/notes.c:185 msgid "Please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:207 builtin/notes.c:848 +#: builtin/notes.c:206 builtin/notes.c:847 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:212 +#: builtin/notes.c:211 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:214 +#: builtin/notes.c:213 #, c-format -msgid "The note contents has been left in %s" +msgid "The note contents have been left in %s" msgstr "" -#: builtin/notes.c:248 builtin/tag.c:692 +#: builtin/notes.c:247 builtin/tag.c:693 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:250 builtin/tag.c:695 +#: builtin/notes.c:249 builtin/tag.c:696 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322 -#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519 -#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641 -#: builtin/notes.c:843 builtin/tag.c:708 +#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321 +#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518 +#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640 +#: builtin/notes.c:842 builtin/tag.c:709 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:272 +#: builtin/notes.c:271 #, c-format msgid "Failed to read object '%s'." msgstr "" -#: builtin/notes.c:276 +#: builtin/notes.c:275 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "" -#: builtin/notes.c:316 +#: builtin/notes.c:315 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/notes.c:331 +#: builtin/notes.c:330 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502 -#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634 -#: builtin/notes.c:908 +#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501 +#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633 +#: builtin/notes.c:907 msgid "too many parameters" msgstr "" -#: builtin/notes.c:388 builtin/notes.c:647 +#: builtin/notes.c:387 builtin/notes.c:646 #, c-format msgid "No note found for object %s." msgstr "" -#: builtin/notes.c:410 builtin/notes.c:567 +#: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:413 builtin/notes.c:570 +#: builtin/notes.c:412 builtin/notes.c:569 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572 -#: builtin/notes.c:575 builtin/tag.c:627 +#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571 +#: builtin/notes.c:574 builtin/tag.c:628 msgid "object" msgstr "" -#: builtin/notes.c:416 builtin/notes.c:573 +#: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:419 builtin/notes.c:576 +#: builtin/notes.c:418 builtin/notes.c:575 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:421 builtin/notes.c:489 +#: builtin/notes.c:420 builtin/notes.c:488 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:455 +#: builtin/notes.c:454 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:460 builtin/notes.c:537 +#: builtin/notes.c:459 builtin/notes.c:536 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:490 +#: builtin/notes.c:489 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:492 +#: builtin/notes.c:491 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" -#: builtin/notes.c:510 +#: builtin/notes.c:509 msgid "too few parameters" msgstr "" -#: builtin/notes.c:531 +#: builtin/notes.c:530 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:543 +#: builtin/notes.c:542 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:592 +#: builtin/notes.c:591 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:739 +#: builtin/notes.c:738 msgid "General options" msgstr "" -#: builtin/notes.c:741 +#: builtin/notes.c:740 msgid "Merge options" msgstr "" -#: builtin/notes.c:743 +#: builtin/notes.c:742 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:745 +#: builtin/notes.c:744 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:747 +#: builtin/notes.c:746 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:749 +#: builtin/notes.c:748 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:751 +#: builtin/notes.c:750 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:846 +#: builtin/notes.c:845 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:858 +#: builtin/notes.c:857 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:861 +#: builtin/notes.c:860 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:942 +#: builtin/notes.c:941 msgid "notes-ref" msgstr "" -#: builtin/notes.c:943 +#: builtin/notes.c:942 msgid "use notes from <notes_ref>" msgstr "" -#: builtin/notes.c:978 builtin/remote.c:1616 +#: builtin/notes.c:977 builtin/remote.c:1624 #, c-format msgid "Unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:25 +#: builtin/pack-objects.c:28 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "" -#: builtin/pack-objects.c:26 +#: builtin/pack-objects.c:29 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:771 +#: builtin/pack-objects.c:773 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1015 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2174 +#: builtin/pack-objects.c:2175 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2526 +#: builtin/pack-objects.c:2572 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2530 +#: builtin/pack-objects.c:2576 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2553 +#: builtin/pack-objects.c:2599 #, c-format msgid "option %s does not accept negative form" msgstr "" -#: builtin/pack-objects.c:2557 +#: builtin/pack-objects.c:2603 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2622 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2578 +#: builtin/pack-objects.c:2624 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c:2626 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2583 +#: builtin/pack-objects.c:2629 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2584 +#: builtin/pack-objects.c:2630 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2585 +#: builtin/pack-objects.c:2631 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2634 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2590 +#: builtin/pack-objects.c:2636 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2638 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2640 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2642 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2598 +#: builtin/pack-objects.c:2644 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2646 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2602 +#: builtin/pack-objects.c:2648 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2650 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2652 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2654 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2656 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2658 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2661 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2664 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2667 +msgid "include objects referred to by the index" +msgstr "" + +#: builtin/pack-objects.c:2670 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2672 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2674 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2626 parse-options.h:140 +#: builtin/pack-objects.c:2675 parse-options.h:140 msgid "time" msgstr "" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2676 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2679 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2681 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2683 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2685 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2638 +#: builtin/pack-objects.c:2687 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2689 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:2719 +#: builtin/pack-objects.c:2778 msgid "Counting objects" msgstr "" @@ -7454,7 +7642,7 @@ msgstr "" msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" msgstr "" -#: builtin/prune-packed.c:49 +#: builtin/prune-packed.c:40 msgid "Removing duplicate objects" msgstr "" @@ -7462,15 +7650,15 @@ msgstr "" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "" -#: builtin/prune.c:142 +#: builtin/prune.c:106 msgid "do not remove, show only" msgstr "" -#: builtin/prune.c:143 +#: builtin/prune.c:107 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:146 +#: builtin/prune.c:110 msgid "expire objects older than <time>" msgstr "" @@ -7653,146 +7841,150 @@ msgstr "" msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:482 +#: builtin/push.c:493 msgid "repository" msgstr "" -#: builtin/push.c:483 +#: builtin/push.c:494 msgid "push all refs" msgstr "" -#: builtin/push.c:484 +#: builtin/push.c:495 msgid "mirror all refs" msgstr "" -#: builtin/push.c:486 +#: builtin/push.c:497 msgid "delete refs" msgstr "" -#: builtin/push.c:487 +#: builtin/push.c:498 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:490 +#: builtin/push.c:501 msgid "force updates" msgstr "" -#: builtin/push.c:492 +#: builtin/push.c:503 msgid "refname>:<expect" msgstr "" -#: builtin/push.c:493 +#: builtin/push.c:504 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:495 +#: builtin/push.c:506 msgid "check" msgstr "" -#: builtin/push.c:496 +#: builtin/push.c:507 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:498 +#: builtin/push.c:509 msgid "use thin pack" msgstr "" -#: builtin/push.c:499 builtin/push.c:500 +#: builtin/push.c:510 builtin/push.c:511 msgid "receive pack program" msgstr "" -#: builtin/push.c:501 +#: builtin/push.c:512 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:504 +#: builtin/push.c:515 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:506 +#: builtin/push.c:517 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:507 +#: builtin/push.c:518 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:517 +#: builtin/push.c:520 +msgid "GPG sign the push" +msgstr "" + +#: builtin/push.c:529 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:519 +#: builtin/push.c:531 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/read-tree.c:36 +#: builtin/read-tree.c:37 msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -#: builtin/read-tree.c:109 +#: builtin/read-tree.c:110 msgid "write resulting index to <file>" msgstr "" -#: builtin/read-tree.c:112 +#: builtin/read-tree.c:113 msgid "only empty the index" msgstr "" -#: builtin/read-tree.c:114 +#: builtin/read-tree.c:115 msgid "Merging" msgstr "" -#: builtin/read-tree.c:116 +#: builtin/read-tree.c:117 msgid "perform a merge in addition to a read" msgstr "" -#: builtin/read-tree.c:118 +#: builtin/read-tree.c:119 msgid "3-way merge if no file level merging required" msgstr "" -#: builtin/read-tree.c:120 +#: builtin/read-tree.c:121 msgid "3-way merge in presence of adds and removes" msgstr "" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:123 msgid "same as -m, but discard unmerged entries" msgstr "" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "<subdirectory>/" msgstr "" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:125 msgid "read the tree into the index under <subdirectory>/" msgstr "" -#: builtin/read-tree.c:127 +#: builtin/read-tree.c:128 msgid "update working tree with merge result" msgstr "" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "gitignore" msgstr "" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:131 msgid "allow explicitly ignored files to be overwritten" msgstr "" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't check the working tree after merging" msgstr "" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:135 msgid "don't update the index or the work tree" msgstr "" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" msgstr "" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "" @@ -7937,12 +8129,12 @@ msgstr "" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:185 builtin/remote.c:640 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:189 builtin/remote.c:644 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "" @@ -7952,11 +8144,6 @@ msgstr "" msgid "Could not setup master '%s'" msgstr "" -#: builtin/remote.c:288 -#, c-format -msgid "more than one %s" -msgstr "" - #: builtin/remote.c:333 #, c-format msgid "Could not get fetch map for refspec %s" @@ -7970,27 +8157,27 @@ msgstr "" msgid "(delete)" msgstr "" -#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "" -#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894 +#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898 #, c-format msgid "No such remote: %s" msgstr "" -#: builtin/remote.c:650 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:656 builtin/remote.c:846 +#: builtin/remote.c:657 builtin/remote.c:850 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:671 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -7998,32 +8185,32 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:677 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "" -#: builtin/remote.c:688 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "" -#: builtin/remote.c:710 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:744 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:765 +#: builtin/remote.c:769 #, c-format msgid "Could not remove branch %s" msgstr "" -#: builtin/remote.c:832 +#: builtin/remote.c:836 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8033,262 +8220,262 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:947 +#: builtin/remote.c:951 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:950 +#: builtin/remote.c:954 msgid " tracked" msgstr "" -#: builtin/remote.c:952 +#: builtin/remote.c:956 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:954 +#: builtin/remote.c:958 msgid " ???" msgstr "" -#: builtin/remote.c:995 +#: builtin/remote.c:999 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:1002 +#: builtin/remote.c:1006 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:1005 +#: builtin/remote.c:1009 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:1006 +#: builtin/remote.c:1010 msgid " and with remote" msgstr "" -#: builtin/remote.c:1008 +#: builtin/remote.c:1012 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:1009 +#: builtin/remote.c:1013 msgid " and with remote" msgstr "" -#: builtin/remote.c:1055 +#: builtin/remote.c:1059 msgid "create" msgstr "" -#: builtin/remote.c:1058 +#: builtin/remote.c:1062 msgid "delete" msgstr "" -#: builtin/remote.c:1062 +#: builtin/remote.c:1066 msgid "up to date" msgstr "" -#: builtin/remote.c:1065 +#: builtin/remote.c:1069 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1068 +#: builtin/remote.c:1072 msgid "local out of date" msgstr "" -#: builtin/remote.c:1075 +#: builtin/remote.c:1079 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1078 +#: builtin/remote.c:1082 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1082 +#: builtin/remote.c:1086 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1085 +#: builtin/remote.c:1089 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1153 +#: builtin/remote.c:1157 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1180 +#: builtin/remote.c:1184 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1181 +#: builtin/remote.c:1185 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1182 builtin/remote.c:1329 +#: builtin/remote.c:1186 builtin/remote.c:1333 msgid "(no URL)" msgstr "" -#: builtin/remote.c:1191 builtin/remote.c:1193 +#: builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199 +#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1201 +#: builtin/remote.c:1205 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1213 +#: builtin/remote.c:1217 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1216 builtin/remote.c:1243 +#: builtin/remote.c:1220 builtin/remote.c:1247 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1225 +#: builtin/remote.c:1229 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1233 +#: builtin/remote.c:1237 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1240 +#: builtin/remote.c:1244 #, 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:1261 +#: builtin/remote.c:1265 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1263 +#: builtin/remote.c:1267 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1278 +#: builtin/remote.c:1282 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1280 +#: builtin/remote.c:1284 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1290 +#: builtin/remote.c:1294 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1298 +#: builtin/remote.c:1302 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1300 +#: builtin/remote.c:1304 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1318 +#: builtin/remote.c:1322 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1319 +#: builtin/remote.c:1323 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1325 +#: builtin/remote.c:1329 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1326 +#: builtin/remote.c:1330 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1349 +#: builtin/remote.c:1357 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1352 +#: builtin/remote.c:1360 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1397 +#: builtin/remote.c:1405 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1463 builtin/remote.c:1537 +#: builtin/remote.c:1471 builtin/remote.c:1545 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1483 +#: builtin/remote.c:1491 msgid "add branch" msgstr "" -#: builtin/remote.c:1490 +#: builtin/remote.c:1498 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1512 +#: builtin/remote.c:1520 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1514 +#: builtin/remote.c:1522 msgid "add URL" msgstr "" -#: builtin/remote.c:1516 +#: builtin/remote.c:1524 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1523 +#: builtin/remote.c:1531 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1563 +#: builtin/remote.c:1571 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1571 +#: builtin/remote.c:1579 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1573 +#: builtin/remote.c:1581 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1587 +#: builtin/remote.c:1595 msgid "be verbose; must be placed before a subcommand" msgstr "" @@ -8385,67 +8572,67 @@ msgstr "" msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "" -#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388 +#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 #, c-format msgid "Not a valid object name: '%s'" msgstr "" -#: builtin/replace.c:352 +#: builtin/replace.c:355 #, c-format msgid "bad mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:354 +#: builtin/replace.c:357 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:365 +#: builtin/replace.c:368 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "" -#: builtin/replace.c:398 +#: builtin/replace.c:401 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "" -#: builtin/replace.c:399 +#: builtin/replace.c:402 msgid "the signature will be removed in the replacement commit!" msgstr "" -#: builtin/replace.c:405 +#: builtin/replace.c:408 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "" -#: builtin/replace.c:429 +#: builtin/replace.c:432 msgid "list replace refs" msgstr "" -#: builtin/replace.c:430 +#: builtin/replace.c:433 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:431 +#: builtin/replace.c:434 msgid "edit existing object" msgstr "" -#: builtin/replace.c:432 +#: builtin/replace.c:435 msgid "change a commit's parents" msgstr "" -#: builtin/replace.c:433 +#: builtin/replace.c:436 msgid "replace the ref if it exists" msgstr "" -#: builtin/replace.c:434 +#: builtin/replace.c:437 msgid "do not pretty-print contents for --edit" msgstr "" -#: builtin/replace.c:435 +#: builtin/replace.c:438 msgid "use this format" msgstr "" @@ -8457,153 +8644,153 @@ msgstr "" msgid "register clean resolutions in index" msgstr "" -#: builtin/reset.c:25 +#: builtin/reset.c:26 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" -#: builtin/reset.c:26 +#: builtin/reset.c:27 msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "" -#: builtin/reset.c:27 +#: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "mixed" msgstr "" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "soft" msgstr "" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "hard" msgstr "" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "merge" msgstr "" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "keep" msgstr "" -#: builtin/reset.c:73 +#: builtin/reset.c:74 msgid "You do not have a valid HEAD." msgstr "" -#: builtin/reset.c:75 +#: builtin/reset.c:76 msgid "Failed to find tree of HEAD." msgstr "" -#: builtin/reset.c:81 +#: builtin/reset.c:82 #, c-format msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:99 +#: builtin/reset.c:100 #, c-format msgid "HEAD is now at %s" msgstr "" -#: builtin/reset.c:182 +#: builtin/reset.c:183 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:275 +#: builtin/reset.c:276 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:277 +#: builtin/reset.c:278 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:278 +#: builtin/reset.c:279 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:280 builtin/reset.c:282 +#: builtin/reset.c:281 builtin/reset.c:283 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:284 +#: builtin/reset.c:285 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:287 +#: builtin/reset.c:288 msgid "record only the fact that removed paths will be added later" msgstr "" -#: builtin/reset.c:304 +#: builtin/reset.c:305 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:307 builtin/reset.c:315 +#: builtin/reset.c:308 builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/reset.c:312 +#: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "" -#: builtin/reset.c:321 +#: builtin/reset.c:322 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:330 +#: builtin/reset.c:331 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:332 +#: builtin/reset.c:333 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:342 +#: builtin/reset.c:343 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:346 +#: builtin/reset.c:347 msgid "-N can only be used with --mixed" msgstr "" -#: builtin/reset.c:363 +#: builtin/reset.c:364 msgid "Unstaged changes after reset:" msgstr "" -#: builtin/reset.c:369 +#: builtin/reset.c:370 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/reset.c:373 +#: builtin/reset.c:374 msgid "Could not write new index file." msgstr "" -#: builtin/rev-parse.c:360 +#: builtin/rev-parse.c:361 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:367 +#: builtin/rev-parse.c:368 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:370 +#: builtin/rev-parse.c:371 msgid "output in stuck long form" msgstr "" -#: builtin/rev-parse.c:498 +#: builtin/rev-parse.c:499 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -8710,7 +8897,7 @@ msgid "" "the following submodule (or one of its nested submodules)\n" "uses a .git directory:" msgid_plural "" -"the following submodules (or one of its nested submodules)\n" +"the following submodules (or one of their nested submodules)\n" "use a .git directory:" msgstr[0] "" msgstr[1] "" @@ -8775,6 +8962,10 @@ msgstr "" msgid "exit with a zero status even if nothing matched" msgstr "" +#: builtin/rm.c:318 +msgid "Please, stage your changes to .gitmodules or stash them to proceed" +msgstr "" + #: builtin/rm.c:336 #, c-format msgid "not removing '%s' recursively without -r" @@ -8952,11 +9143,11 @@ msgstr "" msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "" @@ -9067,236 +9258,226 @@ msgstr "" msgid "malformed object name '%s'" msgstr "" -#: builtin/tag.c:588 +#: builtin/tag.c:589 msgid "list tag names" msgstr "" -#: builtin/tag.c:590 +#: builtin/tag.c:591 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:592 +#: builtin/tag.c:593 msgid "delete tags" msgstr "" -#: builtin/tag.c:593 +#: builtin/tag.c:594 msgid "verify tags" msgstr "" -#: builtin/tag.c:595 +#: builtin/tag.c:596 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:597 +#: builtin/tag.c:598 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:599 +#: builtin/tag.c:600 msgid "tag message" msgstr "" -#: builtin/tag.c:601 +#: builtin/tag.c:602 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:605 +#: builtin/tag.c:606 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:606 +#: builtin/tag.c:607 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:607 +#: builtin/tag.c:608 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:609 +#: builtin/tag.c:610 msgid "sort tags" msgstr "" -#: builtin/tag.c:613 +#: builtin/tag.c:614 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:616 builtin/tag.c:622 +#: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:628 +#: builtin/tag.c:629 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:654 +#: builtin/tag.c:655 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:666 +#: builtin/tag.c:667 msgid "--sort and -n are incompatible" msgstr "" -#: builtin/tag.c:673 +#: builtin/tag.c:674 msgid "-n option is only allowed with -l." msgstr "" -#: builtin/tag.c:675 +#: builtin/tag.c:676 msgid "--contains option is only allowed with -l." msgstr "" -#: builtin/tag.c:677 +#: builtin/tag.c:678 msgid "--points-at option is only allowed with -l." msgstr "" -#: builtin/tag.c:685 +#: builtin/tag.c:686 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:705 +#: builtin/tag.c:706 msgid "too many params" msgstr "" -#: builtin/tag.c:711 +#: builtin/tag.c:712 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:716 +#: builtin/tag.c:717 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:734 -#, c-format -msgid "%s: cannot lock the ref" -msgstr "" - -#: builtin/tag.c:736 -#, c-format -msgid "%s: cannot update the ref" -msgstr "" - -#: builtin/tag.c:738 +#: builtin/tag.c:741 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" -#: builtin/unpack-objects.c:483 +#: builtin/unpack-objects.c:489 msgid "Unpacking objects" msgstr "" -#: builtin/update-index.c:402 +#: builtin/update-index.c:403 msgid "git update-index [options] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:755 +#: builtin/update-index.c:756 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:758 +#: builtin/update-index.c:759 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:761 +#: builtin/update-index.c:762 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:763 +#: builtin/update-index.c:764 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:765 +#: builtin/update-index.c:766 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:767 +#: builtin/update-index.c:768 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:770 +#: builtin/update-index.c:771 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:774 +#: builtin/update-index.c:775 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:778 +#: builtin/update-index.c:779 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:783 +#: builtin/update-index.c:784 msgid "(+/-)x" msgstr "" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/update-index.c:788 +#: builtin/update-index.c:789 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:791 +#: builtin/update-index.c:792 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:794 +#: builtin/update-index.c:795 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:797 +#: builtin/update-index.c:798 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:800 +#: builtin/update-index.c:801 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:802 +#: builtin/update-index.c:803 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:804 +#: builtin/update-index.c:805 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:806 +#: builtin/update-index.c:807 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:810 +#: builtin/update-index.c:811 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:814 +#: builtin/update-index.c:815 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:818 +#: builtin/update-index.c:819 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:822 +#: builtin/update-index.c:823 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:825 +#: builtin/update-index.c:826 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:827 +#: builtin/update-index.c:828 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:831 +#: builtin/update-index.c:832 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:833 +#: builtin/update-index.c:834 msgid "enable or disable split index" msgstr "" @@ -9312,19 +9493,19 @@ msgstr "" msgid "git update-ref [options] --stdin [-z]" msgstr "" -#: builtin/update-ref.c:350 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "" -#: builtin/update-ref.c:352 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "" -#: builtin/update-ref.c:353 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "" -#: builtin/update-ref.c:354 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "" @@ -9344,15 +9525,15 @@ msgstr "" msgid "print commit contents" msgstr "" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:54 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." msgstr "" -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:64 msgid "verbose" msgstr "" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:66 msgid "show statistics only" msgstr "" @@ -9380,33 +9561,17 @@ msgstr "" msgid "only useful for debugging" msgstr "" +#: credential-cache--daemon.c:267 +msgid "print debugging messages to stderr" +msgstr "" + #: git.c:17 msgid "" -"'git help -a' and 'git help -g' lists available subcommands and some\n" +"'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" -#: parse-options.h:143 -msgid "expiry-date" -msgstr "" - -#: parse-options.h:158 -msgid "no-op (backward compatibility)" -msgstr "" - -#: parse-options.h:232 -msgid "be more verbose" -msgstr "" - -#: parse-options.h:234 -msgid "be more quiet" -msgstr "" - -#: parse-options.h:240 -msgid "use <n> digits to display SHA-1s" -msgstr "" - #: common-cmds.h:8 msgid "Add file contents to the index" msgstr "" @@ -9491,6 +9656,30 @@ msgstr "" msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" +#: parse-options.h:143 +msgid "expiry-date" +msgstr "" + +#: parse-options.h:158 +msgid "no-op (backward compatibility)" +msgstr "" + +#: parse-options.h:232 +msgid "be more verbose" +msgstr "" + +#: parse-options.h:234 +msgid "be more quiet" +msgstr "" + +#: parse-options.h:240 +msgid "use <n> digits to display SHA-1s" +msgstr "" + +#: rerere.h:27 +msgid "update the index with reused conflict resolution if possible" +msgstr "" + #: git-am.sh:52 msgid "You need to set your committer info first" msgstr "" @@ -9719,14 +9908,14 @@ msgstr "" #: git-bisect.sh:289 msgid "" -"You need to give me at least one good and one bad revisions.\n" +"You need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" #: git-bisect.sh:292 msgid "" "You need to start by \"git bisect start\".\n" -"You then need to give me at least one good and one bad revisions.\n" +"You then need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" @@ -9790,13 +9979,19 @@ msgstr "" 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, or use 'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" #: git-pull.sh:25 msgid "Pull is not possible because you have unmerged files." msgstr "" +#: git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" + #: git-pull.sh:245 msgid "updating an unborn branch with changes added to the index" msgstr "" @@ -10028,7 +10223,7 @@ msgstr "" #: git-stash.sh:397 #, sh-format -msgid "$reference is not valid reference" +msgid "$reference is not a valid reference" msgstr "" #: git-stash.sh:425 @@ -10075,11 +10270,11 @@ msgstr "" msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:538 +#: git-stash.sh:539 msgid "No branch name specified" msgstr "" -#: git-stash.sh:610 +#: git-stash.sh:611 msgid "(To restore them type \"git stash apply\")" msgstr "" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git 2.0.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2014-08-04 14:48+0800\n" -"PO-Revision-Date: 2014-08-05 13:44+0100\n" +"POT-Creation-Date: 2014-11-20 09:42+0800\n" +"PO-Revision-Date: 2014-11-20 16:10+0800\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -25,106 +25,104 @@ msgstr "tips: %.*s\n" #: advice.c:88 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, or use\n" -"'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" -"som lämpligt för att ange lösning och checka in, eller använd\n" -"\"git commit -a\"." +"som lämpligt för att ange lösning och checka in." -#: archive.c:10 +#: archive.c:11 msgid "git archive [options] <tree-ish> [<path>...]" msgstr "git archive [flaggor] <träd-igt> [<sökväg>...]" -#: archive.c:11 +#: archive.c:12 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:12 +#: archive.c:13 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" msgstr "" "git archive --remote <arkiv> [--exec <kmd>] [flaggor] <träd-igt> " "[<sökväg>...]" -#: archive.c:13 +#: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: archive.c:328 +#: archive.c:419 msgid "fmt" msgstr "fmt" -#: archive.c:328 +#: archive.c:419 msgid "archive format" msgstr "arkivformat" -#: archive.c:329 builtin/log.c:1201 +#: archive.c:420 builtin/log.c:1204 msgid "prefix" msgstr "prefix" -#: archive.c:330 +#: archive.c:421 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709 -#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412 -#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151 +#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411 +#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "fil" -#: archive.c:332 builtin/archive.c:89 +#: archive.c:423 builtin/archive.c:89 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:334 +#: archive.c:425 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:335 +#: archive.c:426 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:336 +#: archive.c:427 msgid "store only" msgstr "endast spara" -#: archive.c:337 +#: archive.c:428 msgid "compress faster" msgstr "komprimera snabbare" -#: archive.c:345 +#: archive.c:436 msgid "compress better" msgstr "komprimera bättre" -#: archive.c:348 +#: archive.c:439 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 +#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85 msgid "repo" msgstr "arkiv" -#: archive.c:351 builtin/archive.c:91 +#: archive.c:442 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 +#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490 msgid "command" msgstr "kommando" -#: archive.c:353 builtin/archive.c:93 +#: archive.c:444 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" -#: attr.c:259 +#: attr.c:258 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -184,31 +182,31 @@ msgstr "Grenen %s ställdes in att spåra den lokala referensen %s." msgid "Not tracking: ambiguous information for ref %s" msgstr "Spårar inte: tvetydig information för referensen %s" -#: branch.c:178 +#: branch.c:162 #, c-format msgid "'%s' is not a valid branch name." msgstr "\"%s\" är inte ett giltigt grennamn." -#: branch.c:183 +#: branch.c:167 #, c-format msgid "A branch named '%s' already exists." msgstr "Det finns redan en gren som heter \"%s\"" -#: branch.c:191 +#: branch.c:175 msgid "Cannot force update the current branch." msgstr "Kan inte tvinga uppdatering av aktuell gren." -#: branch.c:211 +#: branch.c:195 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren." -#: branch.c:213 +#: branch.c:197 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte" -#: branch.c:215 +#: branch.c:199 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -228,107 +226,105 @@ msgstr "" "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n" "för att ställa in uppströmskonfigurationen när du sänder in." -#: branch.c:260 +#: branch.c:243 #, c-format msgid "Not a valid object name: '%s'." msgstr "Objektnamnet är inte giltigt: \"%s\"." -#: branch.c:280 +#: branch.c:263 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Objektnamnet är tvetydigt: \"%s\"." -#: branch.c:285 +#: branch.c:268 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: \"%s\"" -#: branch.c:291 -msgid "Failed to lock ref for update" -msgstr "Misslyckades låsa referens för uppdatering" - -#: branch.c:309 -msgid "Failed to write ref" -msgstr "Misslyckades skriva referens" - -#: bundle.c:33 +#: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ser inte ut som en v2-bundle-fil" -#: bundle.c:60 +#: bundle.c:61 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:86 builtin/commit.c:755 +#: bundle.c:87 builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" -#: bundle.c:138 +#: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330 -#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357 +#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706 +#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: bundle.c:184 +#: bundle.c:185 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Paketet (bundlen) innehåller denna referens:" msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:" -#: bundle.c:191 +#: bundle.c:192 msgid "The bundle records a complete history." msgstr "Paketet (bundlen) beskriver en komplett historik." -#: bundle.c:193 +#: bundle.c:194 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Paketet (bundlen) kräver denna referens:" msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" -#: bundle.c:289 +#: bundle.c:251 +msgid "Could not spawn pack-objects" +msgstr "Kunde inte starta pack-objects" + +#: bundle.c:269 +msgid "pack-objects died" +msgstr "pack-objects misslyckades" + +#: bundle.c:309 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261 -#, c-format -msgid "unrecognized argument: %s" -msgstr "okänt argument: %s" - -#: bundle.c:330 +#: bundle.c:358 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:375 +#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#, c-format +msgid "unrecognized argument: %s" +msgstr "okänt argument: %s" + +#: bundle.c:444 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:390 -msgid "Could not spawn pack-objects" -msgstr "Kunde inte starta pack-objects" - -#: bundle.c:408 -msgid "pack-objects died" -msgstr "pack-objects misslyckades" - -#: bundle.c:411 +#: bundle.c:454 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:433 +#: bundle.c:475 msgid "index-pack died" msgstr "index-pack dog" +#: color.c:157 +#, c-format +msgid "invalid color value: %.*s" +msgstr "felaktigt färgvärde: %.*s" + #: commit.c:40 #, c-format msgid "could not parse %s" @@ -343,16 +339,69 @@ msgstr "%s %s är inte en incheckning!" msgid "memory exhausted" msgstr "minnet slut" -#: connected.c:70 +#: config.c:469 config.c:471 +#, c-format +msgid "bad config file line %d in %s" +msgstr "felaktig konfigurationsfil rad %d i %s" + +#: config.c:587 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s" + +#: config.c:589 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" + +#: config.c:674 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "misslyckades expandera användarkatalog i: \"%s\"" + +#: config.c:752 config.c:763 +#, c-format +msgid "bad zlib compression level %d" +msgstr "felaktigt zlib-komprimeringsgrad %d" + +#: config.c:885 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "felaktigt läge för skapande av objekt: %s" + +#: config.c:1201 +msgid "unable to parse command-line config" +msgstr "kan inte tolka kommandoradskonfiguration" + +#: config.c:1262 +msgid "unknown error occured while reading the configuration files" +msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" + +#: config.c:1586 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" + +#: config.c:1588 +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d" + +#: config.c:1647 +#, c-format +msgid "%s has multiple values" +msgstr "%s har flera värden" + +#: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:90 +#: connected.c:89 #, c-format msgid "failed write to rev-list: %s" msgstr "kunde inte skriva till rev-list: %s" -#: connected.c:98 +#: connected.c:97 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "kunde inte stänga rev-list:s standard in: %s" @@ -430,7 +479,7 @@ msgstr[1] "%lu år sedan" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:514 +#: diffcore-rename.c:516 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" @@ -449,7 +498,7 @@ msgstr " Okänd dirstat-parameter \"%s\"\n" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:267 +#: diff.c:266 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -458,16 +507,16 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:2934 +#: diff.c:2957 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3329 +#: diff.c:3352 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3492 +#: diff.c:3515 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -476,44 +525,44 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3506 +#: diff.c:3529 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: gpg-interface.c:73 gpg-interface.c:145 +#: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "kunde inte köra gpg." -#: gpg-interface.c:85 +#: gpg-interface.c:141 msgid "gpg did not accept the data" msgstr "gpg godtog inte data" -#: gpg-interface.c:96 +#: gpg-interface.c:152 msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" -#: gpg-interface.c:129 +#: gpg-interface.c:185 #, c-format msgid "could not create temporary file '%s': %s" msgstr "kunde inte skapa temporära filen \"%s\": %s" -#: gpg-interface.c:132 +#: gpg-interface.c:188 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "misslyckades skriva fristående signatur till \"%s\": %s" -#: grep.c:1703 +#: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1720 +#: grep.c:1735 #, c-format msgid "'%s': %s" msgstr "\"%s\": %s" -#: grep.c:1731 +#: grep.c:1746 #, c-format msgid "'%s': short read %s" msgstr "\"%s\": kort läsning %s" @@ -582,87 +631,95 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: merge.c:40 +#: lockfile.c:275 +msgid "BUG: reopen a lockfile that is still open" +msgstr "FEL: återöppna en låsfil som fortfarande är öppen" + +#: lockfile.c:277 +msgid "BUG: reopen a lockfile that has been committed" +msgstr "FEL: återöppna en låsfil som har överlämnats" + +#: merge.c:41 msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556 -#: builtin/clone.c:661 +#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562 +#: builtin/clone.c:659 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: merge-recursive.c:190 +#: merge-recursive.c:189 #, c-format msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:210 +#: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache misslyckades för sökvägen \"%s\"" -#: merge-recursive.c:271 +#: merge-recursive.c:270 msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:692 +#: merge-recursive.c:691 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:703 +#: merge-recursive.c:702 #, 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:717 merge-recursive.c:738 +#: merge-recursive.c:716 merge-recursive.c:737 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:728 +#: merge-recursive.c:727 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:768 +#: merge-recursive.c:767 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:770 +#: merge-recursive.c:769 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:793 builtin/clone.c:317 +#: merge-recursive.c:792 builtin/clone.c:318 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: merge-recursive.c:801 +#: merge-recursive.c:800 #, c-format msgid "failed to symlink '%s'" msgstr "misslyckades skapa symboliska länken \"%s\"" -#: merge-recursive.c:804 +#: merge-recursive.c:803 #, 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:942 +#: merge-recursive.c:941 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:946 +#: merge-recursive.c:945 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:962 +#: merge-recursive.c:961 msgid "unsupported object type in the tree" msgstr "objekttyp som ej stöds upptäcktes i trädet" -#: merge-recursive.c:1037 merge-recursive.c:1051 +#: merge-recursive.c:1036 merge-recursive.c:1050 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -671,7 +728,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:1043 merge-recursive.c:1056 +#: merge-recursive.c:1042 merge-recursive.c:1055 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -680,20 +737,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:1097 +#: merge-recursive.c:1096 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1097 +#: merge-recursive.c:1096 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1153 +#: merge-recursive.c:1152 #, 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:1175 +#: merge-recursive.c:1174 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -702,144 +759,144 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1180 +#: merge-recursive.c:1179 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1234 +#: merge-recursive.c:1233 #, 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:1264 +#: merge-recursive.c:1263 #, 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:1463 +#: merge-recursive.c:1462 #, 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:1473 +#: merge-recursive.c:1472 #, c-format msgid "Adding merged %s" msgstr "Lägger till sammanslagen %s" -#: merge-recursive.c:1478 merge-recursive.c:1676 +#: merge-recursive.c:1477 merge-recursive.c:1675 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:1529 +#: merge-recursive.c:1528 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:1532 +#: merge-recursive.c:1531 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modify" msgstr "ändra" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:1590 +#: merge-recursive.c:1589 msgid "content" msgstr "innehåll" -#: merge-recursive.c:1597 +#: merge-recursive.c:1596 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:1631 +#: merge-recursive.c:1630 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:1645 +#: merge-recursive.c:1644 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1649 git-submodule.sh:1150 +#: merge-recursive.c:1648 git-submodule.sh:1150 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:1650 +#: merge-recursive.c:1649 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:1740 +#: merge-recursive.c:1735 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:1765 +#: merge-recursive.c:1760 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:1771 +#: merge-recursive.c:1766 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1776 +#: merge-recursive.c:1771 #, 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:1786 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1803 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa." -#: merge-recursive.c:1822 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Redan à jour!" -#: merge-recursive.c:1831 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:1861 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "Obehandlad sökväg??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "hittade %u gemensam förfader:" msgstr[1] "hittade %u gemensamma förfäder:" -#: merge-recursive.c:1956 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2013 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2024 builtin/merge.c:666 +#: merge-recursive.c:2019 builtin/merge.c:666 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -864,33 +921,33 @@ 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:234 +#: object.c:241 #, c-format msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: parse-options.c:534 +#: parse-options.c:546 msgid "..." msgstr "..." -#: parse-options.c:552 +#: parse-options.c:564 #, c-format msgid "usage: %s" msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:556 +#: parse-options.c:568 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:559 +#: parse-options.c:571 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:593 +#: parse-options.c:605 msgid "-NUM" msgstr "-TAL" @@ -959,11 +1016,15 @@ msgstr "" "Ingenting att exkludera från med :(exkludera)-mönster.\n" "Glömde du kanske att antingen lägga till \":/\" eller \".\"?" +#: pretty.c:968 +msgid "unable to parse --pretty format" +msgstr "kunde inte tolka format för --pretty" + #: progress.c:225 msgid "done" msgstr "klart" -#: read-cache.c:1260 +#: read-cache.c:1261 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -972,7 +1033,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1270 +#: read-cache.c:1271 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -981,51 +1042,51 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: remote.c:753 +#: remote.c:782 #, 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:757 +#: remote.c:786 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:761 +#: remote.c:790 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:769 +#: remote.c:798 msgid "Internal error" msgstr "Internt fel" -#: remote.c:1943 +#: remote.c:1968 #, 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:1947 +#: remote.c:1972 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:1950 +#: remote.c:1975 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:1954 +#: remote.c:1979 #, 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:1960 +#: remote.c:1985 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:1963 +#: remote.c:1988 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1035,11 +1096,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:1971 +#: remote.c:1996 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:1974 +#: remote.c:1999 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1054,32 +1115,40 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:1984 +#: remote.c:2009 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" -#: run-command.c:80 +#: run-command.c:87 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:82 +#: run-command.c:89 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) misslyckades" -#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893 -#: builtin/merge.c:1003 builtin/merge.c:1013 +#: send-pack.c:265 +msgid "failed to sign the push certificate" +msgstr "misslyckades underteckna push-certifikatet" + +#: send-pack.c:322 +msgid "the receiving end does not support --signed push" +msgstr "mottagarsidan stöder inte push med --signed" + +#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892 +#: builtin/merge.c:1002 builtin/merge.c:1012 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785 -#: builtin/merge.c:1005 builtin/merge.c:1018 +#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784 +#: builtin/merge.c:1004 builtin/merge.c:1017 #, c-format msgid "Could not write to '%s'" msgstr "Kunde inte skriva till \"%s\"" -#: sequencer.c:194 +#: sequencer.c:195 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1087,7 +1156,7 @@ msgstr "" "efter att ha löst konflikterna, markera de rättade sökvägarna\n" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"" -#: sequencer.c:197 +#: sequencer.c:198 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1097,228 +1166,224 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:210 sequencer.c:841 sequencer.c:924 +#: sequencer.c:211 sequencer.c:852 sequencer.c:935 #, c-format msgid "Could not write to %s" msgstr "Kunde inte skriva till %s" -#: sequencer.c:213 +#: sequencer.c:214 #, c-format msgid "Error wrapping up %s" msgstr "Fel vid ombrytning av %s" -#: sequencer.c:228 +#: sequencer.c:229 msgid "Your local changes would be overwritten by cherry-pick." msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"." -#: sequencer.c:230 +#: sequencer.c:231 msgid "Your local changes would be overwritten by revert." msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"." -#: sequencer.c:233 +#: sequencer.c:234 msgid "Commit your changes or stash them to proceed." msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta." -#: sequencer.c:250 -msgid "Failed to lock HEAD during fast_forward_to" -msgstr "Misslyckades låsa HEAD under \"fast_forward_to\"" - #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:293 +#: sequencer.c:304 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:324 +#: sequencer.c:335 msgid "Could not resolve HEAD commit\n" msgstr "Kunde inte bestämma HEAD:s incheckning\n" -#: sequencer.c:344 +#: sequencer.c:355 msgid "Unable to update cache tree\n" msgstr "Kan inte uppdatera cacheträd\n" -#: sequencer.c:391 +#: sequencer.c:402 #, c-format msgid "Could not parse commit %s\n" msgstr "Kunde inte tolka incheckningen %s\n" -#: sequencer.c:396 +#: sequencer.c:407 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:462 +#: sequencer.c:473 msgid "Your index file is unmerged." msgstr "Din indexfil har inte slagits ihop." -#: sequencer.c:481 +#: sequencer.c:492 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte." -#: sequencer.c:489 +#: sequencer.c:500 #, c-format msgid "Commit %s does not have parent %d" msgstr "Incheckning %s har inte förälder %d" -#: sequencer.c:493 +#: sequencer.c:504 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:506 +#: sequencer.c:517 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:510 +#: sequencer.c:521 #, c-format msgid "Cannot get commit message for %s" msgstr "Kan inte hämta incheckningsmeddelande för %s" -#: sequencer.c:596 +#: sequencer.c:607 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:597 +#: sequencer.c:608 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:633 +#: sequencer.c:644 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:641 +#: sequencer.c:652 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:645 +#: sequencer.c:656 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:705 +#: sequencer.c:716 #, c-format msgid "Cannot %s during a %s" msgstr "kan inte %s under en %s" -#: sequencer.c:727 +#: sequencer.c:738 #, c-format msgid "Could not parse line %d." msgstr "Kan inte tolka rad %d." -#: sequencer.c:732 +#: sequencer.c:743 msgid "No commits parsed." msgstr "Inga incheckningar lästes." -#: sequencer.c:745 +#: sequencer.c:756 #, c-format msgid "Could not open %s" msgstr "Kunde inte öppna %s" -#: sequencer.c:749 +#: sequencer.c:760 #, c-format msgid "Could not read %s." msgstr "kunde inte läsa %s." -#: sequencer.c:756 +#: sequencer.c:767 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Oanvändbart manus: %s" -#: sequencer.c:786 +#: sequencer.c:797 #, c-format msgid "Invalid key: %s" msgstr "Felaktig nyckel: %s" -#: sequencer.c:789 +#: sequencer.c:800 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt värde för %s: %s" -#: sequencer.c:801 +#: sequencer.c:812 #, c-format msgid "Malformed options sheet: %s" msgstr "Trasigt manus: %s" -#: sequencer.c:822 +#: sequencer.c:833 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:823 +#: sequencer.c:834 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:827 +#: sequencer.c:838 #, c-format msgid "Could not create sequencer directory %s" msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:843 sequencer.c:928 +#: sequencer.c:854 sequencer.c:939 #, c-format msgid "Error wrapping up %s." msgstr "Fel vid ombrytning av %s." -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:873 sequencer.c:1009 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:864 +#: sequencer.c:875 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:866 +#: sequencer.c:877 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:888 builtin/apply.c:4062 +#: sequencer.c:899 builtin/apply.c:4128 #, c-format msgid "cannot open %s: %s" msgstr "kan inte öppna %s: %s" -#: sequencer.c:891 +#: sequencer.c:902 #, c-format msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: sequencer.c:892 +#: sequencer.c:903 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:898 +#: sequencer.c:909 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig" -#: sequencer.c:921 +#: sequencer.c:932 #, c-format msgid "Could not format %s." msgstr "Kunde inte formatera %s." -#: sequencer.c:1066 +#: sequencer.c:1077 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:1069 +#: sequencer.c:1080 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:1103 +#: sequencer.c:1114 msgid "Can't revert as initial commit" msgstr "Kan inte ångra som första incheckning" -#: sequencer.c:1104 +#: sequencer.c:1115 msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" -#: sha1_name.c:439 +#: sha1_name.c:440 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" @@ -1340,21 +1405,21 @@ 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:1060 +#: sha1_name.c:1068 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: sha1_name.c:1063 +#: sha1_name.c:1071 #, c-format msgid "No such branch: '%s'" msgstr "Okänd gren: \"%s\"" -#: sha1_name.c:1065 +#: 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:1069 +#: 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" @@ -1384,16 +1449,41 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s" msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:1118 builtin/init-db.c:363 +#: submodule.c:1111 builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "Kunde inte skapa gitlänk %s" -#: submodule.c:1129 +#: submodule.c:1122 #, c-format msgid "Could not set core.worktree in %s" msgstr "Kunde inte sätta core.worktree i %s" +#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565 +#: trailer.c:569 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "okänt värde \"%s\" för nyckeln \"%s\"" + +#: trailer.c:551 trailer.c:556 builtin/remote.c:288 +#, c-format +msgid "more than one %s" +msgstr "mer än en %s" + +#: trailer.c:589 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "tom släpradssymbol i släpraden \"%.*s\"" + +#: trailer.c:709 +#, c-format +msgid "could not read input file '%s'" +msgstr "kunde inte läsa indatafilen \"%s\"" + +#: trailer.c:712 +msgid "could not read from stdin" +msgstr "Kunde inte läsa från standard in" + #: unpack-trees.c:202 msgid "Checking out files" msgstr "Checkar ut filer" @@ -1427,25 +1517,29 @@ msgstr "felaktigt portnummer" msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sökvägssegment" -#: wrapper.c:460 +#: wrapper.c:509 #, c-format msgid "unable to access '%s': %s" msgstr "kan inte komma åt \"%s\": %s" -#: wrapper.c:481 +#: wrapper.c:530 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma åt \"%s\"" -#: wrapper.c:492 +#: wrapper.c:541 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "kan inte slå upp aktuell användare i passwd-filen: %s" -#: wrapper.c:493 +#: wrapper.c:542 msgid "no such user" msgstr "okänd användare" +#: wrapper.c:550 +msgid "unable to get current working directory" +msgstr "kan inte hämta aktuell arbetskatalog" + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" @@ -1589,15 +1683,15 @@ msgstr "ospårat innehåll, " msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:764 +#: wt-status.c:761 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:766 +#: wt-status.c:763 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:845 +#: wt-status.c:842 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1605,68 +1699,68 @@ msgstr "" "Rör inte raden ovan.\n" "Allt nedan kommer tas bort." -#: wt-status.c:936 +#: wt-status.c:933 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:939 +#: wt-status.c:936 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:942 +#: wt-status.c:939 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:945 +#: wt-status.c:942 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:955 +#: wt-status.c:952 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:958 +#: wt-status.c:955 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:962 +#: wt-status.c:959 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:964 +#: wt-status.c:961 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:966 +#: wt-status.c:963 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:1026 wt-status.c:1043 +#: wt-status.c:1023 wt-status.c:1040 #, 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:1031 wt-status.c:1048 +#: wt-status.c:1028 wt-status.c:1045 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1034 +#: wt-status.c:1031 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1036 +#: wt-status.c:1033 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1038 +#: wt-status.c:1035 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:1051 +#: wt-status.c:1048 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1055 +#: wt-status.c:1052 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1674,118 +1768,118 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1060 +#: wt-status.c:1057 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:1063 +#: wt-status.c:1060 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:1067 +#: wt-status.c:1064 #, 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:1072 +#: wt-status.c:1069 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:1075 +#: wt-status.c:1072 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:1077 +#: wt-status.c:1074 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:1087 +#: wt-status.c:1084 #, 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:1092 +#: wt-status.c:1089 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1095 +#: wt-status.c:1092 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1097 +#: wt-status.c:1094 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:1106 +#: wt-status.c:1103 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1111 +#: wt-status.c:1108 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1114 +#: wt-status.c:1111 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1116 +#: wt-status.c:1113 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1127 +#: wt-status.c:1124 #, 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:1131 +#: wt-status.c:1128 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1134 +#: wt-status.c:1131 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:1309 +#: wt-status.c:1306 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1316 +#: wt-status.c:1313 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå" -#: wt-status.c:1323 +#: wt-status.c:1320 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1325 +#: wt-status.c:1322 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1328 +#: wt-status.c:1325 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1345 +#: wt-status.c:1342 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1359 +#: wt-status.c:1356 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1361 +#: wt-status.c:1358 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1365 +#: wt-status.c:1362 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1797,32 +1891,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1371 +#: wt-status.c:1368 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1373 +#: wt-status.c:1370 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1379 +#: wt-status.c:1376 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1384 +#: wt-status.c:1381 #, 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:1387 +#: wt-status.c:1384 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1390 +#: wt-status.c:1387 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1831,93 +1925,93 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1393 +#: wt-status.c:1390 #, 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:1396 +#: wt-status.c:1393 #, 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:1399 wt-status.c:1404 +#: wt-status.c:1396 wt-status.c:1401 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1402 +#: wt-status.c:1399 #, 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:1406 +#: wt-status.c:1403 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1515 +#: wt-status.c:1512 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1521 +#: wt-status.c:1518 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1553 +#: wt-status.c:1550 msgid "gone" msgstr "försvunnen" -#: wt-status.c:1555 wt-status.c:1563 +#: wt-status.c:1552 wt-status.c:1560 msgid "behind " msgstr "efter " -#: compat/precompose_utf8.c:55 builtin/clone.c:356 +#: compat/precompose_utf8.c:55 builtin/clone.c:357 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" -#: builtin/add.c:21 +#: builtin/add.c:22 msgid "git add [options] [--] <pathspec>..." msgstr "git add [flaggor] [--] <sökväg>..." -#: builtin/add.c:64 +#: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:69 builtin/commit.c:261 +#: builtin/add.c:70 builtin/commit.c:275 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:79 +#: builtin/add.c:80 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:133 +#: builtin/add.c:134 msgid "Unstaged changes after refreshing the index:" msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:193 builtin/rev-parse.c:781 +#: builtin/add.c:194 builtin/rev-parse.c:785 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:204 +#: builtin/add.c:205 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning" -#: builtin/add.c:208 +#: builtin/add.c:209 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:213 +#: builtin/add.c:214 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:215 +#: builtin/add.c:216 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." @@ -1930,15 +2024,15 @@ msgstr "Kunde inte tillämpa \"%s\"" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70 -#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375 #: builtin/rm.c:269 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19 -#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606 -#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113 +#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 +#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "var pratsam" @@ -1946,7 +2040,7 @@ msgstr "var pratsam" msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286 msgid "select hunks interactively" msgstr "välj stycken interaktivt" @@ -2018,74 +2112,74 @@ 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:919 -#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: builtin/apply.c:57 +#: builtin/apply.c:58 msgid "git apply [options] [<patch>...]" msgstr "git apply [flaggor] [<patch>...]" -#: builtin/apply.c:110 +#: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" -#: builtin/apply.c:125 +#: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: builtin/apply.c:825 +#: builtin/apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: builtin/apply.c:834 +#: builtin/apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: builtin/apply.c:915 +#: builtin/apply.c:916 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: builtin/apply.c:947 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" -#: builtin/apply.c:951 +#: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" -#: builtin/apply.c:952 +#: builtin/apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" -#: builtin/apply.c:959 +#: builtin/apply.c:960 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" -#: builtin/apply.c:1422 +#: builtin/apply.c:1423 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: builtin/apply.c:1479 +#: builtin/apply.c:1480 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: builtin/apply.c:1496 +#: builtin/apply.c:1497 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2101,77 +2195,77 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1656 +#: builtin/apply.c:1657 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: builtin/apply.c:1658 +#: builtin/apply.c:1659 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: builtin/apply.c:1684 +#: builtin/apply.c:1685 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: builtin/apply.c:1720 +#: builtin/apply.c:1721 #, 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:1723 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: builtin/apply.c:1725 +#: builtin/apply.c:1726 #, 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:1872 #, 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:1901 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: builtin/apply.c:1986 +#: builtin/apply.c:2052 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: builtin/apply.c:2076 +#: builtin/apply.c:2142 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/apply.c:2080 +#: builtin/apply.c:2146 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: builtin/apply.c:2688 +#: builtin/apply.c:2754 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: builtin/apply.c:2806 +#: builtin/apply.c:2872 #, 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:2818 +#: builtin/apply.c:2884 #, 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:2824 +#: builtin/apply.c:2890 #, c-format msgid "" "while searching for:\n" @@ -2180,317 +2274,317 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: builtin/apply.c:2843 +#: builtin/apply.c:2909 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: builtin/apply.c:2944 +#: builtin/apply.c:3010 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: builtin/apply.c:2950 +#: builtin/apply.c:3016 #, 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:2971 +#: builtin/apply.c:3037 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3095 +#: builtin/apply.c:3161 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 +#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 #, c-format msgid "read of %s failed" msgstr "misslyckades läsa %s" -#: builtin/apply.c:3174 builtin/apply.c:3396 +#: builtin/apply.c:3240 builtin/apply.c:3462 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: builtin/apply.c:3255 builtin/apply.c:3410 +#: builtin/apply.c:3321 builtin/apply.c:3476 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 +#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3264 builtin/apply.c:3418 +#: builtin/apply.c:3330 builtin/apply.c:3484 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3366 +#: builtin/apply.c:3432 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: builtin/apply.c:3435 +#: builtin/apply.c:3501 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3437 +#: builtin/apply.c:3503 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: builtin/apply.c:3538 +#: builtin/apply.c:3604 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3541 +#: builtin/apply.c:3607 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: builtin/apply.c:3561 +#: builtin/apply.c:3627 #, 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:3566 +#: builtin/apply.c:3632 #, 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:3574 +#: builtin/apply.c:3640 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: builtin/apply.c:3587 +#: builtin/apply.c:3653 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134 +#: builtin/apply.c:3746 builtin/checkout.c:213 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:3823 +#: builtin/apply.c:3889 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: builtin/apply.c:3852 +#: builtin/apply.c:3918 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: builtin/apply.c:3856 +#: builtin/apply.c:3922 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: builtin/apply.c:3861 +#: builtin/apply.c:3927 #, 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:3864 builtin/apply.c:3972 +#: builtin/apply.c:3930 builtin/apply.c:4038 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: builtin/apply.c:3897 +#: builtin/apply.c:3963 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: builtin/apply.c:3946 +#: builtin/apply.c:4012 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: builtin/apply.c:4033 +#: builtin/apply.c:4099 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: builtin/apply.c:4041 +#: builtin/apply.c:4107 msgid "internal error" msgstr "internt fel" -#: builtin/apply.c:4044 +#: builtin/apply.c:4110 #, 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:4054 +#: builtin/apply.c:4120 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:4075 +#: builtin/apply.c:4141 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: builtin/apply.c:4078 +#: builtin/apply.c:4144 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:4228 +#: builtin/apply.c:4234 msgid "unrecognized input" msgstr "indata känns inte igen" -#: builtin/apply.c:4239 +#: builtin/apply.c:4245 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91 #: builtin/fetch.c:93 msgid "path" msgstr "sökväg" -#: builtin/apply.c:4359 +#: builtin/apply.c:4363 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: builtin/apply.c:4362 +#: builtin/apply.c:4366 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: builtin/apply.c:4364 +#: builtin/apply.c:4368 msgid "num" msgstr "antal" -#: builtin/apply.c:4365 +#: builtin/apply.c:4369 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:4368 +#: builtin/apply.c:4372 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: builtin/apply.c:4370 +#: builtin/apply.c:4374 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:4374 +#: builtin/apply.c:4378 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:4376 +#: builtin/apply.c:4380 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:4378 +#: builtin/apply.c:4382 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:4380 +#: builtin/apply.c:4384 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:4382 +#: builtin/apply.c:4386 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: builtin/apply.c:4384 +#: builtin/apply.c:4388 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: builtin/apply.c:4386 +#: builtin/apply.c:4390 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:4388 +#: builtin/apply.c:4392 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: builtin/apply.c:4393 +#: builtin/apply.c:4397 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: builtin/apply.c:4394 +#: builtin/apply.c:4398 msgid "action" msgstr "åtgärd" -#: builtin/apply.c:4395 +#: builtin/apply.c:4399 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: builtin/apply.c:4398 builtin/apply.c:4401 +#: builtin/apply.c:4402 builtin/apply.c:4405 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: builtin/apply.c:4404 +#: builtin/apply.c:4408 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: builtin/apply.c:4406 +#: builtin/apply.c:4410 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: builtin/apply.c:4408 +#: builtin/apply.c:4412 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4410 +#: builtin/apply.c:4414 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: builtin/apply.c:4413 +#: builtin/apply.c:4417 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4416 +#: builtin/apply.c:4420 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: builtin/apply.c:4418 +#: builtin/apply.c:4422 msgid "root" msgstr "rot" -#: builtin/apply.c:4419 +#: builtin/apply.c:4423 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: builtin/apply.c:4441 +#: builtin/apply.c:4445 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: builtin/apply.c:4449 +#: builtin/apply.c:4453 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: builtin/apply.c:4452 +#: builtin/apply.c:4456 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: builtin/apply.c:4468 +#: builtin/apply.c:4472 #, c-format msgid "can't open patch '%s'" msgstr "kan inte öppna patchen \"%s\"" -#: builtin/apply.c:4482 +#: builtin/apply.c:4486 #, 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:4488 builtin/apply.c:4498 +#: builtin/apply.c:4492 builtin/apply.c:4502 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2650,7 +2744,7 @@ msgstr "Behandla endast radintervallet n,m, med början på 1" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2599 +#: builtin/blame.c:2602 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" @@ -2670,7 +2764,7 @@ msgstr "git branch [flaggor] [-r] (-d | -D) <grennamn>..." msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "git branch [flaggor] (-m | -M) [<gammal_gren>] <ny_gren>" -#: builtin/branch.c:150 +#: builtin/branch.c:152 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2679,7 +2773,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:154 +#: builtin/branch.c:156 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2688,12 +2782,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:168 +#: builtin/branch.c:170 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:172 +#: builtin/branch.c:174 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2702,343 +2796,343 @@ 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:185 +#: builtin/branch.c:187 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:213 +#: builtin/branch.c:215 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:219 +#: builtin/branch.c:221 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:227 +#: builtin/branch.c:229 #, 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:240 +#: builtin/branch.c:245 #, c-format msgid "remote branch '%s' not found." msgstr "fjärrgrenen \"%s\" hittades inte." -#: builtin/branch.c:241 +#: builtin/branch.c:246 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:255 +#: builtin/branch.c:260 #, c-format msgid "Error deleting remote branch '%s'" msgstr "Fel vid borttagning av fjärrgrenen \"%s\"" -#: builtin/branch.c:256 +#: builtin/branch.c:261 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:263 +#: builtin/branch.c:268 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "Tog bort fjärrgrenen %s (var %s).\n" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:366 +#: builtin/branch.c:370 #, c-format msgid "branch '%s' does not point at a commit" msgstr "grenen \"%s\" pekar inte på en incheckning" -#: builtin/branch.c:454 +#: builtin/branch.c:459 #, c-format msgid "[%s: gone]" msgstr "[%s: försvunnen]" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:464 +#: builtin/branch.c:469 #, c-format msgid "[%s: behind %d]" msgstr "[%s: bakom %d] " -#: builtin/branch.c:466 +#: builtin/branch.c:471 #, c-format msgid "[behind %d]" msgstr "[bakom %d] " -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: före %d] " -#: builtin/branch.c:472 +#: builtin/branch.c:477 #, c-format msgid "[ahead %d]" msgstr "[före %d] " -#: builtin/branch.c:475 +#: builtin/branch.c:480 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: före %d, bakom %d] " -#: builtin/branch.c:478 +#: builtin/branch.c:483 #, c-format msgid "[ahead %d, behind %d]" msgstr "[före %d, bakom %d] " -#: builtin/branch.c:502 +#: builtin/branch.c:496 msgid " **** invalid ref ****" msgstr " **** ogiltig ref ****" -#: builtin/branch.c:594 +#: builtin/branch.c:587 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: builtin/branch.c:597 +#: builtin/branch.c:590 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" -#: builtin/branch.c:600 +#: builtin/branch.c:593 #, c-format msgid "(detached from %s)" msgstr "(frånkopplad från %s)" -#: builtin/branch.c:603 +#: builtin/branch.c:596 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:649 +#: builtin/branch.c:643 #, c-format msgid "object '%s' does not point to a commit" msgstr "objektet \"%s\" pekar på en incheckning" -#: builtin/branch.c:681 +#: builtin/branch.c:691 msgid "some refs could not be read" msgstr "vissa referenser kunde inte läsas" -#: builtin/branch.c:694 +#: builtin/branch.c:704 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:704 +#: builtin/branch.c:714 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:719 +#: builtin/branch.c:729 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:727 +#: builtin/branch.c:737 #, 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:734 +#: builtin/branch.c:744 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:749 +#: builtin/branch.c:759 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: builtin/branch.c:773 +#: builtin/branch.c:783 #, c-format msgid "could not write branch description template: %s" msgstr "kunde inte skriva grenbeskrivningsmall: %s" -#: builtin/branch.c:803 +#: builtin/branch.c:813 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:805 +#: builtin/branch.c:815 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:806 +#: builtin/branch.c:816 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:807 +#: builtin/branch.c:817 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:809 +#: builtin/branch.c:819 msgid "change upstream info" msgstr "ändra uppströmsinformation" -#: builtin/branch.c:813 +#: builtin/branch.c:823 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:814 +#: builtin/branch.c:824 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 -#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574 -#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615 -#: builtin/tag.c:621 +#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 +#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623 +#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616 +#: builtin/tag.c:622 msgid "commit" msgstr "incheckning" -#: builtin/branch.c:818 builtin/branch.c:824 +#: builtin/branch.c:828 builtin/branch.c:834 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:830 +#: builtin/branch.c:840 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:831 +#: builtin/branch.c:841 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:833 +#: builtin/branch.c:843 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:834 +#: builtin/branch.c:844 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:835 +#: builtin/branch.c:845 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:836 +#: builtin/branch.c:846 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:837 +#: builtin/branch.c:847 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:838 +#: builtin/branch.c:848 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:840 +#: builtin/branch.c:850 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:841 +#: builtin/branch.c:851 msgid "force creation (when already exists)" msgstr "tvinga skapande (när den redan finns)" -#: builtin/branch.c:844 +#: builtin/branch.c:854 msgid "print only not merged branches" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:850 +#: builtin/branch.c:860 msgid "print only merged branches" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:854 +#: builtin/branch.c:864 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:867 +#: builtin/branch.c:877 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:872 builtin/clone.c:636 +#: builtin/branch.c:881 builtin/clone.c:634 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:896 +#: builtin/branch.c:903 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:902 builtin/branch.c:941 +#: builtin/branch.c:909 builtin/branch.c:948 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:917 +#: builtin/branch.c:924 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:922 +#: builtin/branch.c:929 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:929 +#: builtin/branch.c:936 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu" -#: builtin/branch.c:932 +#: builtin/branch.c:939 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:947 +#: builtin/branch.c:954 msgid "too many branches for a rename operation" msgstr "för många grenar för namnbyte" -#: builtin/branch.c:952 +#: builtin/branch.c:959 msgid "too many branches to set new upstream" msgstr "för många grenar för att byta uppström" -#: builtin/branch.c:956 +#: builtin/branch.c:963 #, 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:959 builtin/branch.c:981 builtin/branch.c:1002 +#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:963 +#: builtin/branch.c:970 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:975 +#: builtin/branch.c:982 msgid "too many branches to unset upstream" msgstr "för många grenar för att ta bort uppström" -#: builtin/branch.c:979 +#: builtin/branch.c:986 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:985 +#: builtin/branch.c:992 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:999 +#: builtin/branch.c:1006 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:1005 +#: builtin/branch.c:1012 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:1008 +#: builtin/branch.c:1015 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3047,7 +3141,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:1025 +#: builtin/branch.c:1032 #, c-format msgid "" "\n" @@ -3058,12 +3152,12 @@ msgstr "" "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" "\n" -#: builtin/branch.c:1026 +#: builtin/branch.c:1033 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1027 +#: builtin/branch.c:1034 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3081,43 +3175,43 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:331 +#: builtin/cat-file.c:332 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:332 +#: builtin/cat-file.c:333 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <objektlista>" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:370 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:371 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:372 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:374 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:374 +#: builtin/cat-file.c:375 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:377 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:378 +#: builtin/cat-file.c:379 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:381 +#: builtin/cat-file.c:382 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" @@ -3137,7 +3231,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:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "läs filnamn från standard in" @@ -3145,7 +3239,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:1083 builtin/gc.c:285 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -3309,46 +3403,46 @@ msgstr "sökvägen \"%s\" har inte slagits ihop" msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:591 +#: builtin/checkout.c:597 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Kan inte skapa referenslog för \"%s\"\n" -#: builtin/checkout.c:629 +#: builtin/checkout.c:635 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:636 +#: builtin/checkout.c:642 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:639 +#: builtin/checkout.c:645 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:643 +#: builtin/checkout.c:649 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:645 builtin/checkout.c:1026 +#: builtin/checkout.c:651 builtin/checkout.c:1032 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:647 +#: builtin/checkout.c:653 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:699 +#: builtin/checkout.c:705 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:705 +#: builtin/checkout.c:711 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3371,7 +3465,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:723 +#: builtin/checkout.c:729 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3386,139 +3480,139 @@ msgstr "" " git branch nytt_grennamn %s\n" "\n" -#: builtin/checkout.c:753 +#: builtin/checkout.c:759 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:757 +#: builtin/checkout.c:763 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:784 builtin/checkout.c:1021 +#: builtin/checkout.c:790 builtin/checkout.c:1027 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:928 +#: builtin/checkout.c:934 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:967 +#: builtin/checkout.c:973 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1002 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1041 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1038 builtin/checkout.c:1042 +#: builtin/checkout.c:1044 builtin/checkout.c:1048 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054 -#: builtin/checkout.c:1057 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 +#: builtin/checkout.c:1063 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1068 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1085 +#: builtin/checkout.c:1091 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1087 +#: builtin/checkout.c:1093 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1088 +#: builtin/checkout.c:1094 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1089 +#: builtin/checkout.c:1095 msgid "detach the HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1096 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1099 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1101 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1097 +#: builtin/checkout.c:1103 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1104 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:1099 builtin/merge.c:225 +#: builtin/checkout.c:1105 builtin/merge.c:226 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245 +#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245 msgid "style" msgstr "stil" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1107 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1110 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1112 msgid "second guess 'git checkout no-such-branch'" msgstr "förutspå \"git checkout gren-saknas\"" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1135 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1152 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1157 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1194 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1201 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3527,12 +3621,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:1202 +#: builtin/checkout.c:1206 #, 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:1206 +#: builtin/checkout.c:1210 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3684,7 +3778,7 @@ msgstr "städa interaktivt" msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714 +#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "mönster" @@ -3721,145 +3815,145 @@ msgstr "" "clean.requireForce har standardvärdet true och varken -i, -n eller -f " "angavs; vägrar städa" -#: builtin/clone.c:36 +#: builtin/clone.c:37 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [flaggor] [--] <arkiv> [<kat>]" -#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222 -#: builtin/push.c:503 +#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223 +#: builtin/push.c:514 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/clone.c:66 +#: builtin/clone.c:67 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:71 +#: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:73 +#: builtin/clone.c:74 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:75 +#: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:77 +#: builtin/clone.c:78 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:79 builtin/clone.c:81 +#: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:82 builtin/init-db.c:483 +#: builtin/clone.c:83 builtin/init-db.c:485 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:83 builtin/init-db.c:484 +#: builtin/clone.c:84 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:85 +#: builtin/clone.c:86 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "namn" -#: builtin/clone.c:87 +#: builtin/clone.c:88 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:89 +#: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659 msgid "depth" msgstr "djup" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:95 +#: builtin/clone.c:96 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:96 builtin/init-db.c:492 +#: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:97 builtin/init-db.c:493 +#: builtin/clone.c:98 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:252 +#: builtin/clone.c:253 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: builtin/clone.c:256 +#: builtin/clone.c:257 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: builtin/clone.c:259 +#: builtin/clone.c:260 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: builtin/clone.c:321 +#: builtin/clone.c:322 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/clone.c:323 builtin/diff.c:83 +#: builtin/clone.c:324 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:339 +#: builtin/clone.c:340 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:361 +#: builtin/clone.c:362 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:365 +#: builtin/clone.c:366 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:388 builtin/clone.c:565 +#: builtin/clone.c:389 builtin/clone.c:563 #, c-format msgid "done.\n" msgstr "klart.\n" @@ -3874,109 +3968,111 @@ 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:480 +#: builtin/clone.c:478 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:560 +# Vague original, not networking-related, but rather related to the actual +# objects in the database. +#: builtin/clone.c:558 #, c-format msgid "Checking connectivity... " -msgstr "Kontrollerar anslutning..." +msgstr "Kontrollerar konnektivitet..." -#: builtin/clone.c:563 +#: builtin/clone.c:561 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: builtin/clone.c:627 +#: builtin/clone.c:625 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:658 +#: builtin/clone.c:656 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:768 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:772 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:783 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:786 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:799 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:805 builtin/fetch.c:1143 +#: builtin/clone.c:802 builtin/fetch.c:1155 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:815 +#: builtin/clone.c:812 #, 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:825 +#: builtin/clone.c:822 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:838 builtin/clone.c:850 +#: builtin/clone.c:835 builtin/clone.c:847 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:841 +#: builtin/clone.c:838 #, c-format msgid "could not create work tree dir '%s'." msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:860 +#: builtin/clone.c:857 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:862 +#: builtin/clone.c:859 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:898 +#: builtin/clone.c:895 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:901 +#: builtin/clone.c:898 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:906 +#: builtin/clone.c:903 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:910 +#: builtin/clone.c:907 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:961 builtin/clone.c:969 +#: builtin/clone.c:958 builtin/clone.c:966 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:972 +#: builtin/clone.c:969 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -4012,15 +4108,42 @@ msgstr "Spaltfyllnad mellan spalter" msgid "--command must be the first argument" msgstr "--command måste vara första argument" -#: builtin/commit.c:36 +#: builtin/commit.c:37 msgid "git commit [options] [--] <pathspec>..." msgstr "git commit [flaggor] [--] <sökväg>..." -#: builtin/commit.c:41 +#: builtin/commit.c:42 msgid "git status [options] [--] <pathspec>..." msgstr "git status [flaggor] [--] <sökväg>..." -#: builtin/commit.c:46 +#: builtin/commit.c:47 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n" +"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n" +"kan förhindra det här meddelandet genom att ställa dem explicit.\n" +"Kör följande kommandon och följ instruktionerna i textredigeraren\n" +"för att redigera din konfigurationsfil:\n" +"\n" +" git config --global --edit\n" +"\n" +"När du gjort det kan du rätta identiteten som användes för den här\n" +"incheckningen med:\n" +"\n" +" git commit --amend --reset-author\n" + +#: builtin/commit.c:60 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4045,7 +4168,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:58 +#: builtin/commit.c:72 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -4055,7 +4178,7 @@ msgstr "" "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n" "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n" -#: builtin/commit.c:63 +#: builtin/commit.c:77 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4069,11 +4192,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:70 +#: builtin/commit.c:84 msgid "Otherwise, please use 'git reset'\n" msgstr "Använd annars \"git reset\"\n" -#: builtin/commit.c:73 +#: builtin/commit.c:87 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4089,58 +4212,75 @@ msgstr "" "\"git cherry-pick --continue\" kommer därefter att återuppta\n" "cherry-pick för återstående incheckningar.\n" -#: builtin/commit.c:288 +#: builtin/commit.c:302 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:328 +#: builtin/commit.c:342 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:334 +#: builtin/commit.c:348 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435 +#: builtin/commit.c:359 +msgid "unable to write index file" +msgstr "kan inte skriva indexfil" + +#: builtin/commit.c:361 +msgid "unable to update temporary index" +msgstr "kan inte uppdatera temporärt index" + +#: builtin/commit.c:363 +msgid "Failed to update main cache tree" +msgstr "Misslyckades uppdatera huvud-cacheträdet" + +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:418 +#: builtin/commit.c:443 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:420 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a cherry-pick." msgstr "kan inte utföra en delvis incheckning under en cherry-pick." -#: builtin/commit.c:429 +#: builtin/commit.c:454 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:447 +#: builtin/commit.c:473 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:557 builtin/commit.c:563 +#: builtin/commit.c:592 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "incheckningen \"%s\" saknar författarhuvud" + +#: builtin/commit.c:594 #, c-format -msgid "invalid commit: %s" -msgstr "felaktig incheckning: %s" +msgid "commit '%s' has malformed author line" +msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:585 +#: builtin/commit.c:613 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:592 +#: builtin/commit.c:621 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: builtin/commit.c:609 +#: builtin/commit.c:642 #, c-format msgid "Malformed ident string: '%s'" msgstr "Felaktig indragningssträng: \"%s\"" -#: builtin/commit.c:642 +#: builtin/commit.c:675 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4148,43 +4288,43 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086 +#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:691 builtin/shortlog.c:273 +#: builtin/commit.c:724 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:693 +#: builtin/commit.c:726 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:697 +#: builtin/commit.c:730 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:719 +#: builtin/commit.c:752 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:723 +#: builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:727 +#: builtin/commit.c:760 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/commit.c:798 +#: builtin/commit.c:831 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:816 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -4199,7 +4339,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -4214,7 +4354,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:834 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4224,7 +4364,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:841 +#: builtin/commit.c:874 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4235,144 +4375,144 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:888 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:863 +#: builtin/commit.c:896 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:870 +#: builtin/commit.c:903 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:888 +#: builtin/commit.c:921 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:945 +#: builtin/commit.c:978 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:960 builtin/tag.c:495 +#: builtin/commit.c:993 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1061 +#: builtin/commit.c:1095 #, c-format msgid "No existing author found with '%s'" msgstr "Hittade ingen befintlig författare med \"%s\"" -#: builtin/commit.c:1076 builtin/commit.c:1316 +#: builtin/commit.c:1110 builtin/commit.c:1350 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1113 +#: builtin/commit.c:1147 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1143 +#: builtin/commit.c:1177 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:1152 +#: builtin/commit.c:1186 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1155 +#: builtin/commit.c:1189 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1157 +#: builtin/commit.c:1191 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1160 +#: builtin/commit.c:1194 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1170 +#: builtin/commit.c:1204 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1172 +#: builtin/commit.c:1206 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup." -#: builtin/commit.c:1180 +#: builtin/commit.c:1214 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:1197 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1199 +#: builtin/commit.c:1233 msgid "No paths with --include/--only does not make sense." msgstr "Du måste ange sökvägar tillsammans med --include/--only." -#: builtin/commit.c:1201 +#: builtin/commit.c:1235 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1203 +#: builtin/commit.c:1237 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..." -#: builtin/commit.c:1215 builtin/tag.c:727 +#: builtin/commit.c:1249 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1220 +#: builtin/commit.c:1254 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1330 builtin/commit.c:1595 +#: builtin/commit.c:1364 builtin/commit.c:1644 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1332 builtin/commit.c:1597 +#: builtin/commit.c:1366 builtin/commit.c:1646 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489 +#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1337 builtin/commit.c:1601 +#: builtin/commit.c:1371 builtin/commit.c:1650 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1340 builtin/commit.c:1604 +#: builtin/commit.c:1374 builtin/commit.c:1653 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703 -#: builtin/fast-export.c:706 builtin/tag.c:602 +#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980 +#: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "läge" -#: builtin/commit.c:1343 builtin/commit.c:1607 +#: builtin/commit.c:1377 builtin/commit.c:1656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)" -#: builtin/commit.c:1346 +#: builtin/commit.c:1380 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1347 parse-options.h:153 +#: builtin/commit.c:1381 parse-options.h:153 msgid "when" msgstr "när" -#: builtin/commit.c:1348 +#: builtin/commit.c:1382 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4380,220 +4520,212 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1350 +#: builtin/commit.c:1384 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1419 +#: builtin/commit.c:1471 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1421 +#: builtin/commit.c:1473 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1469 +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1471 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1565 +#: builtin/commit.c:1614 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1566 +#: builtin/commit.c:1615 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1568 +#: builtin/commit.c:1617 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1569 builtin/tag.c:600 +#: builtin/commit.c:1618 builtin/tag.c:601 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "author" msgstr "författare" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1571 builtin/gc.c:286 +#: builtin/commit.c:1620 builtin/gc.c:275 msgid "date" msgstr "datum" -#: builtin/commit.c:1571 +#: builtin/commit.c:1620 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409 -#: builtin/notes.c:566 builtin/tag.c:598 +#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/tag.c:599 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1572 +#: builtin/commit.c:1621 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1573 +#: builtin/commit.c:1622 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1574 +#: builtin/commit.c:1623 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1575 +#: builtin/commit.c:1624 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1576 +#: builtin/commit.c:1625 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:1577 +#: builtin/commit.c:1626 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:1578 builtin/log.c:1188 builtin/revert.c:86 +#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1579 +#: builtin/commit.c:1628 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1580 +#: builtin/commit.c:1629 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1581 +#: builtin/commit.c:1630 msgid "default" msgstr "standard" -#: builtin/commit.c:1581 builtin/tag.c:603 +#: builtin/commit.c:1630 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:1582 +#: builtin/commit.c:1631 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92 -#: builtin/tag.c:604 +#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92 +#: builtin/tag.c:605 msgid "key-id" msgstr "nyckel-id" -#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93 +#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1587 +#: builtin/commit.c:1636 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1588 +#: builtin/commit.c:1637 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1589 +#: builtin/commit.c:1638 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1590 +#: builtin/commit.c:1639 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1591 +#: builtin/commit.c:1640 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1592 +#: builtin/commit.c:1641 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1593 +#: builtin/commit.c:1642 msgid "bypass pre-commit hook" msgstr "förbigå pre-commit-krok" -#: builtin/commit.c:1594 +#: builtin/commit.c:1643 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1605 +#: builtin/commit.c:1654 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1606 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1611 +#: builtin/commit.c:1660 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1613 +#: builtin/commit.c:1662 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1641 +#: builtin/commit.c:1691 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1680 builtin/merge.c:518 +#: builtin/commit.c:1730 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: builtin/commit.c:1687 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1694 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1713 +#: builtin/commit.c:1763 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1724 +#: builtin/commit.c:1774 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1729 +#: builtin/commit.c:1779 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/commit.c:1756 -msgid "cannot lock HEAD ref" -msgstr "kunde inte låsa HEAD-referens" - -#: builtin/commit.c:1769 -msgid "cannot update HEAD ref" -msgstr "kunde inte uppdatera HEAD-referens" - -#: builtin/commit.c:1780 +#: builtin/commit.c:1827 msgid "" "Repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full or quota is\n" +"new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" "Arkivet har uppdaterats, men kunde inte skriva filen\n" @@ -4729,63 +4861,87 @@ msgstr "terminera värden med NUL-byte" msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/count-objects.c:82 +#: builtin/config.c:315 +msgid "unable to parse default color value" +msgstr "kan inte tolka standardfärgvärde" + +#: builtin/config.c:455 +#, c-format +msgid "" +"# This is Git's per-user configuration file.\n" +"[core]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tuser = %s\n" +"#\temail = %s\n" +msgstr "" +"# Detta är Gits användarspecifika konfigurationsfil\n" +"[core]\n" +"# Justera och ta bort kommenteringsmärket från följande rader:\n" +"#\tuser = %s\n" +"#\temail = %s\n" + +#: builtin/config.c:590 +#, c-format +msgid "cannot create configuration file %s" +msgstr "kan inte skapa konfigurationsfilen \"%s\"" + +#: builtin/count-objects.c:55 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:65 msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" -#: builtin/describe.c:16 +#: builtin/describe.c:17 msgid "git describe [options] <commit-ish>*" msgstr "git describe [flaggor] <incheckning-igt>*" -#: builtin/describe.c:17 +#: builtin/describe.c:18 msgid "git describe [options] --dirty" msgstr "git describe [flaggor] --dirty" -#: builtin/describe.c:216 +#: builtin/describe.c:217 #, c-format msgid "annotated tag %s not available" msgstr "den annoterade taggen %s inte tillgänglig" -#: builtin/describe.c:220 +#: builtin/describe.c:221 #, c-format msgid "annotated tag %s has no embedded name" msgstr "den annoterade taggen %s har inget inbäddat namn" -#: builtin/describe.c:222 +#: builtin/describe.c:223 #, c-format msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:249 +#: builtin/describe.c:250 builtin/log.c:452 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" -#: builtin/describe.c:252 +#: builtin/describe.c:253 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: builtin/describe.c:269 +#: builtin/describe.c:270 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:271 +#: builtin/describe.c:272 #, c-format msgid "searching to describe %s\n" msgstr "söker för att beskriva %s\n" -#: builtin/describe.c:318 +#: builtin/describe.c:319 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:345 +#: builtin/describe.c:346 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -4794,7 +4950,7 @@ msgstr "" "Inga annoterade taggar kan beskriva \"%s\".\n" "Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:349 +#: builtin/describe.c:350 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -4803,12 +4959,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:370 +#: builtin/describe.c:371 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:373 +#: builtin/describe.c:374 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -4817,143 +4973,147 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:395 +#: builtin/describe.c:396 msgid "find the tag that comes after the commit" msgstr "hitta taggen som kommer efter incheckningen" -#: builtin/describe.c:396 +#: builtin/describe.c:397 msgid "debug search strategy on stderr" msgstr "felsök sökstrategin på standard fel" -#: builtin/describe.c:397 +#: builtin/describe.c:398 msgid "use any ref" msgstr "använd alla referenser" -#: builtin/describe.c:398 +#: builtin/describe.c:399 msgid "use any tag, even unannotated" msgstr "använd alla taggar, även oannoterade" -#: builtin/describe.c:399 +#: builtin/describe.c:400 msgid "always use long format" msgstr "använd alltid långt format" -#: builtin/describe.c:400 +#: builtin/describe.c:401 msgid "only follow first parent" msgstr "följ endast första föräldern" -#: builtin/describe.c:403 +#: builtin/describe.c:404 msgid "only output exact matches" msgstr "skriv endast ut exakta träffar" -#: builtin/describe.c:405 +#: builtin/describe.c:406 msgid "consider <n> most recent tags (default: 10)" msgstr "överväg de <n> nyaste taggarna (standard: 10)" -#: builtin/describe.c:407 +#: builtin/describe.c:408 msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:409 builtin/name-rev.c:318 +#: builtin/describe.c:410 builtin/name-rev.c:318 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" -#: builtin/describe.c:410 +#: builtin/describe.c:411 msgid "mark" msgstr "märke" -#: builtin/describe.c:411 +#: builtin/describe.c:412 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" -#: builtin/describe.c:429 +#: builtin/describe.c:430 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:455 +#: builtin/describe.c:456 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:475 +#: builtin/describe.c:476 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" -#: builtin/diff.c:85 +#: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:236 +#: builtin/diff.c:237 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:357 +#: builtin/diff.c:358 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:400 +#: builtin/diff.c:401 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:409 +#: builtin/diff.c:410 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:416 +#: builtin/diff.c:417 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." -#: builtin/fast-export.c:23 +#: builtin/fast-export.c:24 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:702 +#: builtin/fast-export.c:979 msgid "show progress after <n> objects" msgstr "visa förlopp efter <n> objekt" -#: builtin/fast-export.c:704 +#: builtin/fast-export.c:981 msgid "select handling of signed tags" msgstr "välj hantering av signerade taggar" -#: builtin/fast-export.c:707 +#: builtin/fast-export.c:984 msgid "select handling of tags that tag filtered objects" msgstr "välj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:710 +#: builtin/fast-export.c:987 msgid "Dump marks to this file" msgstr "Dump märken till filen" -#: builtin/fast-export.c:712 +#: builtin/fast-export.c:989 msgid "Import marks from this file" msgstr "Importera märken från filen" -#: builtin/fast-export.c:714 +#: builtin/fast-export.c:991 msgid "Fake a tagger when tags lack one" msgstr "Fejka taggare när taggen saknar en" -#: builtin/fast-export.c:716 +#: builtin/fast-export.c:993 msgid "Output full tree for each commit" msgstr "Skriv ut hela trädet för varje incheckning" -#: builtin/fast-export.c:718 +#: builtin/fast-export.c:995 msgid "Use the done feature to terminate the stream" msgstr "Använd done-funktionen för att avsluta strömmen" -#: builtin/fast-export.c:719 +#: builtin/fast-export.c:996 msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:720 +#: builtin/fast-export.c:997 msgid "refspec" msgstr "referensspecifikation" -#: builtin/fast-export.c:721 +#: builtin/fast-export.c:998 msgid "Apply refspec to exported refs" msgstr "Applicera referensspecifikation på exporterade referenser" +#: builtin/fast-export.c:999 +msgid "anonymize output" +msgstr "anonymisera utdata" + #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" @@ -5026,7 +5186,7 @@ msgstr "fördjupa historik för grund klon" msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:118 builtin/log.c:1205 +#: builtin/fetch.c:118 builtin/log.c:1208 msgid "dir" msgstr "kat" @@ -5054,77 +5214,77 @@ msgstr "ange referenskarta för \"fetch\"" msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:440 +#: builtin/fetch.c:454 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:445 +#: builtin/fetch.c:459 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:459 +#: builtin/fetch.c:473 #, 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:460 builtin/fetch.c:546 +#: builtin/fetch.c:474 builtin/fetch.c:560 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:471 +#: builtin/fetch.c:485 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526 +#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 msgid " (unable to update local ref)" msgstr " (kunde inte uppdatera lokal ref)" -#: builtin/fetch.c:491 +#: builtin/fetch.c:505 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:494 +#: builtin/fetch.c:508 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:497 +#: builtin/fetch.c:511 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:548 +#: builtin/fetch.c:562 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:581 builtin/fetch.c:814 +#: builtin/fetch.c:595 builtin/fetch.c:828 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: builtin/fetch.c:590 +#: builtin/fetch.c:604 #, 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:608 +#: builtin/fetch.c:622 #, 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:696 builtin/fetch.c:779 +#: builtin/fetch.c:710 builtin/fetch.c:793 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:707 +#: builtin/fetch.c:721 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5133,55 +5293,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:759 +#: builtin/fetch.c:773 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:760 +#: builtin/fetch.c:774 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:784 +#: builtin/fetch.c:798 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:785 builtin/remote.c:1059 +#: builtin/fetch.c:799 builtin/remote.c:1063 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:804 +#: builtin/fetch.c:818 #, 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:823 +#: builtin/fetch.c:837 #, 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:826 +#: builtin/fetch.c:840 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:882 +#: builtin/fetch.c:896 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:1044 +#: builtin/fetch.c:1058 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1046 builtin/remote.c:90 +#: builtin/fetch.c:1060 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1064 +#: builtin/fetch.c:1078 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5189,32 +5349,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:1087 +#: builtin/fetch.c:1101 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1131 +#: builtin/fetch.c:1143 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1133 +#: builtin/fetch.c:1145 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1156 +#: builtin/fetch.c:1168 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1170 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1181 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1189 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -5224,8 +5384,8 @@ msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698 -#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589 +#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590 #: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "n" @@ -5250,99 +5410,105 @@ msgstr "inled meddelande med <text>" msgid "file to read from" msgstr "fil att läsa från" -#: builtin/for-each-ref.c:1051 +#: builtin/for-each-ref.c:676 +msgid "unable to parse format" +msgstr "kan inte tolka formatet" + +#: builtin/for-each-ref.c:1057 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [flaggor] [<mönster>]" -#: builtin/for-each-ref.c:1066 +#: builtin/for-each-ref.c:1072 msgid "quote placeholders suitably for shells" msgstr "citera platshållare passande för skal" -#: builtin/for-each-ref.c:1068 +#: builtin/for-each-ref.c:1074 msgid "quote placeholders suitably for perl" msgstr "citera platshållare passande för perl" -#: builtin/for-each-ref.c:1070 +#: builtin/for-each-ref.c:1076 msgid "quote placeholders suitably for python" msgstr "citera platshållare passande för python" -#: builtin/for-each-ref.c:1072 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for tcl" msgstr "citera platshållare passande för tcl" -#: builtin/for-each-ref.c:1075 +#: builtin/for-each-ref.c:1081 msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:1076 builtin/replace.c:435 +#: builtin/for-each-ref.c:1082 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1076 +#: builtin/for-each-ref.c:1082 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/for-each-ref.c:1077 +#: builtin/for-each-ref.c:1083 msgid "key" msgstr "nyckel" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1084 msgid "field name to sort on" msgstr "fältnamn att sortera på" -#: builtin/fsck.c:147 builtin/prune.c:172 +# Vague original, not networking-related, but rather related to the actual +# objects in the database. +#: builtin/fsck.c:147 builtin/prune.c:136 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: builtin/fsck.c:538 +#: builtin/fsck.c:540 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:601 +#: builtin/fsck.c:603 msgid "git fsck [options] [<object>...]" msgstr "git fsck [flaggor] [<objekt>...]" -#: builtin/fsck.c:607 +#: builtin/fsck.c:609 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:608 +#: builtin/fsck.c:610 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:609 +#: builtin/fsck.c:611 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:610 +#: builtin/fsck.c:612 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:611 +#: builtin/fsck.c:613 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:612 +#: builtin/fsck.c:614 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:613 +#: builtin/fsck.c:615 msgid "also consider packs and alternate objects" msgstr "ta även hänsyn till paket och alternativa objekt" -#: builtin/fsck.c:614 +#: builtin/fsck.c:616 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:616 +#: builtin/fsck.c:618 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:617 builtin/prune.c:144 +#: builtin/fsck.c:619 builtin/prune.c:108 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:667 +#: builtin/fsck.c:669 msgid "Checking objects" msgstr "Kontrollerar objekt" @@ -5350,48 +5516,48 @@ msgstr "Kontrollerar objekt" msgid "git gc [options]" msgstr "git gc [flaggor]" -#: builtin/gc.c:91 +#: builtin/gc.c:79 #, c-format -msgid "Invalid %s: '%s'" -msgstr "Felaktigt %s: \"%s\"" +msgid "Invalid gc.pruneexpire: '%s'" +msgstr "Ogiltig gc.pruneexpire: '%s'" -#: builtin/gc.c:118 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "tokigt lång objektkatalog %.*s" -#: builtin/gc.c:287 +#: builtin/gc.c:276 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:289 +#: builtin/gc.c:278 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:290 +#: builtin/gc.c:279 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:291 +#: builtin/gc.c:280 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:332 +#: builtin/gc.c:321 #, 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:334 +#: builtin/gc.c:323 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:335 +#: builtin/gc.c:324 #, 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:353 +#: builtin/gc.c:342 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5399,7 +5565,7 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:375 +#: builtin/gc.c:364 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5631,7 +5797,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:60 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." @@ -5639,31 +5805,37 @@ msgstr "" "git hash-object [-t <typ>] [-w] [--path=<fil>|--no-filters] [--stdin] [--] " "<fil>..." -#: builtin/hash-object.c:61 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <sökvägslista>" -#: builtin/hash-object.c:72 builtin/tag.c:609 +#: builtin/hash-object.c:94 builtin/tag.c:610 msgid "type" msgstr "typ" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:94 msgid "object type" msgstr "objekttyp" -#: builtin/hash-object.c:73 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "skriv objektet till objektdatabasen" -#: builtin/hash-object.c:74 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "läs objektet från standard in" -#: builtin/hash-object.c:76 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "spara filen som den är utan filer" -#: builtin/hash-object.c:77 +#: builtin/hash-object.c:100 +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 msgid "process file as it were from this path" msgstr "hantera filen som om den kom från sökvägen" @@ -5696,25 +5868,25 @@ msgstr "git help [--all] [--guides] [--man|--web|--info] [kommando]" msgid "unrecognized help format '%s'" msgstr "okänt hjälpformat: %s" -#: builtin/help.c:92 +#: builtin/help.c:91 msgid "Failed to start emacsclient." msgstr "Misslyckades starta emacsclient." -#: builtin/help.c:105 +#: builtin/help.c:104 msgid "Failed to parse emacsclient version." msgstr "Kunde inte tolka emacsclient-version." -#: builtin/help.c:113 +#: builtin/help.c:112 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" för gammal (< 22)." -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 #, c-format msgid "failed to exec '%s': %s" msgstr "exec misslyckades för \"%s\": %s" -#: builtin/help.c:216 +#: builtin/help.c:215 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -5723,7 +5895,7 @@ msgstr "" "\"%s\": sökväg för man-visare som ej stöds.\n" "Använd \"man.<verktyg>.cmd\" istället." -#: builtin/help.c:228 +#: builtin/help.c:227 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -5732,23 +5904,27 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:353 +#: builtin/help.c:352 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:370 +#: builtin/help.c:369 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:378 +#: builtin/help.c:377 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:424 +#: builtin/help.c:423 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" +#: builtin/help.c:424 +msgid "Everyday Git With 20 Commands Or So" +msgstr "Git för dagligt bruk i ungefär 20 kommandon" + #: builtin/help.c:425 msgid "A Git glossary" msgstr "En Git-ordlista" @@ -5787,291 +5963,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:145 +#: builtin/index-pack.c:150 #, c-format msgid "unable to open %s" msgstr "kunde inte öppna %s" -#: builtin/index-pack.c:191 +#: builtin/index-pack.c:200 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:211 +#: builtin/index-pack.c:220 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:214 +#: builtin/index-pack.c:223 #, 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:256 +#: builtin/index-pack.c:265 #, 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:266 +#: builtin/index-pack.c:275 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:276 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:288 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:286 +#: builtin/index-pack.c:295 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:302 +#: builtin/index-pack.c:311 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:307 +#: builtin/index-pack.c:316 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:321 +#: builtin/index-pack.c:330 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:332 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:341 +#: builtin/index-pack.c:350 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "paketet har felaktigt objekt vid index %lu: %s" -#: builtin/index-pack.c:462 +#: builtin/index-pack.c:471 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:511 +#: builtin/index-pack.c:520 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:519 +#: builtin/index-pack.c:528 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:527 +#: builtin/index-pack.c:536 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:558 +#: builtin/index-pack.c:567 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:560 +#: builtin/index-pack.c:569 #, 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:586 +#: builtin/index-pack.c:595 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706 -#: builtin/index-pack.c:740 builtin/index-pack.c:749 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:680 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:689 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:746 +#: builtin/index-pack.c:755 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:760 +#: builtin/index-pack.c:769 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:774 +#: builtin/index-pack.c:783 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/index-pack.c:777 +#: builtin/index-pack.c:787 msgid "Error in object" msgstr "Fel i objekt" -#: builtin/index-pack.c:779 +#: builtin/index-pack.c:789 #, 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:851 builtin/index-pack.c:881 +#: builtin/index-pack.c:861 builtin/index-pack.c:890 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1048 +#: builtin/index-pack.c:1081 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1053 +#: builtin/index-pack.c:1086 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1056 +#: builtin/index-pack.c:1089 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1067 +#: builtin/index-pack.c:1100 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1090 +#: builtin/index-pack.c:1123 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1133 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1142 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1181 #, c-format msgid "completed with %d local objects" msgstr "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1191 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1164 +#: builtin/index-pack.c:1195 #, 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:1189 +#: builtin/index-pack.c:1220 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1299 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1323 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1336 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1313 +#: builtin/index-pack.c:1344 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1326 +#: builtin/index-pack.c:1357 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1337 +#: builtin/index-pack.c:1368 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1370 +#: builtin/index-pack.c:1401 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1376 +#: builtin/index-pack.c:1407 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/index-pack.c:1380 builtin/index-pack.c:1559 +#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1469 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1471 #, 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:1487 +#: builtin/index-pack.c:1518 #, 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:1494 +#: builtin/index-pack.c:1525 #, 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:1523 +#: builtin/index-pack.c:1554 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1571 builtin/index-pack.c:1574 -#: builtin/index-pack.c:1586 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 +#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1604 +#: builtin/index-pack.c:1635 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1608 builtin/index-pack.c:1617 +#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1625 +#: builtin/index-pack.c:1656 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -6180,41 +6356,37 @@ msgstr "Initierade tomt" msgid " shared" msgstr " delat" -#: builtin/init-db.c:439 -msgid "cannot tell cwd" -msgstr "kan inte läsa aktuell katalog (cwd)" - -#: builtin/init-db.c:465 +#: builtin/init-db.c:467 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:488 +#: builtin/init-db.c:490 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:489 +#: builtin/init-db.c:491 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:491 builtin/prune-packed.c:79 builtin/repack.c:172 +#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172 msgid "be quiet" msgstr "var tyst" -#: builtin/init-db.c:523 builtin/init-db.c:528 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:532 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6223,15 +6395,31 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:578 -msgid "Cannot access current working directory" -msgstr "Kan inte komma åt aktuell arbetskatalog" - -#: builtin/init-db.c:585 +#: builtin/init-db.c:583 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" +#: builtin/interpret-trailers.c:15 +msgid "" +"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " +"[<file>...]" +msgstr "" +"git interpret-trailers [--trim-empty] [(--trailer " +"<symbol>[(=|:)<värde>])...] [<fil>...]" + +#: builtin/interpret-trailers.c:25 +msgid "trim empty trailers" +msgstr "ta bort tomma släprader" + +#: builtin/interpret-trailers.c:26 +msgid "trailer" +msgstr "släprad" + +#: builtin/interpret-trailers.c:27 +msgid "trailer(s) to add" +msgstr "släprad(er) att lägga till" + #: builtin/log.c:41 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]\n" @@ -6240,6 +6428,11 @@ msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]\n" msgid " or: git show [options] <object>..." msgstr " eller: git show [flaggor] <objekt>..." +#: builtin/log.c:81 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "ogiltig flagga för --decorate: %s" + #: builtin/log.c:127 msgid "suppress diff output" msgstr "undertryck diff-utdata" @@ -6256,245 +6449,254 @@ msgstr "Använd e-postmappningsfil" msgid "decorate options" msgstr "dekoreringsflaggor" +#: builtin/log.c:133 +msgid "Process line range n,m in file, counting from 1" +msgstr "Behandla radintervallet n,m i filen, med början på 1" + #: builtin/log.c:229 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:470 builtin/log.c:562 +#: builtin/log.c:458 +#, c-format +msgid "git show %s: bad file" +msgstr "git show %s: felaktig fil" + +#: builtin/log.c:472 builtin/log.c:564 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:586 +#: builtin/log.c:588 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:687 +#: builtin/log.c:689 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:771 +#: builtin/log.c:773 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:787 +#: builtin/log.c:789 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:801 +#: builtin/log.c:803 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:809 +#: builtin/log.c:811 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:916 +#: builtin/log.c:919 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:995 +#: builtin/log.c:998 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1023 +#: builtin/log.c:1026 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1068 +#: builtin/log.c:1071 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1183 +#: builtin/log.c:1186 msgid "use [PATCH n/m] even with a single patch" msgstr "använd [PATCH n/m] även för en ensam patch" -#: builtin/log.c:1186 +#: builtin/log.c:1189 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1190 +#: builtin/log.c:1193 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1192 +#: builtin/log.c:1195 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1194 +#: builtin/log.c:1197 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1195 +#: builtin/log.c:1198 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1196 +#: builtin/log.c:1199 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1198 +#: builtin/log.c:1201 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1200 +#: builtin/log.c:1203 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1202 +#: builtin/log.c:1205 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1205 +#: builtin/log.c:1208 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1208 +#: builtin/log.c:1211 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1211 +#: builtin/log.c:1214 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1213 +#: builtin/log.c:1216 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1215 +#: builtin/log.c:1218 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1217 +#: builtin/log.c:1220 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1218 +#: builtin/log.c:1221 msgid "header" msgstr "huvud" -#: builtin/log.c:1219 +#: builtin/log.c:1222 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1220 builtin/log.c:1222 +#: builtin/log.c:1223 builtin/log.c:1225 msgid "email" msgstr "epost" -#: builtin/log.c:1220 +#: builtin/log.c:1223 msgid "add To: header" msgstr "Lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1222 +#: builtin/log.c:1225 msgid "add Cc: header" msgstr "Lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1224 +#: builtin/log.c:1227 msgid "ident" msgstr "ident" -#: builtin/log.c:1225 +#: builtin/log.c:1228 msgid "set From address to <ident> (or committer ident if absent)" msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)" -#: builtin/log.c:1227 +#: builtin/log.c:1230 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1228 +#: builtin/log.c:1231 msgid "make first mail a reply to <message-id>" msgstr "Gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1229 builtin/log.c:1232 +#: builtin/log.c:1232 builtin/log.c:1235 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1230 +#: builtin/log.c:1233 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1233 +#: builtin/log.c:1236 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1237 +#: builtin/log.c:1240 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1239 +#: builtin/log.c:1242 msgid "signature" msgstr "signatur" -#: builtin/log.c:1240 +#: builtin/log.c:1243 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1242 +#: builtin/log.c:1245 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1243 +#: builtin/log.c:1246 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1317 +#: builtin/log.c:1320 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1332 +#: builtin/log.c:1335 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1334 +#: builtin/log.c:1337 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte användas samtidigt." -#: builtin/log.c:1342 +#: builtin/log.c:1345 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1344 +#: builtin/log.c:1347 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1346 +#: builtin/log.c:1349 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1369 +#: builtin/log.c:1372 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1371 +#: builtin/log.c:1374 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1468 +#: builtin/log.c:1472 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1531 +#: builtin/log.c:1535 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1579 +#: builtin/log.c:1583 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1634 +#: builtin/log.c:1638 #, 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:1647 builtin/log.c:1649 builtin/log.c:1661 +#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" @@ -6540,7 +6742,7 @@ msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behöver tas bort" #: builtin/ls-files.c:477 -msgid "show 'other' directories' name only" +msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" #: builtin/ls-files.c:480 @@ -6627,99 +6829,99 @@ msgstr "använd fullständiga sökvägsnamn" msgid "list entire tree; not just current directory (implies --full-name)" msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" -#: builtin/merge.c:43 +#: builtin/merge.c:44 msgid "git merge [options] [<commit>...]" msgstr "git merge [flaggor] [<incheckning>...]" -#: builtin/merge.c:44 +#: builtin/merge.c:45 msgid "git merge [options] <msg> HEAD <commit>" msgstr "git merge [flaggor] <meddelande> HEAD <incheckning>" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:98 +#: builtin/merge.c:99 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:135 +#: builtin/merge.c:136 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:136 +#: builtin/merge.c:137 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:191 +#: builtin/merge.c:192 msgid "do not show a diffstat at the end of the merge" msgstr "visa inte en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:194 +#: builtin/merge.c:195 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:195 +#: builtin/merge.c:196 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:197 +#: builtin/merge.c:198 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet" -#: builtin/merge.c:200 +#: builtin/merge.c:201 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:202 +#: builtin/merge.c:203 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:204 +#: builtin/merge.c:205 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:205 +#: builtin/merge.c:206 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:211 +#: builtin/merge.c:212 msgid "Verify that the named commit has a valid GPG signature" msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur" -#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89 +#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:214 +#: builtin/merge.c:215 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:215 +#: builtin/merge.c:216 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:217 +#: builtin/merge.c:218 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:221 +#: builtin/merge.c:222 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" @@ -6776,33 +6978,33 @@ msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" 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:677 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:691 #, 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:704 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:794 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:803 +#: builtin/merge.c:802 #, 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:808 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6818,163 +7020,163 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:833 +#: builtin/merge.c:832 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:845 +#: builtin/merge.c:844 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:908 +#: builtin/merge.c:907 #, 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:924 +#: builtin/merge.c:923 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:965 +#: builtin/merge.c:964 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:967 +#: builtin/merge.c:966 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:969 +#: builtin/merge.c:968 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:974 +#: builtin/merge.c:973 #, 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:1130 +#: builtin/merge.c:1129 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1146 git-pull.sh:31 +#: builtin/merge.c:1145 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" -"Checka in dina ändringar innan du kan slå ihop." +"Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1149 git-pull.sh:34 +#: builtin/merge.c:1148 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: builtin/merge.c:1153 +#: builtin/merge.c:1152 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" -"Checka in dina ändringar innan du kan slå ihop." +"Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1156 +#: builtin/merge.c:1155 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:1165 +#: builtin/merge.c:1164 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1174 +#: builtin/merge.c:1173 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1206 +#: builtin/merge.c:1205 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:1209 +#: builtin/merge.c:1208 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1211 +#: builtin/merge.c:1210 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:1216 +#: builtin/merge.c:1215 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1267 +#: builtin/merge.c:1266 #, 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:1270 +#: builtin/merge.c:1269 #, 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:1273 +#: builtin/merge.c:1272 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1276 +#: builtin/merge.c:1275 #, 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:1357 +#: builtin/merge.c:1356 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1396 +#: builtin/merge.c:1395 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1403 +#: builtin/merge.c:1402 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1435 +#: builtin/merge.c:1434 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1458 builtin/merge.c:1537 +#: builtin/merge.c:1457 builtin/merge.c:1536 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1462 +#: builtin/merge.c:1461 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1528 +#: builtin/merge.c:1527 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1530 +#: builtin/merge.c:1529 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1538 #, 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:1551 +#: builtin/merge.c:1550 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7079,86 +7281,91 @@ msgstr "tillåt skapa mer än ett träd" msgid "git mv [options] <source>... <destination>" msgstr "git mv [flaggor] <källa>... <mål>" +#: builtin/mv.c:69 +#, c-format +msgid "Directory %s is in index and no submodule?" +msgstr "Katalogen %s är i indexet och inte en undermodul?" + #: builtin/mv.c:71 +msgid "Please stage your changes to .gitmodules or stash them to proceed" +msgstr "" +"Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" + +#: builtin/mv.c:89 +#, c-format +msgid "%.*s is in index" +msgstr "%.*s är i indexet" + +#: builtin/mv.c:111 msgid "force move/rename even if target exists" msgstr "tvinga flytta/ändra namn även om målet finns" -#: builtin/mv.c:72 +#: builtin/mv.c:112 msgid "skip move/rename errors" msgstr "hoppa över fel vid flytt/namnändring" -#: builtin/mv.c:122 +#: builtin/mv.c:151 +#, c-format +msgid "destination '%s' is not a directory" +msgstr "destinationen \"%s\" är ingen katalog" + +#: builtin/mv.c:162 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" -#: builtin/mv.c:126 +#: builtin/mv.c:166 msgid "bad source" msgstr "felaktig källa" -#: builtin/mv.c:129 +#: builtin/mv.c:169 msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig själv" -#: builtin/mv.c:132 +#: builtin/mv.c:172 msgid "cannot move directory over file" msgstr "kan inte flytta katalog över fil" -#: builtin/mv.c:138 -#, c-format -msgid "Huh? Directory %s is in index and no submodule?" -msgstr "Vad? Katalogen %s är i indexet och inte en undermodul?" - -#: builtin/mv.c:140 builtin/rm.c:318 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" - -#: builtin/mv.c:156 -#, c-format -msgid "Huh? %.*s is in index?" -msgstr "Vad? %.*s är i indexet?" - -#: builtin/mv.c:169 +#: builtin/mv.c:181 msgid "source directory is empty" msgstr "källkatalogen är tom" -#: builtin/mv.c:205 +#: builtin/mv.c:206 msgid "not under version control" msgstr "inte versionshanterad" -#: builtin/mv.c:208 +#: builtin/mv.c:209 msgid "destination exists" msgstr "destinationen finns" -#: builtin/mv.c:216 +#: builtin/mv.c:217 #, c-format msgid "overwriting '%s'" msgstr "skriver över \"%s\"" -#: builtin/mv.c:219 +#: builtin/mv.c:220 msgid "Cannot overwrite" msgstr "Kan inte skriva över" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "multiple sources for the same target" msgstr "flera källor för samma mål" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "destination directory does not exist" msgstr "destinationskatalogen finns inte" -#: builtin/mv.c:244 +#: builtin/mv.c:232 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, källa=%s, mål=%s" -#: builtin/mv.c:254 +#: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -7315,118 +7522,118 @@ msgstr "git notes prune [<flaggor>]" msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:137 +#: builtin/notes.c:136 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "kunde inte starta \"show\" för objektet \"%s\"" -#: builtin/notes.c:141 +#: builtin/notes.c:140 msgid "could not read 'show' output" msgstr "kunde inte läsa utdata från \"show\"" -#: builtin/notes.c:149 +#: builtin/notes.c:148 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" -#: builtin/notes.c:167 builtin/tag.c:477 +#: builtin/notes.c:166 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: builtin/notes.c:186 +#: builtin/notes.c:185 msgid "Please supply the note contents using either -m or -F option" msgstr "Ange innehåll för anteckningen med antingen -m eller -F" -#: builtin/notes.c:207 builtin/notes.c:848 +#: builtin/notes.c:206 builtin/notes.c:847 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:212 +#: builtin/notes.c:211 msgid "unable to write note object" msgstr "kunde inte skriva anteckningsobjekt" -#: builtin/notes.c:214 +#: builtin/notes.c:213 #, c-format -msgid "The note contents has been left in %s" +msgid "The note contents have been left in %s" msgstr "Anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:248 builtin/tag.c:692 +#: builtin/notes.c:247 builtin/tag.c:693 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:250 builtin/tag.c:695 +#: builtin/notes.c:249 builtin/tag.c:696 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" -#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322 -#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519 -#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641 -#: builtin/notes.c:843 builtin/tag.c:708 +#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321 +#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518 +#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640 +#: builtin/notes.c:842 builtin/tag.c:709 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/notes.c:272 +#: builtin/notes.c:271 #, c-format msgid "Failed to read object '%s'." msgstr "Kunde inte läsa objektet \"%s\"." -#: builtin/notes.c:276 +#: builtin/notes.c:275 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"." -#: builtin/notes.c:316 +#: builtin/notes.c:315 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/notes.c:331 +#: builtin/notes.c:330 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502 -#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634 -#: builtin/notes.c:908 +#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501 +#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633 +#: builtin/notes.c:907 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:388 builtin/notes.c:647 +#: builtin/notes.c:387 builtin/notes.c:646 #, c-format msgid "No note found for object %s." msgstr "Inga anteckningar hittades för objektet %s." -#: builtin/notes.c:410 builtin/notes.c:567 +#: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents as a string" msgstr "anteckningsinnehåll som sträng" -#: builtin/notes.c:413 builtin/notes.c:570 +#: builtin/notes.c:412 builtin/notes.c:569 msgid "note contents in a file" msgstr "anteckningsinnehåll i en fil" -#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572 -#: builtin/notes.c:575 builtin/tag.c:627 +#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571 +#: builtin/notes.c:574 builtin/tag.c:628 msgid "object" msgstr "objekt" -#: builtin/notes.c:416 builtin/notes.c:573 +#: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "återanvänd och redigera angivet anteckningsobjekt" -#: builtin/notes.c:419 builtin/notes.c:576 +#: builtin/notes.c:418 builtin/notes.c:575 msgid "reuse specified note object" msgstr "återanvänd angivet anteckningsobjekt" -#: builtin/notes.c:421 builtin/notes.c:489 +#: builtin/notes.c:420 builtin/notes.c:488 msgid "replace existing notes" msgstr "ersätt befintliga anteckningar" -#: builtin/notes.c:455 +#: builtin/notes.c:454 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7435,24 +7642,24 @@ msgstr "" "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för " "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:460 builtin/notes.c:537 +#: builtin/notes.c:459 builtin/notes.c:536 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:490 +#: builtin/notes.c:489 msgid "read objects from stdin" msgstr "läs objekt från standard in" -#: builtin/notes.c:492 +#: builtin/notes.c:491 msgid "load rewriting config for <command> (implies --stdin)" msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" -#: builtin/notes.c:510 +#: builtin/notes.c:509 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:531 +#: builtin/notes.c:530 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7461,12 +7668,12 @@ msgstr "" "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet " "%s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:543 +#: builtin/notes.c:542 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:592 +#: builtin/notes.c:591 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -7475,15 +7682,15 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:739 +#: builtin/notes.c:738 msgid "General options" msgstr "Allmänna flaggor" -#: builtin/notes.c:741 +#: builtin/notes.c:740 msgid "Merge options" msgstr "Flaggor för sammanslagning" -#: builtin/notes.c:743 +#: builtin/notes.c:742 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -7491,224 +7698,228 @@ msgstr "" "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:745 +#: builtin/notes.c:744 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:747 +#: builtin/notes.c:746 msgid "finalize notes merge by committing unmerged notes" msgstr "" "färdigställ sammanslagning av anteckningar genom att checka in ej " "sammanslagna anteckningar" -#: builtin/notes.c:749 +#: builtin/notes.c:748 msgid "Aborting notes merge resolution" msgstr "Avbryt lösning av sammanslagning av anteckningar" -#: builtin/notes.c:751 +#: builtin/notes.c:750 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:846 +#: builtin/notes.c:845 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:858 +#: builtin/notes.c:857 msgid "attempt to remove non-existent note is not an error" msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" -#: builtin/notes.c:861 +#: builtin/notes.c:860 msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:942 +#: builtin/notes.c:941 msgid "notes-ref" msgstr "anteckningar-ref" -#: builtin/notes.c:943 +#: builtin/notes.c:942 msgid "use notes from <notes_ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:978 builtin/remote.c:1616 +#: builtin/notes.c:977 builtin/remote.c:1624 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" -#: builtin/pack-objects.c:25 +#: builtin/pack-objects.c:28 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "git pack-objects --stdout [flaggor...] [< reflista | < objektlista]" -#: builtin/pack-objects.c:26 +#: builtin/pack-objects.c:29 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:771 +#: builtin/pack-objects.c:773 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1015 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:2174 +#: builtin/pack-objects.c:2175 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2526 +#: builtin/pack-objects.c:2572 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2530 +#: builtin/pack-objects.c:2576 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2553 +#: builtin/pack-objects.c:2599 #, c-format msgid "option %s does not accept negative form" msgstr "flaggan %s godtar inte negativ form" -#: builtin/pack-objects.c:2557 +#: builtin/pack-objects.c:2603 #, 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:2576 +#: builtin/pack-objects.c:2622 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2578 +#: builtin/pack-objects.c:2624 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c:2626 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2583 +#: builtin/pack-objects.c:2629 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsmätaren visas" -#: builtin/pack-objects.c:2584 +#: builtin/pack-objects.c:2630 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2585 +#: builtin/pack-objects.c:2631 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2634 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2590 +#: builtin/pack-objects.c:2636 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2638 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2640 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2642 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:2598 +#: builtin/pack-objects.c:2644 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:2600 +#: builtin/pack-objects.c:2646 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2602 +#: builtin/pack-objects.c:2648 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2650 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2652 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:2608 +#: builtin/pack-objects.c:2654 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2656 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2658 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:2615 +#: builtin/pack-objects.c:2661 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2664 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2667 +msgid "include objects referred to by the index" +msgstr "inkludera objekt som refereras från indexet" + +#: builtin/pack-objects.c:2670 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2672 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2674 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2626 parse-options.h:140 +#: builtin/pack-objects.c:2675 parse-options.h:140 msgid "time" msgstr "tid" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2676 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2679 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2681 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2683 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2685 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2638 +#: builtin/pack-objects.c:2687 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:2640 +#: builtin/pack-objects.c:2689 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:2719 +#: builtin/pack-objects.c:2778 msgid "Counting objects" msgstr "Räknar objekt" @@ -7728,7 +7939,7 @@ msgstr "ta bort lösa referenser (standard)" msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" -#: builtin/prune-packed.c:49 +#: builtin/prune-packed.c:40 msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" @@ -7736,15 +7947,15 @@ msgstr "Tar bort duplicerade objekt" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:142 +#: builtin/prune.c:106 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/prune.c:143 +#: builtin/prune.c:107 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:146 +#: builtin/prune.c:110 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" @@ -8002,79 +8213,79 @@ msgstr "--mirror kan inte kombineras med referensspecifikationer" msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:482 +#: builtin/push.c:493 msgid "repository" msgstr "arkiv" -#: builtin/push.c:483 +#: builtin/push.c:494 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:484 +#: builtin/push.c:495 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:486 +#: builtin/push.c:497 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:487 +#: builtin/push.c:498 msgid "push tags (can't be used with --all or --mirror)" msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: builtin/push.c:490 +#: builtin/push.c:501 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:492 +#: builtin/push.c:503 msgid "refname>:<expect" msgstr "refnamn>:<förvänta" -#: builtin/push.c:493 +#: builtin/push.c:504 msgid "require old value of ref to be at this value" msgstr "kräv att ref:s tidigare värde är detta" -#: builtin/push.c:495 -msgid "check" -msgstr "kontrollera" - -#: builtin/push.c:496 +#: builtin/push.c:507 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:498 +#: builtin/push.c:509 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:499 builtin/push.c:500 +#: builtin/push.c:510 builtin/push.c:511 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:501 +#: builtin/push.c:512 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:504 +#: builtin/push.c:515 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:506 +#: builtin/push.c:517 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:507 +#: builtin/push.c:518 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:517 +#: builtin/push.c:520 +msgid "GPG sign the push" +msgstr "GPG-signera insändningen" + +#: builtin/push.c:529 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:519 +#: builtin/push.c:531 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" -#: builtin/read-tree.c:36 +#: builtin/read-tree.c:37 msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -8084,67 +8295,67 @@ msgstr "" "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])" -#: builtin/read-tree.c:109 +#: builtin/read-tree.c:110 msgid "write resulting index to <file>" msgstr "skriv resulterande index till <fil>" -#: builtin/read-tree.c:112 +#: builtin/read-tree.c:113 msgid "only empty the index" msgstr "töm bara indexet" -#: builtin/read-tree.c:114 +#: builtin/read-tree.c:115 msgid "Merging" msgstr "Sammanslagning" -#: builtin/read-tree.c:116 +#: builtin/read-tree.c:117 msgid "perform a merge in addition to a read" msgstr "utför en sammanslagning i tillägg till en läsning" -#: builtin/read-tree.c:118 +#: builtin/read-tree.c:119 msgid "3-way merge if no file level merging required" msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs" -#: builtin/read-tree.c:120 +#: builtin/read-tree.c:121 msgid "3-way merge in presence of adds and removes" msgstr "3-vägssammanslagning när det finns tillägg och borttagningar" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:123 msgid "same as -m, but discard unmerged entries" msgstr "som -m, men kasta bort ej sammanslagna poster" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "<subdirectory>/" msgstr "<underkatalog>/" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:125 msgid "read the tree into the index under <subdirectory>/" msgstr "läs in trädet i indexet under <underkatalog>/" -#: builtin/read-tree.c:127 +#: builtin/read-tree.c:128 msgid "update working tree with merge result" msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:131 msgid "allow explicitly ignored files to be overwritten" msgstr "tillåt explicit ignorerade filer att skrivas över" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't check the working tree after merging" msgstr "kontrollera inte arbetskatalogen efter sammanslagning" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:135 msgid "don't update the index or the work tree" msgstr "uppdatera inte indexet eller arbetskatalogen" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" msgstr "hoppa över att applicera filter för gles utcheckning" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "felsök unpack-trees" @@ -8294,12 +8505,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:185 builtin/remote.c:640 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:189 builtin/remote.c:644 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" @@ -8309,11 +8520,6 @@ msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" msgid "Could not setup master '%s'" msgstr "Kunde inte skapa master \"%s\"" -#: builtin/remote.c:288 -#, c-format -msgid "more than one %s" -msgstr "mer än en %s" - #: builtin/remote.c:333 #, c-format msgid "Could not get fetch map for refspec %s" @@ -8327,27 +8533,27 @@ msgstr "(matchande)" msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Kunde inte tillämpa \"%s\" på \"%s\"" -#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894 +#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898 #, c-format msgid "No such remote: %s" msgstr "Inget sådant fjärrarkiv: %s" -#: builtin/remote.c:650 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:656 builtin/remote.c:846 +#: builtin/remote.c:657 builtin/remote.c:850 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:671 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8358,32 +8564,32 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:677 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "Kunde inte lägga till på \"%s\"" -#: builtin/remote.c:688 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "Kunde inte sätta \"%s\"" -#: builtin/remote.c:710 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:744 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:765 +#: builtin/remote.c:769 #, c-format msgid "Could not remove branch %s" msgstr "Kunde inte ta bort grenen %s" -#: builtin/remote.c:832 +#: builtin/remote.c:836 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8397,262 +8603,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:947 +#: builtin/remote.c:951 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:950 +#: builtin/remote.c:954 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:952 +#: builtin/remote.c:956 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:954 +#: builtin/remote.c:958 msgid " ???" msgstr " ???" -#: builtin/remote.c:995 +#: builtin/remote.c:999 #, 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:1002 +#: builtin/remote.c:1006 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:1005 +#: builtin/remote.c:1009 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:1006 +#: builtin/remote.c:1010 msgid " and with remote" msgstr " och med fjärren" -#: builtin/remote.c:1008 +#: builtin/remote.c:1012 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:1009 +#: builtin/remote.c:1013 msgid " and with remote" msgstr " och med fjärren" -#: builtin/remote.c:1055 +#: builtin/remote.c:1059 msgid "create" msgstr "skapa" -#: builtin/remote.c:1058 +#: builtin/remote.c:1062 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1062 +#: builtin/remote.c:1066 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1065 +#: builtin/remote.c:1069 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1068 +#: builtin/remote.c:1072 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1075 +#: builtin/remote.c:1079 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1082 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1082 +#: builtin/remote.c:1086 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1085 +#: builtin/remote.c:1089 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1153 +#: builtin/remote.c:1157 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1180 +#: builtin/remote.c:1184 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1181 +#: builtin/remote.c:1185 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1182 builtin/remote.c:1329 +#: builtin/remote.c:1186 builtin/remote.c:1333 msgid "(no URL)" msgstr "(ingen URL)" -#: builtin/remote.c:1191 builtin/remote.c:1193 +#: builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199 +#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1201 +#: builtin/remote.c:1205 #, 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:1213 +#: builtin/remote.c:1217 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1216 builtin/remote.c:1243 +#: builtin/remote.c:1220 builtin/remote.c:1247 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1225 +#: builtin/remote.c:1229 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:1233 +#: builtin/remote.c:1237 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1240 +#: builtin/remote.c:1244 #, 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:1261 +#: builtin/remote.c:1265 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1263 +#: builtin/remote.c:1267 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1278 +#: builtin/remote.c:1282 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1280 +#: builtin/remote.c:1284 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:1290 +#: builtin/remote.c:1294 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1302 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1300 +#: builtin/remote.c:1304 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1318 +#: builtin/remote.c:1322 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1319 +#: builtin/remote.c:1323 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1325 +#: builtin/remote.c:1329 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1326 +#: builtin/remote.c:1330 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1349 +#: builtin/remote.c:1357 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1352 +#: builtin/remote.c:1360 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1397 +#: builtin/remote.c:1405 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1463 builtin/remote.c:1537 +#: builtin/remote.c:1471 builtin/remote.c:1545 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1483 +#: builtin/remote.c:1491 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1490 +#: builtin/remote.c:1498 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1512 +#: builtin/remote.c:1520 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1514 +#: builtin/remote.c:1522 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1516 +#: builtin/remote.c:1524 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1523 +#: builtin/remote.c:1531 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1563 +#: builtin/remote.c:1571 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1571 +#: builtin/remote.c:1579 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1573 +#: builtin/remote.c:1581 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1587 +#: builtin/remote.c:1595 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" @@ -8749,22 +8955,22 @@ msgstr "git replace -d <objekt>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<mönster>]]" -#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388 +#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 #, c-format msgid "Not a valid object name: '%s'" msgstr "Objektnamnet är inte giltigt: \"%s\"" -#: builtin/replace.c:352 +#: builtin/replace.c:355 #, c-format msgid "bad mergetag in commit '%s'" msgstr "felaktig sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:354 +#: builtin/replace.c:357 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "felformad sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:365 +#: builtin/replace.c:368 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -8773,45 +8979,45 @@ msgstr "" "den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s" "\" som har förkastats; använd --edit istället för --graft" -#: builtin/replace.c:398 +#: builtin/replace.c:401 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur." -#: builtin/replace.c:399 +#: builtin/replace.c:402 msgid "the signature will be removed in the replacement commit!" msgstr "signaturen kommer att tas bort i ersättningsincheckningen!" -#: builtin/replace.c:405 +#: builtin/replace.c:408 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "kunde inte skriva ersättningsincheckning för: \"%s\"" -#: builtin/replace.c:429 +#: builtin/replace.c:432 msgid "list replace refs" msgstr "visa ersättningsreferenser" -#: builtin/replace.c:430 +#: builtin/replace.c:433 msgid "delete replace refs" msgstr "ta bort ersättningsreferenser" -#: builtin/replace.c:431 +#: builtin/replace.c:434 msgid "edit existing object" msgstr "redigera befintligt objekt" -#: builtin/replace.c:432 +#: builtin/replace.c:435 msgid "change a commit's parents" msgstr "ändra en inchecknings föräldrar" -#: builtin/replace.c:433 +#: builtin/replace.c:436 msgid "replace the ref if it exists" msgstr "ersätt referensen om den finns" -#: builtin/replace.c:434 +#: builtin/replace.c:437 msgid "do not pretty-print contents for --edit" msgstr "använd inte snygg visning av innehåll för --edit" -#: builtin/replace.c:435 +#: builtin/replace.c:438 msgid "use this format" msgstr "använd detta format" @@ -8823,155 +9029,155 @@ msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" msgid "register clean resolutions in index" msgstr "registrera rena lösningar i indexet" -#: builtin/reset.c:25 +#: builtin/reset.c:26 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]" -#: builtin/reset.c:26 +#: builtin/reset.c:27 msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "git reset [-q] <träd-igt> [--] <sökvägar>..." -#: builtin/reset.c:27 +#: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "mixed" msgstr "blandad" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "soft" msgstr "mjuk" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "hard" msgstr "hård" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "merge" msgstr "sammanslagning" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "keep" msgstr "behåll" -#: builtin/reset.c:73 +#: builtin/reset.c:74 msgid "You do not have a valid HEAD." msgstr "Du har inte en giltig HEAD." -#: builtin/reset.c:75 +#: builtin/reset.c:76 msgid "Failed to find tree of HEAD." msgstr "Kunde inte hitta träder för HEAD." -#: builtin/reset.c:81 +#: builtin/reset.c:82 #, c-format msgid "Failed to find tree of %s." msgstr "Kunde inte hitta träder för %s." -#: builtin/reset.c:99 +#: builtin/reset.c:100 #, c-format msgid "HEAD is now at %s" msgstr "HEAD är nu på %s" -#: builtin/reset.c:182 +#: builtin/reset.c:183 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: builtin/reset.c:275 +#: builtin/reset.c:276 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" -#: builtin/reset.c:277 +#: builtin/reset.c:278 msgid "reset HEAD and index" msgstr "återställ HEAD och index" -#: builtin/reset.c:278 +#: builtin/reset.c:279 msgid "reset only HEAD" msgstr "återställ endast HEAD" -#: builtin/reset.c:280 builtin/reset.c:282 +#: builtin/reset.c:281 builtin/reset.c:283 msgid "reset HEAD, index and working tree" msgstr "återställ HEAD, index och arbetskatalog" -#: builtin/reset.c:284 +#: builtin/reset.c:285 msgid "reset HEAD but keep local changes" msgstr "återställ HEAD men behåll lokala ändringar" -#: builtin/reset.c:287 +#: builtin/reset.c:288 msgid "record only the fact that removed paths will be added later" msgstr "registrera endast att borttagna sökvägar kommer läggas till senare" -#: builtin/reset.c:304 +#: builtin/reset.c:305 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Kunde inte slå upp \"%s\" som en giltig revision." -#: builtin/reset.c:307 builtin/reset.c:315 +#: builtin/reset.c:308 builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"" -#: builtin/reset.c:312 +#: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd." -#: builtin/reset.c:321 +#: builtin/reset.c:322 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch är inkompatibel med --{hard,mixed,soft}" -#: builtin/reset.c:330 +#: builtin/reset.c:331 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"." -#: builtin/reset.c:332 +#: builtin/reset.c:333 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:342 +#: builtin/reset.c:343 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s återställning tillåts inte i ett naket arkiv" -#: builtin/reset.c:346 +#: builtin/reset.c:347 msgid "-N can only be used with --mixed" msgstr "-N kan endast användas med --mixed" -#: builtin/reset.c:363 +#: builtin/reset.c:364 msgid "Unstaged changes after reset:" msgstr "Oköade ändringar efter återställning:" -#: builtin/reset.c:369 +#: builtin/reset.c:370 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." -#: builtin/reset.c:373 +#: builtin/reset.c:374 msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-parse.c:360 +#: builtin/rev-parse.c:361 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [options] -- [<argument>...]" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" msgstr "behåll \"--\" sänt som argument" -#: builtin/rev-parse.c:367 +#: builtin/rev-parse.c:368 msgid "stop parsing after the first non-option argument" msgstr "sluta tolka efter första argument som inte är flagga" -#: builtin/rev-parse.c:370 +#: builtin/rev-parse.c:371 msgid "output in stuck long form" msgstr "utdata fast i lång form" -#: builtin/rev-parse.c:498 +#: builtin/rev-parse.c:499 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -9084,7 +9290,7 @@ msgid "" "the following submodule (or one of its nested submodules)\n" "uses a .git directory:" msgid_plural "" -"the following submodules (or one of its nested submodules)\n" +"the following submodules (or one of their nested submodules)\n" "use a .git directory:" msgstr[0] "" "följande undermodul (eller en av dess nästlade undermoduler)\n" @@ -9161,6 +9367,11 @@ msgstr "tillåt rekursiv borttagning" msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus även om inget träffades" +#: builtin/rm.c:318 +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 #, c-format msgid "not removing '%s' recursively without -r" @@ -9282,11 +9493,11 @@ msgstr "visa <n> nyaste refloggposter med början på bas" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" -"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"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önster*] " +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] " #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" @@ -9345,11 +9556,11 @@ msgstr "ta bort symbolisk referens" msgid "shorten ref output" msgstr "förkorta ref-utdata" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "skäl" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "skäl till uppdateringen" @@ -9472,236 +9683,226 @@ msgstr "flaggan \"points-at\" behöver ett objekt" msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: builtin/tag.c:588 +#: builtin/tag.c:589 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:590 +#: builtin/tag.c:591 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:592 +#: builtin/tag.c:593 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:593 +#: builtin/tag.c:594 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:595 +#: builtin/tag.c:596 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:597 +#: builtin/tag.c:598 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:599 +#: builtin/tag.c:600 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:601 +#: builtin/tag.c:602 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:605 +#: builtin/tag.c:606 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:606 +#: builtin/tag.c:607 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:607 +#: builtin/tag.c:608 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:609 +#: builtin/tag.c:610 msgid "sort tags" msgstr "sortera taggar" -#: builtin/tag.c:613 +#: builtin/tag.c:614 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:616 builtin/tag.c:622 +#: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:628 +#: builtin/tag.c:629 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:654 +#: builtin/tag.c:655 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:666 +#: builtin/tag.c:667 msgid "--sort and -n are incompatible" msgstr "--sort och -n är inkompatibla" -#: builtin/tag.c:673 +#: builtin/tag.c:674 msgid "-n option is only allowed with -l." msgstr "Flaggan -n är endast tillåten tillsammans med -l." -#: builtin/tag.c:675 +#: builtin/tag.c:676 msgid "--contains option is only allowed with -l." msgstr "Flaggan --contains är endast tillåten tillsammans med -l" -#: builtin/tag.c:677 +#: builtin/tag.c:678 msgid "--points-at option is only allowed with -l." msgstr "Flaggan --points-at är endast tillåten tillsammans med -l." -#: builtin/tag.c:685 +#: builtin/tag.c:686 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:705 +#: builtin/tag.c:706 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:711 +#: builtin/tag.c:712 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:716 +#: builtin/tag.c:717 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:734 -#, c-format -msgid "%s: cannot lock the ref" -msgstr "%s: kan inte låsa referensen" - -#: builtin/tag.c:736 -#, c-format -msgid "%s: cannot update the ref" -msgstr "%s: kan inte uppdatera referensen" - -#: builtin/tag.c:738 +#: builtin/tag.c:741 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" -#: builtin/unpack-objects.c:483 +#: builtin/unpack-objects.c:489 msgid "Unpacking objects" msgstr "Packar upp objekt" -#: builtin/update-index.c:402 +#: builtin/update-index.c:403 msgid "git update-index [options] [--] [<file>...]" msgstr "git update-index [flaggor] [--] [<fil>...]" -#: builtin/update-index.c:755 +#: builtin/update-index.c:756 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:758 +#: builtin/update-index.c:759 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:761 +#: builtin/update-index.c:762 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:763 +#: builtin/update-index.c:764 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:765 +#: builtin/update-index.c:766 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:767 +#: builtin/update-index.c:768 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:770 +#: builtin/update-index.c:771 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:774 +#: builtin/update-index.c:775 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:778 +#: builtin/update-index.c:779 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:783 +#: builtin/update-index.c:784 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/update-index.c:788 +#: builtin/update-index.c:789 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:791 +#: builtin/update-index.c:792 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:794 +#: builtin/update-index.c:795 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:797 +#: builtin/update-index.c:798 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:800 +#: builtin/update-index.c:801 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:802 +#: builtin/update-index.c:803 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:804 +#: builtin/update-index.c:805 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:806 +#: builtin/update-index.c:807 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:810 +#: builtin/update-index.c:811 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:814 +#: builtin/update-index.c:815 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:818 +#: builtin/update-index.c:819 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:822 +#: builtin/update-index.c:823 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:825 +#: builtin/update-index.c:826 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:827 +#: builtin/update-index.c:828 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:831 +#: builtin/update-index.c:832 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:833 +#: builtin/update-index.c:834 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" @@ -9717,19 +9918,19 @@ msgstr "git update-ref [flaggor] <refnamn> <gammaltvärde> [<nyttvärde>]" msgid "git update-ref [options] --stdin [-z]" msgstr "git update-ref [flaggor] --stdin [-z]" -#: builtin/update-ref.c:350 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "ta bort referensen" -#: builtin/update-ref.c:352 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "uppdatera <refnamn> inte det den pekar på" -#: builtin/update-ref.c:353 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "standard in har NUL-terminerade argument" -#: builtin/update-ref.c:354 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "läs uppdateringar från standard in" @@ -9749,15 +9950,15 @@ msgstr "git verify-commit [-v|--verbose] <incheckning>..." msgid "print commit contents" msgstr "visa innehåll för incheckning" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:54 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <paket>..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:64 msgid "verbose" msgstr "pratsam" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:66 msgid "show statistics only" msgstr "visa endast statistik" @@ -9785,9 +9986,13 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" +#: credential-cache--daemon.c:267 +msgid "print debugging messages to stderr" +msgstr "skriv felsökningsmeddelanden på standard fel" + #: git.c:17 msgid "" -"'git help -a' and 'git help -g' lists available subcommands and some\n" +"'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" @@ -9795,26 +10000,6 @@ 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." -#: parse-options.h:143 -msgid "expiry-date" -msgstr "giltig-till" - -#: parse-options.h:158 -msgid "no-op (backward compatibility)" -msgstr "ingen funktion (bakåtkompatibilitet)" - -#: parse-options.h:232 -msgid "be more verbose" -msgstr "var mer pratsam" - -#: parse-options.h:234 -msgid "be more quiet" -msgstr "var mer tyst" - -#: parse-options.h:240 -msgid "use <n> digits to display SHA-1s" -msgstr "använd <n> siffror för att visa SHA-1:or" - #: common-cmds.h:8 msgid "Add file contents to the index" msgstr "Lägg filinnehåll till indexet" @@ -9899,6 +10084,30 @@ msgstr "Visa status för arbetskatalogen" 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 +msgid "expiry-date" +msgstr "giltig-till" + +#: parse-options.h:158 +msgid "no-op (backward compatibility)" +msgstr "ingen funktion (bakåtkompatibilitet)" + +#: parse-options.h:232 +msgid "be more verbose" +msgstr "var mer pratsam" + +#: parse-options.h:234 +msgid "be more quiet" +msgstr "var mer tyst" + +#: parse-options.h:240 +msgid "use <n> digits to display SHA-1s" +msgstr "använd <n> siffror för att visa SHA-1:or" + +#: rerere.h:27 +msgid "update the index with reused conflict resolution if possible" +msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" + #: git-am.sh:52 msgid "You need to set your committer info first" msgstr "Du måste ställa in din incheckarinformation först" @@ -10155,7 +10364,7 @@ msgstr "Är du säker [Y=ja/N=nej]? " #: git-bisect.sh:289 msgid "" -"You need to give me at least one good and one bad revisions.\n" +"You need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Du måste ange åtminstone en bra och en dålig version.\n" @@ -10164,7 +10373,7 @@ msgstr "" #: git-bisect.sh:292 msgid "" "You need to start by \"git bisect start\".\n" -"You then need to give me at least one good and one bad revisions.\n" +"You then need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Du måste starta med \"git bisect start\".\n" @@ -10237,16 +10446,24 @@ msgstr "\"bisect\"-körningen lyckades" 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, or use 'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in.\n" "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, eller använd \"git commit -a\"." +"där det är lämpligt för att ange lösning och checka in." #: git-pull.sh:25 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 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" +"Checka in dina ändringar innan du kan slå ihop." + #: git-pull.sh:245 msgid "updating an unborn branch with changes added to the index" msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet" @@ -10500,8 +10717,8 @@ msgstr "För många revisioner angivna: $REV" #: git-stash.sh:397 #, sh-format -msgid "$reference is not valid reference" -msgstr "$reference är inte en giltig referens." +msgid "$reference is not a valid reference" +msgstr "$reference är inte en giltig referens" #: git-stash.sh:425 #, sh-format @@ -10547,11 +10764,11 @@ msgstr "Kastade ${REV} ($s)" msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:538 +#: git-stash.sh:539 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:610 +#: git-stash.sh:611 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" @@ -10855,6 +11072,36 @@ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" +#~ msgid "Failed to lock ref for update" +#~ msgstr "Misslyckades låsa referens för uppdatering" + +#~ msgid "Failed to write ref" +#~ msgstr "Misslyckades skriva referens" + +#~ msgid "Failed to lock HEAD during fast_forward_to" +#~ msgstr "Misslyckades låsa HEAD under \"fast_forward_to\"" + +#~ msgid "invalid commit: %s" +#~ msgstr "felaktig incheckning: %s" + +#~ msgid "cannot lock HEAD ref" +#~ msgstr "kunde inte låsa HEAD-referens" + +#~ 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)" + +#~ msgid "%s: cannot lock the ref" +#~ msgstr "%s: kan inte låsa referensen" + +#~ msgid "%s: cannot update the ref" +#~ msgstr "%s: kan inte uppdatera referensen" + #~ msgid "commit has empty message" #~ msgstr "incheckningen har ett tomt meddelande" @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git v2.1.0-rc0\n" +"Project-Id-Version: git v2.2.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2014-08-04 14:48+0800\n" -"PO-Revision-Date: 2014-08-05 07:32+0700\n" +"POT-Creation-Date: 2014-11-20 09:42+0800\n" +"PO-Revision-Date: 2014-11-20 16:10+0800\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" @@ -30,107 +30,105 @@ msgstr "gợi ý: %.*s\n" #: advice.c:88 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, or use\n" -"'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" "Sửa chúng trong cây làm việc,\n" -"và sau đó dùng lệnh \"git add/rm <tập-tin>\" dành riêng\n" -"cho việc đánh dấu tập tin cần giải quyết và tạo lần chuyển giao,\n" -"hoặc là dùng lệnh \"git commit -a\"." +"và sau đó dùng lệnh “git add/rm <tập-tin>”\n" +"dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao." -#: archive.c:10 +#: archive.c:11 msgid "git archive [options] <tree-ish> [<path>...]" msgstr "git archive [các-tùy-chọn] <tree-ish> [<đường-dẫn>...]" -#: archive.c:11 +#: archive.c:12 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:12 +#: archive.c:13 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" msgstr "" "git archive --remote <kho> [--exec <lệnh>] [các-tùy-chọn] <tree-ish> [<đường-" "dẫn>...]" -#: archive.c:13 +#: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <kho> [--exec <lệnh>] --list" -#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào" -#: archive.c:328 +#: archive.c:419 msgid "fmt" msgstr "định_dạng" -#: archive.c:328 +#: archive.c:419 msgid "archive format" msgstr "định dạng lưu trữ" -#: archive.c:329 builtin/log.c:1201 +#: archive.c:420 builtin/log.c:1204 msgid "prefix" msgstr "tiền_tố" -#: archive.c:330 +#: archive.c:421 msgid "prepend prefix to each pathname in the archive" msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu" -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709 -#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412 -#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151 +#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411 +#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "tập_tin" -#: archive.c:332 builtin/archive.c:89 +#: archive.c:423 builtin/archive.c:89 msgid "write the archive to this file" msgstr "ghi kho lưu vào tập tin này" -#: archive.c:334 +#: archive.c:425 msgid "read .gitattributes in working directory" msgstr "đọc .gitattributes trong thư mục làm việc" -#: archive.c:335 +#: archive.c:426 msgid "report archived files on stderr" msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi tiêu chuẩn)" -#: archive.c:336 +#: archive.c:427 msgid "store only" msgstr "chỉ lưu (không nén)" -#: archive.c:337 +#: archive.c:428 msgid "compress faster" msgstr "nén nhanh hơn" -#: archive.c:345 +#: archive.c:436 msgid "compress better" msgstr "nén nhỏ hơn" -#: archive.c:348 +#: archive.c:439 msgid "list supported archive formats" msgstr "liệt kê các kiểu nén được hỗ trợ" -#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 +#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85 msgid "repo" msgstr "kho" -#: archive.c:351 builtin/archive.c:91 +#: archive.c:442 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ" -#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 +#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490 msgid "command" msgstr "lệnh" -#: archive.c:353 builtin/archive.c:93 +#: archive.c:444 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ" -#: attr.c:259 +#: attr.c:258 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -189,33 +187,33 @@ msgstr "Nhánh %s cài đặt để theo dõi tham chiếu nội bộ %s." msgid "Not tracking: ambiguous information for ref %s" msgstr "Không theo dõi: thông tin chưa rõ ràng cho tham chiếu %s" -#: branch.c:178 +#: branch.c:162 #, c-format msgid "'%s' is not a valid branch name." msgstr "“%s” không phải là một tên nhánh hợp lệ." -#: branch.c:183 +#: branch.c:167 #, c-format msgid "A branch named '%s' already exists." msgstr "Đã có nhánh mang tên “%s”." -#: branch.c:191 +#: branch.c:175 msgid "Cannot force update the current branch." msgstr "Không thể ép buộc cập nhật nhánh hiện hành." -#: branch.c:211 +#: branch.c:195 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "Không thể cài đặt thông tin theo dõi; điểm bắt đầu “%s” không phải là một " "nhánh." -#: branch.c:213 +#: branch.c:197 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "nhánh thượng nguồn đã yêu cầu “%s” không tồn tại" -#: branch.c:215 +#: branch.c:199 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -235,106 +233,104 @@ msgstr "" "sẽ theo dõi bản đối chiếu máy chủ của nó, bạn cần dùng lệnh\n" "\"git push -u\" để đặt cấu hình thượng nguồn bạn muốn push." -#: branch.c:260 +#: branch.c:243 #, c-format msgid "Not a valid object name: '%s'." msgstr "Không phải tên đối tượng hợp lệ: “%s”." -#: branch.c:280 +#: branch.c:263 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Tên đối tượng chưa rõ ràng: “%s”." -#: branch.c:285 +#: branch.c:268 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Nhánh không hợp lệ: “%s”." -#: branch.c:291 -msgid "Failed to lock ref for update" -msgstr "Gặp lỗi khi khóa tham chiếu (ref) để cập nhật" - -#: branch.c:309 -msgid "Failed to write ref" -msgstr "Gặp lỗi khi ghi tham chiếu (ref)" - -#: bundle.c:33 +#: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "“%s” không giống như tập tin v2 bundle (định dạng dump của git)" -#: bundle.c:60 +#: bundle.c:61 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "phần đầu không được thừa nhận: %s%s (%d)" -#: bundle.c:86 builtin/commit.c:755 +#: bundle.c:87 builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "không thể mở “%s”" -#: bundle.c:138 +#: bundle.c:139 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:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330 -#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357 +#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706 +#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357 #: 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" -#: bundle.c:184 +#: bundle.c:185 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" -msgstr[0] "Bundle chứa tham chiếu (ref) này:" -msgstr[1] "Bundle chứa %d tham chiếu (ref):" +msgstr[0] "Bundle chứa tham chiếu này:" +msgstr[1] "Bundle chứa %d tham chiếu:" -#: bundle.c:191 +#: bundle.c:192 msgid "The bundle records a complete history." msgstr "Lệnh bundle ghi lại toàn bộ lịch sử." -#: bundle.c:193 +#: bundle.c:194 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Lệnh bundle yêu cầu tham chiếu này:" -msgstr[1] "Lệnh bundle yêu cầu %d tham chiếu (refs) này:" +msgstr[1] "Lệnh bundle yêu cầu %d tham chiếu này:" -#: bundle.c:289 +#: bundle.c:251 +msgid "Could not spawn pack-objects" +msgstr "Không thể sản sinh đối tượng gói" + +#: bundle.c:269 +msgid "pack-objects died" +msgstr "đối tượng gói đã chết" + +#: bundle.c:309 msgid "rev-list died" msgstr "rev-list đã chết" -#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261 -#, c-format -msgid "unrecognized argument: %s" -msgstr "đối số không được thừa nhận: %s" - -#: bundle.c:330 +#: bundle.c:358 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list" -#: bundle.c:375 +#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#, c-format +msgid "unrecognized argument: %s" +msgstr "đối số không được thừa nhận: %s" + +#: bundle.c:444 msgid "Refusing to create empty bundle." msgstr "Từ chối tạo một bundle trống rỗng." -#: bundle.c:390 -msgid "Could not spawn pack-objects" -msgstr "Không thể sản sinh đối tượng gói" - -#: bundle.c:408 -msgid "pack-objects died" -msgstr "pack-objects đã chết" - -#: bundle.c:411 +#: bundle.c:454 #, c-format msgid "cannot create '%s'" msgstr "không thể tạo “%s”" -#: bundle.c:433 +#: bundle.c:475 msgid "index-pack died" -msgstr "index-pack đã chết" +msgstr "mục lục gói đã chết" + +#: color.c:157 +#, c-format +msgid "invalid color value: %.*s" +msgstr "giá trị màu không hợp lệ: %.*s" #: commit.c:40 #, c-format @@ -344,22 +340,75 @@ msgstr "không thể phân tích cú pháp %s" #: commit.c:42 #, c-format msgid "%s %s is not a commit!" -msgstr "%s %s không phải là một lần commit!" +msgstr "%s %s không phải là một lần chuyển giao!" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "hết bộ nhớ" -#: connected.c:70 +#: config.c:469 config.c:471 +#, c-format +msgid "bad config file line %d in %s" +msgstr "tập tin cấu hình sai tại dòng %d trong %s" + +#: config.c:587 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong %s: %s" + +#: config.c:589 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s”: %s" + +#: config.c:674 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "gặp lỗi mở rộng thư mục người dùng trong: “%s”" + +#: config.c:752 config.c:763 +#, c-format +msgid "bad zlib compression level %d" +msgstr "mức nén zlib %d là sai" + +#: config.c:885 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "chế độ không hợp lệ đối với việc tạo đối tượng: %s" + +#: config.c:1201 +msgid "unable to parse command-line config" +msgstr "không thể phân tích cấu hình dòng lệnh" + +#: config.c:1262 +msgid "unknown error occured while reading the configuration files" +msgstr "đã có lỗi chưa biết xảy ra trong khi đọc các tập tin cấu hình" + +#: config.c:1586 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "không thể phân tích “%s” từ cấu hình dòng lệnh" + +#: config.c:1588 +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "sai biến cấu hình “%s” trong tập tin “%s” tại dòng %d" + +#: config.c:1647 +#, c-format +msgid "%s has multiple values" +msgstr "%s có đa giá trị" + +#: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Không thể chạy “git rev-list”" -#: connected.c:90 +#: connected.c:89 #, c-format msgid "failed write to rev-list: %s" msgstr "gặp lỗi khi ghi vào rev-list: %s" -#: connected.c:98 +#: connected.c:97 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list: %s" @@ -437,7 +486,7 @@ msgstr[1] "%lu năm trước" msgid "failed to read orderfile '%s'" msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”" -#: diffcore-rename.c:514 +#: diffcore-rename.c:516 msgid "Performing inexact rename detection" msgstr "Đang thực hiện dò tìm đổi tên không chính xác" @@ -456,7 +505,7 @@ msgstr " Không hiểu đối số dirstat “%s”\n" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Không hiểu giá trị cho biến cấu hình “diff.submodule”: “%s”" -#: diff.c:267 +#: diff.c:266 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -465,16 +514,16 @@ msgstr "" "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n" "%s" -#: diff.c:2934 +#: diff.c:2957 #, 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:3329 +#: diff.c:3352 msgid "--follow requires exactly one pathspec" msgstr "--follow cần chính xác một đặc tả đường dẫn" -#: diff.c:3492 +#: diff.c:3515 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -483,44 +532,44 @@ msgstr "" "Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" "%s" -#: diff.c:3506 +#: diff.c:3529 #, 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”" -#: gpg-interface.c:73 gpg-interface.c:145 +#: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "không thể chạy gpg." -#: gpg-interface.c:85 +#: gpg-interface.c:141 msgid "gpg did not accept the data" msgstr "gpg đã không chấp nhận dữ liệu" -#: gpg-interface.c:96 +#: gpg-interface.c:152 msgid "gpg failed to sign the data" msgstr "gpg gặp lỗi khi ký dữ liệu" -#: gpg-interface.c:129 +#: gpg-interface.c:185 #, c-format msgid "could not create temporary file '%s': %s" msgstr "không thể tạo tập tin tạm thời “%s”: %s" -#: gpg-interface.c:132 +#: gpg-interface.c:188 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”: %s" -#: grep.c:1703 +#: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "“%s”: không thể đọc %s" -#: grep.c:1720 +#: grep.c:1735 #, c-format msgid "'%s': %s" msgstr "“%s”: %s" -#: grep.c:1731 +#: grep.c:1746 #, c-format msgid "'%s': short read %s" msgstr "“%s”: đọc ngắn %s" @@ -589,87 +638,95 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: merge.c:40 +#: lockfile.c:275 +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:277 +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" + +#: merge.c:41 msgid "failed to read the cache" msgstr "gặp lỗi khi đọc bộ nhớ đệm" -#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556 -#: builtin/clone.c:661 +#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562 +#: builtin/clone.c:659 msgid "unable to write new index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới" -#: merge-recursive.c:190 +#: merge-recursive.c:189 #, c-format msgid "(bad commit)\n" msgstr "(commit sai)\n" -#: merge-recursive.c:210 +#: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache gặp lỗi đối với đường dẫn “%s”" -#: merge-recursive.c:271 +#: merge-recursive.c:270 msgid "error building trees" msgstr "gặp lỗi khi xây dựng cây" -#: merge-recursive.c:692 +#: merge-recursive.c:691 #, 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:703 +#: merge-recursive.c:702 #, 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:717 merge-recursive.c:738 +#: merge-recursive.c:716 merge-recursive.c:737 msgid ": perhaps a D/F conflict?" msgstr ": có lẽ là một xung đột D/F?" -#: merge-recursive.c:728 +#: merge-recursive.c:727 #, 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:768 +#: merge-recursive.c:767 #, c-format msgid "cannot read object %s '%s'" msgstr "không thể đọc đối tượng %s “%s”" -#: merge-recursive.c:770 +#: merge-recursive.c:769 #, c-format msgid "blob expected for %s '%s'" msgstr "đối tượng blob được mong đợi cho %s “%s”" -#: merge-recursive.c:793 builtin/clone.c:317 +#: merge-recursive.c:792 builtin/clone.c:318 #, c-format msgid "failed to open '%s'" msgstr "gặp lỗi khi mở “%s”" -#: merge-recursive.c:801 +#: merge-recursive.c:800 #, 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:804 +#: merge-recursive.c:803 #, 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:942 +#: merge-recursive.c:941 msgid "Failed to execute internal merge" msgstr "Gặp lỗi khi thực hiện trộn nội bộ" -#: merge-recursive.c:946 +#: merge-recursive.c:945 #, 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:962 +#: merge-recursive.c:961 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:1037 merge-recursive.c:1051 +#: merge-recursive.c:1036 merge-recursive.c:1050 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -678,7 +735,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:1043 merge-recursive.c:1056 +#: merge-recursive.c:1042 merge-recursive.c:1055 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -687,20 +744,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:1097 +#: merge-recursive.c:1096 msgid "rename" msgstr "đổi tên" -#: merge-recursive.c:1097 +#: merge-recursive.c:1096 msgid "renamed" msgstr "đã đổi tên" -#: merge-recursive.c:1153 +#: merge-recursive.c:1152 #, 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:1175 +#: merge-recursive.c:1174 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -709,146 +766,146 @@ 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:1180 +#: merge-recursive.c:1179 msgid " (left unresolved)" msgstr " (cần giải quyết)" -#: merge-recursive.c:1234 +#: merge-recursive.c:1233 #, 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:1264 +#: merge-recursive.c:1263 #, 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:1463 +#: merge-recursive.c:1462 #, 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:1473 +#: merge-recursive.c:1472 #, c-format msgid "Adding merged %s" msgstr "Thêm hòa trộn %s" -#: merge-recursive.c:1478 merge-recursive.c:1676 +#: merge-recursive.c:1477 merge-recursive.c:1675 #, c-format msgid "Adding as %s instead" msgstr "Thay vào đó thêm vào %s" -#: merge-recursive.c:1529 +#: merge-recursive.c:1528 #, c-format msgid "cannot read object %s" msgstr "không thể đọc đối tượng %s" -#: merge-recursive.c:1532 +#: merge-recursive.c:1531 #, 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:1580 +#: merge-recursive.c:1579 msgid "modify" msgstr "sửa đổi" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modified" msgstr "đã sửa" -#: merge-recursive.c:1590 +#: merge-recursive.c:1589 msgid "content" msgstr "nội dung" -#: merge-recursive.c:1597 +#: merge-recursive.c:1596 msgid "add/add" msgstr "thêm/thêm" -#: merge-recursive.c:1631 +#: merge-recursive.c:1630 #, 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:1645 +#: merge-recursive.c:1644 #, c-format msgid "Auto-merging %s" msgstr "Tự-động-hòa-trộn %s" -#: merge-recursive.c:1649 git-submodule.sh:1150 +#: merge-recursive.c:1648 git-submodule.sh:1150 msgid "submodule" msgstr "mô-đun-con" -#: merge-recursive.c:1650 +#: merge-recursive.c:1649 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s" -#: merge-recursive.c:1740 +#: merge-recursive.c:1735 #, c-format msgid "Removing %s" msgstr "Đang xóa %s" -#: merge-recursive.c:1765 +#: merge-recursive.c:1760 msgid "file/directory" msgstr "tập-tin/thư-mục" -#: merge-recursive.c:1771 +#: merge-recursive.c:1766 msgid "directory/file" msgstr "thư-mục/tập tin" -#: merge-recursive.c:1776 +#: merge-recursive.c:1771 #, 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:1786 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Thêm \"%s\"" -#: merge-recursive.c:1803 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Việc hòa trộn hỏng nghiêm trọng, không nên để xảy ra." -#: merge-recursive.c:1822 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Đã cập nhật rồi!" -#: merge-recursive.c:1831 +#: merge-recursive.c:1826 #, 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:1861 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "Đường dẫn chưa được xử lý??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "Đang trộn:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "tìm thấy %u tổ tiên chung:" msgstr[1] "tìm thấy %u tổ tiên chung:" -#: merge-recursive.c:1956 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "hòa trộn không trả về lần chuyển giao nào" -#: merge-recursive.c:2013 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "Không thể phân tích đối tượng “%s”" -#: merge-recursive.c:2024 builtin/merge.c:666 +#: merge-recursive.c:2019 builtin/merge.c:666 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục" @@ -875,33 +932,33 @@ 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:234 +#: object.c:241 #, c-format msgid "unable to parse object: %s" msgstr "không thể phân tích đối tượng: “%s”" -#: parse-options.c:534 +#: parse-options.c:546 msgid "..." msgstr "..." -#: parse-options.c:552 +#: parse-options.c:564 #, c-format msgid "usage: %s" msgstr "cách dùng: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:556 +#: parse-options.c:568 #, c-format msgid " or: %s" msgstr " hoặc: %s" -#: parse-options.c:559 +#: parse-options.c:571 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:593 +#: parse-options.c:605 msgid "-NUM" msgstr "-SỐ" @@ -970,11 +1027,15 @@ msgstr "" "Ở đây không có gì bị loại trừ bởi: các mẫu (loại trừ).\n" "Có lẽ bạn đã quên thêm hoặc là “:/” hoặc là “.”?" +#: pretty.c:968 +msgid "unable to parse --pretty format" +msgstr "không thể phân tích định dạng --pretty" + #: progress.c:225 msgid "done" msgstr "xong" -#: read-cache.c:1260 +#: read-cache.c:1261 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -983,7 +1044,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:1270 +#: read-cache.c:1271 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -992,52 +1053,52 @@ 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:753 +#: remote.c:782 #, 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:757 +#: remote.c:786 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s thường theo dõi %s, không phải %s" -#: remote.c:761 +#: remote.c:790 #, c-format msgid "%s tracks both %s and %s" msgstr "%s theo dõi cả %s và %s" -#: remote.c:769 +#: remote.c:798 msgid "Internal error" msgstr "Lỗi nội bộ" -#: remote.c:1943 +#: remote.c:1968 #, 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:1947 +#: remote.c:1972 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n" -#: remote.c:1950 +#: remote.c:1975 #, 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:1954 +#: remote.c:1979 #, 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" msgstr[1] "Nhánh của bạn đứng trước “%s” %d lần chuyển giao.\n" -#: remote.c:1960 +#: remote.c:1985 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:1963 +#: remote.c:1988 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1049,11 +1110,11 @@ msgstr[1] "" "Nhánh của bạn ở đằng sau “%s” %d lần chuyển giao, và có thể được fast-" "forward.\n" -#: remote.c:1971 +#: remote.c:1996 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:1974 +#: remote.c:1999 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1070,34 +1131,42 @@ msgstr[1] "" "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:1984 +#: remote.c:2009 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" -#: run-command.c:80 +#: run-command.c:87 msgid "open /dev/null failed" msgstr "gặp lỗi khi mở “/dev/null”" -#: run-command.c:82 +#: run-command.c:89 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) gặp lỗi" -#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893 -#: builtin/merge.c:1003 builtin/merge.c:1013 +#: send-pack.c:265 +msgid "failed to sign the push certificate" +msgstr "gặp lỗi khi ký chứng thực đẩy" + +#: send-pack.c:322 +msgid "the receiving end does not support --signed push" +msgstr "kết thúc nhận không hỗ trợ đẩy --signed" + +#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892 +#: builtin/merge.c:1002 builtin/merge.c:1012 #, c-format msgid "Could not open '%s' for writing" msgstr "Không thể mở “%s” để ghi" -#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785 -#: builtin/merge.c:1005 builtin/merge.c:1018 +#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784 +#: builtin/merge.c:1004 builtin/merge.c:1017 #, c-format msgid "Could not write to '%s'" msgstr "Không thể ghi vào “%s”" -#: sequencer.c:194 +#: sequencer.c:195 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1105,7 +1174,7 @@ msgstr "" "sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n" "với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”" -#: sequencer.c:197 +#: sequencer.c:198 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1115,71 +1184,67 @@ msgstr "" "với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”\n" "và chuyển giao kết quả bằng lệnh “git commit”" -#: sequencer.c:210 sequencer.c:841 sequencer.c:924 +#: sequencer.c:211 sequencer.c:852 sequencer.c:935 #, c-format msgid "Could not write to %s" msgstr "Không thể ghi vào %s" -#: sequencer.c:213 +#: sequencer.c:214 #, c-format msgid "Error wrapping up %s" msgstr "Lỗi bao bọc %s" -#: sequencer.c:228 +#: sequencer.c:229 msgid "Your local changes would be overwritten by cherry-pick." msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh cherry-pick." -#: sequencer.c:230 +#: sequencer.c:231 msgid "Your local changes would be overwritten by revert." msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh revert." -#: sequencer.c:233 +#: sequencer.c:234 msgid "Commit your changes or stash them to proceed." msgstr "Chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý." -#: sequencer.c:250 -msgid "Failed to lock HEAD during fast_forward_to" -msgstr "Gặp lỗi khi khóa HEAD trong quá trình fast_forward_to" - #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:293 +#: sequencer.c:304 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới" -#: sequencer.c:324 +#: sequencer.c:335 msgid "Could not resolve HEAD commit\n" msgstr "Không thể phân giải commit (lần chuyển giao) HEAD\n" -#: sequencer.c:344 +#: sequencer.c:355 msgid "Unable to update cache tree\n" msgstr "Không thể cập nhật cây bộ nhớ đệm\n" -#: sequencer.c:391 +#: sequencer.c:402 #, c-format msgid "Could not parse commit %s\n" msgstr "Không thể phân tích commit (lần chuyển giao) %s\n" -#: sequencer.c:396 +#: sequencer.c:407 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Không thể phân tích lần chuyển giao cha mẹ “%s”\n" -#: sequencer.c:462 +#: sequencer.c:473 msgid "Your index file is unmerged." msgstr "Tập tin lưu mục lục của bạn không được hòa trộn." -#: sequencer.c:481 +#: sequencer.c:492 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Lần chuyển giao %s là một lần hòa trộn nhưng không đưa ra tùy chọn -m." -#: sequencer.c:489 +#: sequencer.c:500 #, c-format msgid "Commit %s does not have parent %d" msgstr "Lần chuyển giao %s không có cha mẹ %d" -#: sequencer.c:493 +#: sequencer.c:504 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -1188,157 +1253,157 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:506 +#: sequencer.c:517 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s" -#: sequencer.c:510 +#: sequencer.c:521 #, c-format msgid "Cannot get commit message for %s" msgstr "Không thể lấy ghi chú lần chuyển giao cho %s" -#: sequencer.c:596 +#: sequencer.c:607 #, c-format msgid "could not revert %s... %s" msgstr "không thể revert %s... %s" -#: sequencer.c:597 +#: sequencer.c:608 #, c-format msgid "could not apply %s... %s" msgstr "không thể apply (áp dụng miếng vá) %s... %s" -#: sequencer.c:633 +#: sequencer.c:644 msgid "empty commit set passed" msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách" -#: sequencer.c:641 +#: sequencer.c:652 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: gặp lỗi đọc bảng mục lục" -#: sequencer.c:645 +#: sequencer.c:656 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục" -#: sequencer.c:705 +#: sequencer.c:716 #, c-format msgid "Cannot %s during a %s" msgstr "Không thể %s trong khi %s" -#: sequencer.c:727 +#: sequencer.c:738 #, c-format msgid "Could not parse line %d." msgstr "Không phân tích được dòng %d." -#: sequencer.c:732 +#: sequencer.c:743 msgid "No commits parsed." msgstr "Không có lần chuyển giao nào được phân tích." -#: sequencer.c:745 +#: sequencer.c:756 #, c-format msgid "Could not open %s" msgstr "Không thể mở %s" -#: sequencer.c:749 +#: sequencer.c:760 #, c-format msgid "Could not read %s." msgstr "Không thể đọc %s." -#: sequencer.c:756 +#: sequencer.c:767 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Bảng chỉ thị không thể dùng được: %s" -#: sequencer.c:786 +#: sequencer.c:797 #, c-format msgid "Invalid key: %s" msgstr "Khóa không đúng: %s" -#: sequencer.c:789 +#: sequencer.c:800 #, c-format msgid "Invalid value for %s: %s" msgstr "Giá trị không hợp lệ %s: %s" -#: sequencer.c:801 +#: sequencer.c:812 #, c-format msgid "Malformed options sheet: %s" msgstr "Bảng tùy chọn dị hình: %s" -#: sequencer.c:822 +#: sequencer.c:833 msgid "a cherry-pick or revert is already in progress" msgstr "có một thao tác “cherry-pick” hoặc “revert” đang được thực hiện" -#: sequencer.c:823 +#: sequencer.c:834 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:827 +#: sequencer.c:838 #, c-format msgid "Could not create sequencer directory %s" msgstr "Không thể tạo thư mục xếp dãy %s" -#: sequencer.c:843 sequencer.c:928 +#: sequencer.c:854 sequencer.c:939 #, c-format msgid "Error wrapping up %s." msgstr "Lỗi bao bọc %s." -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:873 sequencer.c:1009 msgid "no cherry-pick or revert in progress" msgstr "không cherry-pick hay revert trong tiến trình" -#: sequencer.c:864 +#: sequencer.c:875 msgid "cannot resolve HEAD" msgstr "không thể phân giải HEAD" -#: sequencer.c:866 +#: sequencer.c:877 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:888 builtin/apply.c:4062 +#: sequencer.c:899 builtin/apply.c:4128 #, c-format msgid "cannot open %s: %s" msgstr "không thể mở %s: %s" -#: sequencer.c:891 +#: sequencer.c:902 #, c-format msgid "cannot read %s: %s" msgstr "không thể đọc %s: %s" -#: sequencer.c:892 +#: sequencer.c:903 msgid "unexpected end of file" msgstr "gặp kết thúc tập tin đột xuất" -#: sequencer.c:898 +#: sequencer.c:909 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng" -#: sequencer.c:921 +#: sequencer.c:932 #, c-format msgid "Could not format %s." msgstr "Không thể định dạng “%s”." -#: sequencer.c:1066 +#: sequencer.c:1077 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: không thể cherry-pick một %s" -#: sequencer.c:1069 +#: sequencer.c:1080 #, c-format msgid "%s: bad revision" msgstr "%s: điểm xét duyệt sai" -#: sequencer.c:1103 +#: sequencer.c:1114 msgid "Can't revert as initial commit" msgstr "Không thể revert một lần chuyển giao khởi tạo" -#: sequencer.c:1104 +#: sequencer.c:1115 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:439 +#: sha1_name.c:440 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" @@ -1362,21 +1427,21 @@ msgstr "" "này\n" "bằng cách chạy lệnh \"git config advice.objectNameWarning false\"" -#: sha1_name.c:1060 +#: 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:1063 +#: 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:1065 +#: 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:1069 +#: sha1_name.c:1077 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" @@ -1407,16 +1472,41 @@ 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:1118 builtin/init-db.c:363 +#: submodule.c:1111 builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "Không thể tạo liên kết git “%s”" -#: submodule.c:1129 +#: submodule.c:1122 #, c-format msgid "Could not set core.worktree in %s" msgstr "Không thể đặt “core.worktree” trong “%s”." +#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565 +#: trailer.c:569 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "không hiểu giá trị “%s” cho khóa “%s”" + +#: trailer.c:551 trailer.c:556 builtin/remote.c:288 +#, c-format +msgid "more than one %s" +msgstr "nhiều hơn một %s" + +#: trailer.c:589 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s”" + +#: trailer.c:709 +#, c-format +msgid "could not read input file '%s'" +msgstr "không đọc được tập tin đầu vào “%s”" + +#: trailer.c:712 +msgid "could not read from stdin" +msgstr "không thể đọc từ đầu vào tiêu chuẩn" + #: unpack-trees.c:202 msgid "Checking out files" msgstr "Đang lấy ra các tập tin" @@ -1450,25 +1540,29 @@ msgstr "tên cổng không hợp lệ" msgid "invalid '..' path segment" msgstr "đoạn đường dẫn “..” không hợp lệ" -#: wrapper.c:460 +#: wrapper.c:509 #, c-format msgid "unable to access '%s': %s" msgstr "không thể truy cập “%s”: %s" -#: wrapper.c:481 +#: wrapper.c:530 #, c-format msgid "unable to access '%s'" msgstr "không thể truy cập “%s”" -#: wrapper.c:492 +#: wrapper.c:541 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "không tìm thấy người dùng hiện tại trong tập tin passwd: %s" -#: wrapper.c:493 +#: wrapper.c:542 msgid "no such user" msgstr "không có người dùng như vậy" +#: wrapper.c:550 +msgid "unable to get current working directory" +msgstr "Không thể lấy thư mục làm việc hiện hành" + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Những đường dẫn chưa được hòa trộn:" @@ -1614,15 +1708,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:764 +#: wt-status.c:761 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:766 +#: wt-status.c:763 msgid "Submodule changes to be committed:" msgstr "Những mô-đun-con thay đổi đã được chuyển giao:" -#: wt-status.c:845 +#: wt-status.c:842 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1630,72 +1724,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:936 +#: wt-status.c:933 msgid "You have unmerged paths." msgstr "Bạn có những đường dẫn chưa được hòa trộn." -#: wt-status.c:939 +#: wt-status.c:936 msgid " (fix conflicts and run \"git commit\")" msgstr " (sửa các xung đột rồi chạy \"git commit\")" -#: wt-status.c:942 +#: wt-status.c:939 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:945 +#: wt-status.c:942 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:955 +#: wt-status.c:952 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:958 +#: wt-status.c:955 msgid "The current patch is empty." msgstr "Miếng vá hiện tại bị trống rỗng." -#: wt-status.c:962 +#: wt-status.c:959 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:964 +#: wt-status.c:961 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:966 +#: wt-status.c:963 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:1026 wt-status.c:1043 +#: wt-status.c:1023 wt-status.c:1040 #, 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:1031 wt-status.c:1048 +#: wt-status.c:1028 wt-status.c:1045 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:1034 +#: wt-status.c:1031 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:1036 +#: wt-status.c:1033 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:1038 +#: wt-status.c:1035 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:1051 +#: wt-status.c:1048 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:1055 +#: wt-status.c:1052 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1703,126 +1797,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:1060 +#: wt-status.c:1057 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:1063 +#: wt-status.c:1060 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:1067 +#: wt-status.c:1064 #, 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:1072 +#: wt-status.c:1069 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:1075 +#: wt-status.c:1072 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:1077 +#: wt-status.c:1074 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:1087 +#: wt-status.c:1084 #, 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:1092 +#: wt-status.c:1089 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:1095 +#: wt-status.c:1092 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:1097 +#: wt-status.c:1094 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:1106 +#: wt-status.c:1103 #, 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:1111 +#: wt-status.c:1108 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:1114 +#: wt-status.c:1111 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:1116 +#: wt-status.c:1113 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:1127 +#: wt-status.c:1124 #, 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:1131 +#: wt-status.c:1128 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:1134 +#: wt-status.c:1131 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:1309 +#: wt-status.c:1306 msgid "On branch " msgstr "Trên nhánh " -#: wt-status.c:1316 +#: wt-status.c:1313 msgid "rebase in progress; onto " msgstr "rebase đang được thực hiện: lên trên " -#: wt-status.c:1323 +#: wt-status.c:1320 msgid "HEAD detached at " msgstr "HEAD được tách rời tại " -#: wt-status.c:1325 +#: wt-status.c:1322 msgid "HEAD detached from " msgstr "HEAD được tách rời từ " -#: wt-status.c:1328 +#: wt-status.c:1325 msgid "Not currently on any branch." msgstr "Hiện tại chẳng ở nhánh nào cả." -#: wt-status.c:1345 +#: wt-status.c:1342 msgid "Initial commit" msgstr "Lần chuyển giao khởi tạo" -#: wt-status.c:1359 +#: wt-status.c:1356 msgid "Untracked files" msgstr "Những tập tin chưa được theo dõi" -#: wt-status.c:1361 +#: wt-status.c:1358 msgid "Ignored files" msgstr "Những tập tin bị lờ đi" -#: wt-status.c:1365 +#: wt-status.c:1362 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1834,32 +1928,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:1371 +#: wt-status.c:1368 #, 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:1373 +#: wt-status.c:1370 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:1379 +#: wt-status.c:1376 msgid "No changes" msgstr "Không có thay đổi nào" -#: wt-status.c:1384 +#: wt-status.c:1381 #, 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:1387 +#: wt-status.c:1384 #, 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:1390 +#: wt-status.c:1387 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1868,99 +1962,99 @@ 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:1393 +#: wt-status.c:1390 #, 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:1396 +#: wt-status.c:1393 #, 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:1399 wt-status.c:1404 +#: wt-status.c:1396 wt-status.c:1401 #, c-format msgid "nothing to commit\n" msgstr "không có gì để chuyển giao\n" -#: wt-status.c:1402 +#: wt-status.c:1399 #, 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:1406 +#: wt-status.c:1403 #, 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:1515 +#: wt-status.c:1512 msgid "HEAD (no branch)" msgstr "HEAD (không nhánh)" -#: wt-status.c:1521 +#: wt-status.c:1518 msgid "Initial commit on " msgstr "Lần chuyển giao khởi tạo trên " -#: wt-status.c:1553 +#: wt-status.c:1550 msgid "gone" msgstr "đã ra đi" -#: wt-status.c:1555 wt-status.c:1563 +#: wt-status.c:1552 wt-status.c:1560 msgid "behind " msgstr "đằng sau " -#: compat/precompose_utf8.c:55 builtin/clone.c:356 +#: compat/precompose_utf8.c:55 builtin/clone.c:357 #, c-format msgid "failed to unlink '%s'" msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”" -#: builtin/add.c:21 +#: builtin/add.c:22 msgid "git add [options] [--] <pathspec>..." msgstr "git add [các-tùy-chọn] [--] <pathspec>..." -#: builtin/add.c:64 +#: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "trạng thái lệnh diff không như mong đợi %c" -#: builtin/add.c:69 builtin/commit.c:261 +#: builtin/add.c:70 builtin/commit.c:275 msgid "updating files failed" msgstr "Cập nhật tập tin gặp lỗi" -#: builtin/add.c:79 +#: builtin/add.c:80 #, c-format msgid "remove '%s'\n" msgstr "gỡ bỏ “%s”\n" -#: builtin/add.c:133 +#: builtin/add.c:134 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:193 builtin/rev-parse.c:781 +#: builtin/add.c:194 builtin/rev-parse.c:785 msgid "Could not read the index" msgstr "Không thể đọc bảng mục lục" -#: builtin/add.c:204 +#: builtin/add.c:205 #, c-format msgid "Could not open '%s' for writing." msgstr "Không thể mở “%s” để ghi." -#: builtin/add.c:208 +#: builtin/add.c:209 msgid "Could not write patch" msgstr "Không thể ghi ra miếng vá" -#: builtin/add.c:213 +#: builtin/add.c:214 #, c-format msgid "Could not stat '%s'" msgstr "không thể lấy thông tin thống kê về “%s”" -#: builtin/add.c:215 +#: builtin/add.c:216 msgid "Empty patch. Aborted." msgstr "Miếng vá trống rỗng. Nên bỏ qua." @@ -1975,15 +2069,15 @@ 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:875 builtin/fetch.c:108 builtin/mv.c:70 -#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375 #: builtin/rm.c:269 msgid "dry run" msgstr "chạy thử" -#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19 -#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606 -#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113 +#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 +#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "chi tiết" @@ -1991,7 +2085,7 @@ msgstr "chi tiết" msgid "interactive picking" msgstr "sửa bằng cách tương tác" -#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286 msgid "select hunks interactively" msgstr "chọn “hunks” theo kiểu tương tác" @@ -2067,77 +2161,77 @@ 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:919 -#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 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:4506 builtin/mv.c:280 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Không thể ghi tập tin lưu bảng mục lục mới" -#: builtin/apply.c:57 +#: builtin/apply.c:58 msgid "git apply [options] [<patch>...]" msgstr "git apply [các-tùy-chọn] [<miếng-vá>...]" -#: builtin/apply.c:110 +#: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "không nhận ra tùy chọn về khoảng trắng “%s”" -#: builtin/apply.c:125 +#: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng “%s”" -#: builtin/apply.c:825 +#: builtin/apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" "Không thể chuẩn bị biểu thức chính qui dấu vết thời gian (timestamp regexp) " "%s" -#: builtin/apply.c:834 +#: builtin/apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "thi hành biểu thức chính quy trả về %d cho đầu vào: %s" -#: builtin/apply.c:915 +#: builtin/apply.c:916 #, c-format msgid "unable to find filename in patch at line %d" msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d" -#: builtin/apply.c:947 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d" -#: builtin/apply.c:951 +#: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d" -#: builtin/apply.c:952 +#: builtin/apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d" -#: builtin/apply.c:959 +#: builtin/apply.c:960 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff sai - cần “/dev/null” trên dòng %d" -#: builtin/apply.c:1422 +#: builtin/apply.c:1423 #, c-format msgid "recount: unexpected line: %.*s" msgstr "chi tiết: dòng không cần: %.*s" -#: builtin/apply.c:1479 +#: builtin/apply.c:1480 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s" -#: builtin/apply.c:1496 +#: builtin/apply.c:1497 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2152,77 +2246,77 @@ msgstr[1] "" "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:1657 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:1659 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:1685 #, 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:1721 #, 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:1723 #, 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:1726 #, 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:1872 #, 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:1901 #, 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:1986 +#: builtin/apply.c:2052 #, 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:2076 +#: builtin/apply.c:2142 #, c-format msgid "unable to read symlink %s" msgstr "không thể đọc liên kết mềm %s" -#: builtin/apply.c:2080 +#: builtin/apply.c:2146 #, c-format msgid "unable to open or read %s" msgstr "không thể mở hay đọc %s" -#: builtin/apply.c:2688 +#: builtin/apply.c:2754 #, c-format msgid "invalid start of line: '%c'" msgstr "sai khởi đầu dòng: “%c”" -#: builtin/apply.c:2806 +#: builtin/apply.c:2872 #, 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)." msgstr[1] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)." -#: builtin/apply.c:2818 +#: builtin/apply.c:2884 #, 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:2824 +#: builtin/apply.c:2890 #, c-format msgid "" "while searching for:\n" @@ -2231,324 +2325,324 @@ msgstr "" "trong khi đang tìm kiếm cho:\n" "%.*s" -#: builtin/apply.c:2843 +#: builtin/apply.c:2909 #, 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:2944 +#: builtin/apply.c:3010 #, 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:2950 +#: builtin/apply.c:3016 #, 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:2971 +#: builtin/apply.c:3037 #, c-format msgid "patch failed: %s:%ld" msgstr "gặp lỗi khi vá: %s:%ld" -#: builtin/apply.c:3095 +#: builtin/apply.c:3161 #, c-format msgid "cannot checkout %s" msgstr "không thể lấy ra %s" -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 +#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 #, c-format msgid "read of %s failed" msgstr "đọc %s gặp lỗi" -#: builtin/apply.c:3174 builtin/apply.c:3396 +#: builtin/apply.c:3240 builtin/apply.c:3462 #, 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:3255 builtin/apply.c:3410 +#: builtin/apply.c:3321 builtin/apply.c:3476 #, 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:3259 builtin/apply.c:3402 builtin/apply.c:3424 +#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3264 builtin/apply.c:3418 +#: builtin/apply.c:3330 builtin/apply.c:3484 #, c-format msgid "%s: does not match index" msgstr "%s: không khớp trong mục lục" -#: builtin/apply.c:3366 +#: builtin/apply.c:3432 msgid "removal patch leaves file contents" msgstr "loại bỏ miếng vá để lại nội dung tập tin" -#: builtin/apply.c:3435 +#: builtin/apply.c:3501 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiểu" -#: builtin/apply.c:3437 +#: builtin/apply.c:3503 #, c-format msgid "%s has type %o, expected %o" msgstr "%s có kiểu %o, cần %o" -#: builtin/apply.c:3538 +#: builtin/apply.c:3604 #, c-format msgid "%s: already exists in index" msgstr "%s: đã có từ trước trong bảng mục lục" -#: builtin/apply.c:3541 +#: builtin/apply.c:3607 #, 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:3561 +#: builtin/apply.c:3627 #, 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:3566 +#: builtin/apply.c:3632 #, 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:3574 +#: builtin/apply.c:3640 #, c-format msgid "%s: patch does not apply" msgstr "%s: miếng vá không được áp dụng" -#: builtin/apply.c:3587 +#: builtin/apply.c:3653 #, c-format msgid "Checking patch %s..." msgstr "Đang kiểm tra miếng vá %s..." -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134 +#: builtin/apply.c:3746 builtin/checkout.c:213 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:3823 +#: builtin/apply.c:3889 #, c-format msgid "unable to remove %s from index" msgstr "không thể gỡ bỏ %s từ mục lục" -#: builtin/apply.c:3852 +#: builtin/apply.c:3918 #, c-format msgid "corrupt patch for submodule %s" msgstr "miếng vá sai hỏng cho mô-đun-con %s" -#: builtin/apply.c:3856 +#: builtin/apply.c:3922 #, 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:3861 +#: builtin/apply.c:3927 #, 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:3864 builtin/apply.c:3972 +#: builtin/apply.c:3930 builtin/apply.c:4038 #, 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:3897 +#: builtin/apply.c:3963 #, c-format msgid "closing file '%s'" msgstr "đang đóng tập tin “%s”" -#: builtin/apply.c:3946 +#: builtin/apply.c:4012 #, 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:4033 +#: builtin/apply.c:4099 #, 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:4041 +#: builtin/apply.c:4107 msgid "internal error" msgstr "lỗi nội bộ" -#: builtin/apply.c:4044 +#: builtin/apply.c:4110 #, 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..." msgstr[1] "Đang áp dụng miếng vá %%s với %d lần từ chối..." -#: builtin/apply.c:4054 +#: builtin/apply.c:4120 #, 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:4075 +#: builtin/apply.c:4141 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khối nhớ #%d được áp dụng gọn gàng." -#: builtin/apply.c:4078 +#: builtin/apply.c:4144 #, c-format msgid "Rejected hunk #%d." msgstr "đoạn dữ liệu #%d bị từ chối." -#: builtin/apply.c:4228 +#: builtin/apply.c:4234 msgid "unrecognized input" msgstr "không thừa nhận đầu vào" -#: builtin/apply.c:4239 +#: builtin/apply.c:4245 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:4358 builtin/apply.c:4361 builtin/clone.c:90 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91 #: builtin/fetch.c:93 msgid "path" msgstr "đường-dẫn" -#: builtin/apply.c:4359 +#: builtin/apply.c:4363 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:4362 +#: builtin/apply.c:4366 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:4364 +#: builtin/apply.c:4368 msgid "num" msgstr "số" -#: builtin/apply.c:4365 +#: builtin/apply.c:4369 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:4368 +#: builtin/apply.c:4372 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:4370 +#: builtin/apply.c:4374 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:4374 +#: builtin/apply.c:4378 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:4376 +#: builtin/apply.c:4380 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:4378 +#: builtin/apply.c:4382 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:4380 +#: builtin/apply.c:4384 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:4382 +#: builtin/apply.c:4386 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:4384 +#: builtin/apply.c:4388 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:4386 +#: builtin/apply.c:4390 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:4388 +#: builtin/apply.c:4392 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:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 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:4393 +#: builtin/apply.c:4397 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:4394 +#: builtin/apply.c:4398 msgid "action" msgstr "hành động" -#: builtin/apply.c:4395 +#: builtin/apply.c:4399 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:4398 builtin/apply.c:4401 +#: builtin/apply.c:4402 builtin/apply.c:4405 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:4404 +#: builtin/apply.c:4408 msgid "apply the patch in reverse" msgstr "áp dụng miếng vá theo chiều ngược" -#: builtin/apply.c:4406 +#: builtin/apply.c:4410 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:4408 +#: builtin/apply.c:4412 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:4410 +#: builtin/apply.c:4414 msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhớ" -#: builtin/apply.c:4413 +#: builtin/apply.c:4417 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:4416 +#: builtin/apply.c:4420 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:4418 +#: builtin/apply.c:4422 msgid "root" msgstr "root" -#: builtin/apply.c:4419 +#: builtin/apply.c:4423 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:4441 +#: builtin/apply.c:4445 msgid "--3way outside a repository" msgstr "--3way ở ngoài một kho chứa" -#: builtin/apply.c:4449 +#: builtin/apply.c:4453 msgid "--index outside a repository" msgstr "--index ở ngoài một kho chứa" -#: builtin/apply.c:4452 +#: builtin/apply.c:4456 msgid "--cached outside a repository" msgstr "--cached ở ngoài một kho chứa" -#: builtin/apply.c:4468 +#: builtin/apply.c:4472 #, c-format msgid "can't open patch '%s'" msgstr "không thể mở miếng vá “%s”" -#: builtin/apply.c:4482 +#: builtin/apply.c:4486 #, 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" msgstr[1] "đã chấm dứt %d lỗi khoảng trắng" -#: builtin/apply.c:4488 builtin/apply.c:4498 +#: builtin/apply.c:4492 builtin/apply.c:4502 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2711,7 +2805,7 @@ msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2599 +#: builtin/blame.c:2602 msgid "4 years, 11 months ago" msgstr "4 năm, 11 tháng trước" @@ -2731,7 +2825,7 @@ msgstr "git branch [các-tùy-chọn] [-r] (-d | -D) <tên-nhánh> ..." msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "git branch [các-tùy-chọn] (-m | -M) [<nhánh-cũ>] <nhánh-mới>" -#: builtin/branch.c:150 +#: builtin/branch.c:152 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2740,7 +2834,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:154 +#: builtin/branch.c:156 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2749,12 +2843,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:168 +#: builtin/branch.c:170 #, 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:172 +#: builtin/branch.c:174 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2763,301 +2857,301 @@ 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:185 +#: builtin/branch.c:187 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:213 +#: builtin/branch.c:215 msgid "cannot use -a with -d" msgstr "không thể dùng tùy chọn -a với -d" -#: builtin/branch.c:219 +#: builtin/branch.c:221 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:227 +#: builtin/branch.c:229 #, 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:240 +#: builtin/branch.c:245 #, c-format msgid "remote branch '%s' not found." msgstr "không tìm thấy nhánh máy chủ “%s”." -#: builtin/branch.c:241 +#: builtin/branch.c:246 #, c-format msgid "branch '%s' not found." msgstr "không tìm thấy nhánh “%s”." -#: builtin/branch.c:255 +#: builtin/branch.c:260 #, 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”" -#: builtin/branch.c:256 +#: builtin/branch.c:261 #, c-format msgid "Error deleting branch '%s'" msgstr "Gặp lỗi khi xoá bỏ nhánh “%s”" -#: builtin/branch.c:263 +#: builtin/branch.c:268 #, 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" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n" -#: builtin/branch.c:366 +#: builtin/branch.c:370 #, 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:454 +#: builtin/branch.c:459 #, c-format msgid "[%s: gone]" msgstr "[%s: đã ra đi]" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:464 +#: builtin/branch.c:469 #, c-format msgid "[%s: behind %d]" msgstr "[%s: đằng sau %d]" -#: builtin/branch.c:466 +#: builtin/branch.c:471 #, c-format msgid "[behind %d]" msgstr "[đằng sau %d]" -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: phía trước %d]" -#: builtin/branch.c:472 +#: builtin/branch.c:477 #, c-format msgid "[ahead %d]" msgstr "[phía trước %d]" -#: builtin/branch.c:475 +#: builtin/branch.c:480 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: trước %d, sau %d]" -#: builtin/branch.c:478 +#: builtin/branch.c:483 #, c-format msgid "[ahead %d, behind %d]" msgstr "[trước %d, sau %d]" -#: builtin/branch.c:502 +#: builtin/branch.c:496 msgid " **** invalid ref ****" msgstr " **** tham chiếu không hợp lệ ****" -#: builtin/branch.c:594 +#: builtin/branch.c:587 #, c-format msgid "(no branch, rebasing %s)" msgstr "(không nhánh, đang cải tổ %s)" -#: builtin/branch.c:597 +#: builtin/branch.c:590 #, 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:600 +#: builtin/branch.c:593 #, c-format msgid "(detached from %s)" msgstr "(được tách rời từ %s)" -#: builtin/branch.c:603 +#: builtin/branch.c:596 msgid "(no branch)" msgstr "(không nhánh)" -#: builtin/branch.c:649 +#: builtin/branch.c:643 #, 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:681 +#: builtin/branch.c:691 msgid "some refs could not be read" msgstr "một số tham chiếu đã không thể đọc được" -#: builtin/branch.c:694 +#: builtin/branch.c:704 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:704 +#: builtin/branch.c:714 #, c-format msgid "Invalid branch name: '%s'" msgstr "Tên nhánh không hợp lệ: “%s”" -#: builtin/branch.c:719 +#: builtin/branch.c:729 msgid "Branch rename failed" msgstr "Gặp lỗi khi đổi tên nhánh" -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Đã đổi tên nhánh khuyết danh “%s” đi" -#: builtin/branch.c:727 +#: builtin/branch.c:737 #, 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:734 +#: builtin/branch.c:744 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:749 +#: builtin/branch.c:759 #, c-format msgid "malformed object name %s" msgstr "tên đối tượng dị hình %s" -#: builtin/branch.c:773 +#: builtin/branch.c:783 #, 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:803 +#: builtin/branch.c:813 msgid "Generic options" msgstr "Tùy chọn chung" -#: builtin/branch.c:805 +#: builtin/branch.c:815 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:806 +#: builtin/branch.c:816 msgid "suppress informational messages" msgstr "không xuất các thông tin" -#: builtin/branch.c:807 +#: builtin/branch.c:817 msgid "set up tracking mode (see git-pull(1))" msgstr "cài đặt chế độ theo dõi (xem git-pull(1))" -#: builtin/branch.c:809 +#: builtin/branch.c:819 msgid "change upstream info" msgstr "thay đổi thông tin thượng nguồn" -#: builtin/branch.c:813 +#: builtin/branch.c:823 msgid "use colored output" msgstr "tô màu kết xuất" -#: builtin/branch.c:814 +#: builtin/branch.c:824 msgid "act on remote-tracking branches" msgstr "thao tác trên nhánh “remote-tracking”" -#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 -#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574 -#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615 -#: builtin/tag.c:621 +#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 +#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623 +#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616 +#: builtin/tag.c:622 msgid "commit" msgstr "lần_chuyển_giao" -#: builtin/branch.c:818 builtin/branch.c:824 +#: builtin/branch.c:828 builtin/branch.c:834 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:830 +#: builtin/branch.c:840 msgid "Specific git-branch actions:" msgstr "Hành động git-branch:" -#: builtin/branch.c:831 +#: builtin/branch.c:841 msgid "list both remote-tracking and local branches" msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ" -#: builtin/branch.c:833 +#: builtin/branch.c:843 msgid "delete fully merged branch" msgstr "xóa một toàn bộ nhánh đã hòa trộn" -#: builtin/branch.c:834 +#: builtin/branch.c:844 msgid "delete branch (even if not merged)" msgstr "xoá nhánh (cho dù là chưa được hòa trộn)" -#: builtin/branch.c:835 +#: builtin/branch.c:845 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:836 +#: builtin/branch.c:846 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:837 +#: builtin/branch.c:847 msgid "list branch names" msgstr "liệt kê các tên nhánh" -#: builtin/branch.c:838 +#: builtin/branch.c:848 msgid "create the branch's reflog" msgstr "tạo reflog của nhánh" -#: builtin/branch.c:840 +#: builtin/branch.c:850 msgid "edit the description for the branch" msgstr "sửa mô tả cho nhánh" -#: builtin/branch.c:841 +#: builtin/branch.c:851 msgid "force creation (when already exists)" msgstr "ép buộc tạo (khi đã có nhánh cùng tên)" -#: builtin/branch.c:844 +#: builtin/branch.c:854 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:850 +#: builtin/branch.c:860 msgid "print only merged branches" msgstr "chỉ hiển thị các nhánh đã hòa trộn" -#: builtin/branch.c:854 +#: builtin/branch.c:864 msgid "list branches in columns" msgstr "liệt kê các nhánh trong các cột" -#: builtin/branch.c:867 +#: builtin/branch.c:877 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 (ref) hợp lệ." +msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ." -#: builtin/branch.c:872 builtin/clone.c:636 +#: builtin/branch.c:881 builtin/clone.c:634 msgid "HEAD not found below refs/heads!" msgstr "không tìm thấy HEAD ở dưới refs/heads!" -#: builtin/branch.c:896 +#: builtin/branch.c:903 msgid "--column and --verbose are incompatible" msgstr "tùy chọn --column và --verbose xung khắc nhau" -#: builtin/branch.c:902 builtin/branch.c:941 +#: builtin/branch.c:909 builtin/branch.c:948 msgid "branch name required" msgstr "cần chỉ ra tên nhánh" -#: builtin/branch.c:917 +#: builtin/branch.c:924 msgid "Cannot give description to detached HEAD" msgstr "Không thể đưa ra mô tả HEAD đã tách rời" -#: builtin/branch.c:922 +#: builtin/branch.c:929 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:929 +#: builtin/branch.c:936 #, 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:932 +#: builtin/branch.c:939 #, c-format msgid "No branch named '%s'." msgstr "Không có nhánh nào có tên “%s”." -#: builtin/branch.c:947 +#: builtin/branch.c:954 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:952 +#: builtin/branch.c:959 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:956 +#: builtin/branch.c:963 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3065,40 +3159,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:959 builtin/branch.c:981 builtin/branch.c:1002 +#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009 #, c-format msgid "no such branch '%s'" msgstr "không có nhánh nào như thế “%s”" -#: builtin/branch.c:963 +#: builtin/branch.c:970 #, c-format msgid "branch '%s' does not exist" msgstr "chưa có nhánh “%s”" -#: builtin/branch.c:975 +#: builtin/branch.c:982 msgid "too many branches to unset upstream" msgstr "quá nhiều nhánh để bỏ đặt thượng nguồn" -#: builtin/branch.c:979 +#: builtin/branch.c:986 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:985 +#: builtin/branch.c:992 #, 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:999 +#: builtin/branch.c:1006 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:1005 +#: builtin/branch.c:1012 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:1008 +#: builtin/branch.c:1015 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3107,7 +3201,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:1025 +#: builtin/branch.c:1032 #, c-format msgid "" "\n" @@ -3118,12 +3212,12 @@ msgstr "" "Nếu bạn muốn “%s” theo dõi “%s”, thực hiện lệnh sau:\n" "\n" -#: builtin/branch.c:1026 +#: builtin/branch.c:1033 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1027 +#: builtin/branch.c:1034 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3141,44 +3235,44 @@ msgstr "Cần một kho chứa để có thể tạo một bundle." msgid "Need a repository to unbundle." msgstr "Cần một kho chứa để có thể giải nén một bundle." -#: builtin/cat-file.c:331 +#: builtin/cat-file.c:332 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:332 +#: builtin/cat-file.c:333 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:369 +#: builtin/cat-file.c:370 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:370 +#: builtin/cat-file.c:371 msgid "show object type" msgstr "hiển thị kiểu đối tượng" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:372 msgid "show object size" msgstr "hiển thị kích thước đối tượng" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:374 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:374 +#: builtin/cat-file.c:375 msgid "pretty-print object's content" msgstr "in nội dung đối tượng dạng dễ đọc" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:377 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:378 +#: builtin/cat-file.c:379 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:381 +#: builtin/cat-file.c:382 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" @@ -3199,7 +3293,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:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn" @@ -3207,7 +3301,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:1083 builtin/gc.c:285 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274 msgid "suppress progress reporting" msgstr "chặn các báo cáo tiến trình hoạt động" @@ -3373,46 +3467,46 @@ msgstr "đường dẫn “%s” không được hòa trộn" msgid "you need to resolve your current index first" msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã" -#: builtin/checkout.c:591 +#: builtin/checkout.c:597 #, 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:629 +#: builtin/checkout.c:635 msgid "HEAD is now at" msgstr "HEAD hiện giờ tại" -#: builtin/checkout.c:636 +#: builtin/checkout.c:642 #, c-format msgid "Reset branch '%s'\n" msgstr "Đặt lại nhánh “%s”\n" -#: builtin/checkout.c:639 +#: builtin/checkout.c:645 #, c-format msgid "Already on '%s'\n" msgstr "Đã sẵn sàng trên “%s”\n" -#: builtin/checkout.c:643 +#: builtin/checkout.c:649 #, 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:645 builtin/checkout.c:1026 +#: builtin/checkout.c:651 builtin/checkout.c:1032 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Đã chuyển đến nhánh mới “%s”\n" -#: builtin/checkout.c:647 +#: builtin/checkout.c:653 #, c-format msgid "Switched to branch '%s'\n" msgstr "Đã chuyển đến nhánh “%s”\n" -#: builtin/checkout.c:699 +#: builtin/checkout.c:705 #, c-format msgid " ... and %d more.\n" msgstr " ... và nhiều hơn %d.\n" -#: builtin/checkout.c:705 +#: builtin/checkout.c:711 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3437,7 +3531,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:723 +#: builtin/checkout.c:729 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3453,141 +3547,141 @@ msgstr "" " git branch tên_nhánh_mới %s\n" "\n" -#: builtin/checkout.c:753 +#: builtin/checkout.c:759 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:757 +#: builtin/checkout.c:763 msgid "Previous HEAD position was" msgstr "Vị trí trước kia của HEAD là" -#: builtin/checkout.c:784 builtin/checkout.c:1021 +#: builtin/checkout.c:790 builtin/checkout.c:1027 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:928 +#: builtin/checkout.c:934 #, 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:967 +#: builtin/checkout.c:973 #, c-format msgid "invalid reference: %s" msgstr "tham chiếu không hợp lệ: %s" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1002 #, 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:1035 +#: builtin/checkout.c:1041 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:1038 builtin/checkout.c:1042 +#: builtin/checkout.c:1044 builtin/checkout.c:1048 #, 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:1046 builtin/checkout.c:1049 builtin/checkout.c:1054 -#: builtin/checkout.c:1057 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 +#: builtin/checkout.c:1063 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "“%s” không thể được dùng với “%s”" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1068 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Không thể chuyển nhánh đến một non-commit “%s”" -#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "nhánh" -#: builtin/checkout.c:1085 +#: builtin/checkout.c:1091 msgid "create and checkout a new branch" msgstr "tạo và checkout một nhánh mới" -#: builtin/checkout.c:1087 +#: builtin/checkout.c:1093 msgid "create/reset and checkout a branch" msgstr "tạo/đặt_lại và checkout một nhánh" -#: builtin/checkout.c:1088 +#: builtin/checkout.c:1094 msgid "create reflog for new branch" msgstr "tạo reflog cho nhánh mới" -#: builtin/checkout.c:1089 +#: builtin/checkout.c:1095 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:1090 +#: builtin/checkout.c:1096 msgid "set upstream info for new branch" msgstr "đặt thông tin thượng nguồn cho nhánh mới" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new-branch" msgstr "nhánh-mới" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new unparented branch" msgstr "nhánh không cha mới" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1099 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:1095 +#: builtin/checkout.c:1101 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:1097 +#: builtin/checkout.c:1103 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:1098 +#: builtin/checkout.c:1104 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:1099 builtin/merge.c:225 +#: builtin/checkout.c:1105 builtin/merge.c:226 msgid "update ignored files (default)" msgstr "cập nhật các tập tin bị bỏ qua (mặc định)" -#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245 +#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245 msgid "style" msgstr "kiểu" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1107 msgid "conflict style (merge or diff3)" msgstr "xung đột kiểu (hòa trộn hoặc diff3)" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1110 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:1106 +#: builtin/checkout.c:1112 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:1129 +#: builtin/checkout.c:1135 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:1146 +#: builtin/checkout.c:1152 msgid "--track needs a branch name" msgstr "--track cần tên một nhánh" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1157 msgid "Missing branch name; try -b" msgstr "Thiếu tên nhánh; hãy thử -b" -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1194 msgid "invalid path specification" msgstr "đường dẫn đã cho không hợp lệ" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1201 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3597,12 +3691,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:1202 +#: builtin/checkout.c:1206 #, 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:1206 +#: builtin/checkout.c:1210 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3753,7 +3847,7 @@ msgstr "dọn bằng kiểu tương tác" msgid "remove whole directories" msgstr "gỡ bỏ toàn bộ thư mục" -#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714 +#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "mẫu" @@ -3790,145 +3884,145 @@ msgstr "" "clean.requireForce mặc định được đặt là true và không đưa ra tùy chọn -i, -n " "mà cũng không -f; từ chối lệnh dọn dẹp (clean)" -#: builtin/clone.c:36 +#: builtin/clone.c:37 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [các-tùy-chọn] [--] <kho> [<t.mục>]" -#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222 -#: builtin/push.c:503 +#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223 +#: builtin/push.c:514 msgid "force progress reporting" msgstr "ép buộc báo cáo tiến triển công việc" -#: builtin/clone.c:66 +#: builtin/clone.c:67 msgid "don't create a checkout" msgstr "không tạo một checkout" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 msgid "create a bare repository" msgstr "tạo kho thuần" -#: builtin/clone.c:71 +#: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" msgstr "tạo kho bản sao (ý là kho thuần)" -#: builtin/clone.c:73 +#: builtin/clone.c:74 msgid "to clone from a local repository" msgstr "để nhân bản từ kho nội bộ" -#: builtin/clone.c:75 +#: builtin/clone.c:76 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:77 +#: builtin/clone.c:78 msgid "setup as shared repository" msgstr "cài đặt đây là kho chia sẻ" -#: builtin/clone.c:79 builtin/clone.c:81 +#: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" msgstr "khởi tạo mô-đun-con trong bản sao" -#: builtin/clone.c:82 builtin/init-db.c:483 +#: builtin/clone.c:83 builtin/init-db.c:485 msgid "template-directory" msgstr "thư-mục-mẫu" -#: builtin/clone.c:83 builtin/init-db.c:484 +#: builtin/clone.c:84 builtin/init-db.c:486 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:85 +#: builtin/clone.c:86 msgid "reference repository" msgstr "kho tham chiếu" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "tên" -#: builtin/clone.c:87 +#: builtin/clone.c:88 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:89 +#: builtin/clone.c:90 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:91 +#: builtin/clone.c:92 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:92 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659 msgid "depth" msgstr "độ-sâu" -#: builtin/clone.c:93 +#: builtin/clone.c:94 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:95 +#: builtin/clone.c:96 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:96 builtin/init-db.c:492 +#: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:97 builtin/init-db.c:493 +#: builtin/clone.c:98 builtin/init-db.c:495 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:98 +#: builtin/clone.c:99 msgid "key=value" msgstr "khóa=giá_trị" -#: builtin/clone.c:99 +#: builtin/clone.c:100 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:252 +#: builtin/clone.c:253 #, 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:256 +#: builtin/clone.c:257 #, c-format msgid "reference repository '%s' is shallow" msgstr "kho tham chiếu “%s” là nông" -#: builtin/clone.c:259 +#: builtin/clone.c:260 #, c-format msgid "reference repository '%s' is grafted" msgstr "kho tham chiếu “%s” bị cấy ghép" -#: builtin/clone.c:321 +#: builtin/clone.c:322 #, c-format msgid "failed to create directory '%s'" msgstr "tạo thư mục \"%s\" gặp lỗi" -#: builtin/clone.c:323 builtin/diff.c:83 +#: builtin/clone.c:324 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:325 +#: builtin/clone.c:326 #, c-format msgid "%s exists and is not a directory" msgstr "%s tồn tại nhưng không phải là một thư mục" -#: builtin/clone.c:339 +#: builtin/clone.c:340 #, 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:361 +#: builtin/clone.c:362 #, 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:365 +#: builtin/clone.c:366 #, 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:388 builtin/clone.c:565 +#: builtin/clone.c:389 builtin/clone.c:563 #, c-format msgid "done.\n" msgstr "hoàn tất.\n" @@ -3943,108 +4037,108 @@ msgstr "" "Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n" "và thử checkout với lệnh “git checkout -f HEAD”\n" -#: builtin/clone.c:480 +#: builtin/clone.c:478 #, 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:560 +#: builtin/clone.c:558 #, c-format msgid "Checking connectivity... " msgstr "Đang kiểm tra kết nối... " -#: builtin/clone.c:563 +#: builtin/clone.c:561 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:627 +#: builtin/clone.c:625 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:658 +#: builtin/clone.c:656 msgid "unable to checkout working tree" msgstr "không thể lấy ra (checkout) cây làm việc" -#: builtin/clone.c:768 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "Có quá nhiều đối số." -#: builtin/clone.c:772 +#: builtin/clone.c:769 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:783 +#: builtin/clone.c:780 #, 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:786 +#: builtin/clone.c:783 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:799 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "kho chứa “%s” chưa tồn tại" -#: builtin/clone.c:805 builtin/fetch.c:1143 +#: builtin/clone.c:802 builtin/fetch.c:1155 #, 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:815 +#: builtin/clone.c:812 #, 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:825 +#: builtin/clone.c:822 #, 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:838 builtin/clone.c:850 +#: builtin/clone.c:835 builtin/clone.c:847 #, 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:841 +#: builtin/clone.c:838 #, 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:860 +#: builtin/clone.c:857 #, 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:862 +#: builtin/clone.c:859 #, c-format msgid "Cloning into '%s'...\n" msgstr "Đang nhân bản thành “%s”...\n" -#: builtin/clone.c:898 +#: builtin/clone.c:895 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:901 +#: builtin/clone.c:898 msgid "source repository is shallow, ignoring --local" msgstr "kho nguồn là nông, nên bỏ qua --local" -#: builtin/clone.c:906 +#: builtin/clone.c:903 msgid "--local is ignored" msgstr "--local bị lờ đi" -#: builtin/clone.c:910 +#: builtin/clone.c:907 #, 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:961 builtin/clone.c:969 +#: builtin/clone.c:958 builtin/clone.c:966 #, 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:972 +#: builtin/clone.c:969 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." @@ -4080,15 +4174,46 @@ msgstr "Chèn thêm khoảng trắng giữa các cột" msgid "--command must be the first argument" msgstr "--command phải là đối số đầu tiên" -#: builtin/commit.c:36 +#: builtin/commit.c:37 msgid "git commit [options] [--] <pathspec>..." msgstr "git commit [các-tùy-chọn] [--] <pathspec>..." -#: builtin/commit.c:41 +#: builtin/commit.c:42 msgid "git status [options] [--] <pathspec>..." msgstr "git status [các-tùy-chọn] [--] <pathspec>..." -#: builtin/commit.c:46 +#: builtin/commit.c:47 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"Tên và địa chỉ thư điện tử của bạn được cấu hình một cách tự động trên cơ " +"sở\n" +"tài khoản và địa chỉ máy chủ của bạn. Xin hãy kiểm tra xem chúng có chính " +"xác không.\n" +"Bạn có thể chặn những thông báo kiểu này bằng cách cài đặt các thông tin " +"trên\n" +"một cách rõ ràng. Chạy lệnh sau đây là theo các hướng dẫn trong bộ soạn " +"thảo\n" +"để chỉnh sửa tập tin cấu hình của mình:\n" +"\n" +" git config --global --edit\n" +"\n" +"Sau khi thực hiện xong, bạn có thể sửa chữa định danh được sử dụng cho\n" +"lần chuyển giao này với lệnh:\n" +"\n" +" git commit --amend --reset-author\n" + +#: builtin/commit.c:60 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4116,7 +4241,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:58 +#: builtin/commit.c:72 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -4129,7 +4254,7 @@ msgstr "" "hoặc là bạn gỡ bỏ các lần chuyển giao một cách hoàn toàn bằng lệnh:\n" "\"git reset HEAD^\".\n" -#: builtin/commit.c:63 +#: builtin/commit.c:77 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4144,11 +4269,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:70 +#: builtin/commit.c:84 msgid "Otherwise, please use 'git reset'\n" msgstr "Nếu không được thì dùng lệnh \"git reset\"\n" -#: builtin/commit.c:73 +#: builtin/commit.c:87 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4164,60 +4289,77 @@ msgstr "" "Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n" "những lần chuyển giao còn lại.\n" -#: builtin/commit.c:288 +#: builtin/commit.c:302 msgid "failed to unpack HEAD tree object" msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây" -#: builtin/commit.c:328 +#: builtin/commit.c:342 msgid "unable to create temporary index" msgstr "không thể tạo bảng mục lục tạm thời" -#: builtin/commit.c:334 +#: builtin/commit.c:348 msgid "interactive add failed" msgstr "gặp lỗi khi thêm bằng cách tương" -#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435 +#: builtin/commit.c:359 +msgid "unable to write index file" +msgstr "không thể ghi tập tin lưu mục lục" + +#: builtin/commit.c:361 +msgid "unable to update temporary index" +msgstr "không thể cập nhật bảng mục lục tạm thời" + +#: builtin/commit.c:363 +msgid "Failed to update main cache tree" +msgstr "Gặp lỗi khi cập nhật cây bộ nhớ đệm" + +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 msgid "unable to write new_index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)" -#: builtin/commit.c:418 +#: builtin/commit.c:443 msgid "cannot do a partial commit during a merge." msgstr "" "không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn." -#: builtin/commit.c:420 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick." -#: builtin/commit.c:429 +#: builtin/commit.c:454 msgid "cannot read the index" msgstr "không đọc được bảng mục lục" -#: builtin/commit.c:447 +#: builtin/commit.c:473 msgid "unable to write temporary index file" msgstr "không thể ghi tập tin lưu bảng mục lục tạm thời" -#: builtin/commit.c:557 builtin/commit.c:563 +#: builtin/commit.c:592 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "lần chuyển giao “%s” thiếu phần tác giả ở đầu" + +#: builtin/commit.c:594 #, c-format -msgid "invalid commit: %s" -msgstr "lần chuyển giao không hợp lệ: %s" +msgid "commit '%s' has malformed author line" +msgstr "lần chuyển giao “%s” có phần tác giả ở đầu dị dạng" -#: builtin/commit.c:585 +#: builtin/commit.c:613 msgid "malformed --author parameter" msgstr "đối số cho --author bị dị hình" -#: builtin/commit.c:592 +#: builtin/commit.c:621 #, c-format msgid "invalid date format: %s" msgstr "ngày tháng không hợp lệ: %s" -#: builtin/commit.c:609 +#: builtin/commit.c:642 #, c-format msgid "Malformed ident string: '%s'" msgstr "Chuỗi thụt lề đầu dòng dị hình: “%s”" -#: builtin/commit.c:642 +#: builtin/commit.c:675 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4225,43 +4367,43 @@ msgstr "" "không thể chọn một ký tự ghi chú cái mà không được dùng\n" "trong phần ghi chú hiện tại" -#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086 +#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120 #, c-format msgid "could not lookup commit %s" msgstr "không thể tìm kiếm commit (lần chuyển giao) %s" -#: builtin/commit.c:691 builtin/shortlog.c:273 +#: builtin/commit.c:724 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n" -#: builtin/commit.c:693 +#: builtin/commit.c:726 msgid "could not read log from standard input" msgstr "không thể đọc nhật ký từ đầu vào tiêu chuẩn" -#: builtin/commit.c:697 +#: builtin/commit.c:730 #, c-format msgid "could not read log file '%s'" msgstr "không đọc được tệp nhật ký “%s”" -#: builtin/commit.c:719 +#: builtin/commit.c:752 msgid "could not read MERGE_MSG" msgstr "không thể đọc MERGE_MSG" -#: builtin/commit.c:723 +#: builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "không thể đọc SQUASH_MSG" -#: builtin/commit.c:727 +#: builtin/commit.c:760 #, c-format msgid "could not read '%s'" msgstr "Không thể đọc “%s”." -#: builtin/commit.c:798 +#: builtin/commit.c:831 msgid "could not write commit template" msgstr "không thể ghi mẫu chuyển giao" -#: builtin/commit.c:816 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -4276,7 +4418,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -4291,7 +4433,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:834 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4302,7 +4444,7 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần " "chuyển giao.\n" -#: builtin/commit.c:841 +#: builtin/commit.c:874 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4314,154 +4456,154 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n" "Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:888 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sTác giả: %.*s <%.*s>" -#: builtin/commit.c:863 +#: builtin/commit.c:896 #, c-format msgid "%sDate: %s" msgstr "%sNgày tháng: %s" -#: builtin/commit.c:870 +#: builtin/commit.c:903 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sNgười chuyển giao: %.*s <%.*s>" -#: builtin/commit.c:888 +#: builtin/commit.c:921 msgid "Cannot read index" msgstr "Không đọc được bảng mục lục" -#: builtin/commit.c:945 +#: builtin/commit.c:978 msgid "Error building trees" msgstr "Gặp lỗi khi xây dựng cây" -#: builtin/commit.c:960 builtin/tag.c:495 +#: builtin/commit.c:993 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Xin hãy cung cấp lời chú giải hoặc là dùng tùy chọn -m hoặc là -F.\n" -#: builtin/commit.c:1061 +#: builtin/commit.c:1095 #, c-format msgid "No existing author found with '%s'" msgstr "Không tìm thấy tác giả có sẵn với “%s”" -#: builtin/commit.c:1076 builtin/commit.c:1316 +#: builtin/commit.c:1110 builtin/commit.c:1350 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Chế độ cho các tập tin chưa được theo dõi không hợp lệ “%s”" -#: builtin/commit.c:1113 +#: builtin/commit.c:1147 msgid "--long and -z are incompatible" msgstr "hai tùy chọn -long và -z không tương thích với nhau" -#: builtin/commit.c:1143 +#: builtin/commit.c:1177 msgid "Using both --reset-author and --author does not make sense" msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý" -#: builtin/commit.c:1152 +#: builtin/commit.c:1186 msgid "You have nothing to amend." msgstr "Không có gì để mà “tu bổ” cả." -#: builtin/commit.c:1155 +#: builtin/commit.c:1189 msgid "You are in the middle of a merge -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “tu bổ”." -#: builtin/commit.c:1157 +#: builtin/commit.c:1191 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu " "bổ”." -#: builtin/commit.c:1160 +#: builtin/commit.c:1194 msgid "Options --squash and --fixup cannot be used together" msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau" -#: builtin/commit.c:1170 +#: builtin/commit.c:1204 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" "Chỉ được dùng một trong số tùy chọn trong số các tùy chọn -c/-C/-F/--fixup" -#: builtin/commit.c:1172 +#: builtin/commit.c:1206 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F/--fixup." -#: builtin/commit.c:1180 +#: builtin/commit.c:1214 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "--reset-author chỉ có thể được sử dụng với tùy chọn -C, -c hay --amend." -#: builtin/commit.c:1197 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được " "sử dụng." -#: builtin/commit.c:1199 +#: builtin/commit.c:1233 msgid "No paths with --include/--only does not make sense." msgstr "Không đường dẫn với các tùy chọn --include/--only không hợp lý." -#: builtin/commit.c:1201 +#: builtin/commit.c:1235 msgid "Clever... amending the last one with dirty index." msgstr "Giỏi... “tu bổ” cái cuối với bảng mục lục bẩn." -#: builtin/commit.c:1203 +#: builtin/commit.c:1237 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "Những đường dẫn rõ ràng được chỉ ra không có tùy chọn -i cũng không -o; coi " "là --only những đường dẫn" -#: builtin/commit.c:1215 builtin/tag.c:727 +#: builtin/commit.c:1249 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Chế độ dọn dẹp không hợp lệ %s" -#: builtin/commit.c:1220 +#: builtin/commit.c:1254 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:1330 builtin/commit.c:1595 +#: builtin/commit.c:1364 builtin/commit.c:1644 msgid "show status concisely" msgstr "hiển thị trạng thái ở dạng súc tích" -#: builtin/commit.c:1332 builtin/commit.c:1597 +#: builtin/commit.c:1366 builtin/commit.c:1646 msgid "show branch information" msgstr "hiển thị thông tin nhánh" -#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489 +#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500 msgid "machine-readable output" msgstr "kết xuất dạng máy-có-thể-đọc" -#: builtin/commit.c:1337 builtin/commit.c:1601 +#: builtin/commit.c:1371 builtin/commit.c:1650 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:1340 builtin/commit.c:1604 +#: builtin/commit.c:1374 builtin/commit.c:1653 msgid "terminate entries with NUL" msgstr "chấm dứt các mục bằng NUL" -#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703 -#: builtin/fast-export.c:706 builtin/tag.c:602 +#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980 +#: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "chế độ" -#: builtin/commit.c:1343 builtin/commit.c:1607 +#: builtin/commit.c:1377 builtin/commit.c:1656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, " "normal, no. (Mặc định: all)" -#: builtin/commit.c:1346 +#: builtin/commit.c:1380 msgid "show ignored files" msgstr "hiển thị các tập tin ẩn" -#: builtin/commit.c:1347 parse-options.h:153 +#: builtin/commit.c:1381 parse-options.h:153 msgid "when" msgstr "khi" -#: builtin/commit.c:1348 +#: builtin/commit.c:1382 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4469,230 +4611,222 @@ msgstr "" "bỏ qua các thay đổi trong mô-đun-con, tùy chọn khi: all, dirty, untracked. " "(Mặc định: all)" -#: builtin/commit.c:1350 +#: builtin/commit.c:1384 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:1419 +#: builtin/commit.c:1471 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:1421 +#: builtin/commit.c:1473 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:1469 +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "đã rời khỏi HEAD" -#: builtin/commit.c:1471 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr " (root-commit)" -#: builtin/commit.c:1565 +#: builtin/commit.c:1614 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:1566 +#: builtin/commit.c:1615 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:1568 +#: builtin/commit.c:1617 msgid "Commit message options" msgstr "Các tùy chọn ghi chú commit" -#: builtin/commit.c:1569 builtin/tag.c:600 +#: builtin/commit.c:1618 builtin/tag.c:601 msgid "read message from file" msgstr "đọc chú thích từ tập tin" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "author" msgstr "tác giả" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "override author for commit" msgstr "ghi đè tác giả cho commit" -#: builtin/commit.c:1571 builtin/gc.c:286 +#: builtin/commit.c:1620 builtin/gc.c:275 msgid "date" msgstr "ngày tháng" -#: builtin/commit.c:1571 +#: builtin/commit.c:1620 msgid "override date for commit" msgstr "ghi đè ngày tháng cho lần chuyển giao" -#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409 -#: builtin/notes.c:566 builtin/tag.c:598 +#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/tag.c:599 msgid "message" msgstr "chú thích" -#: builtin/commit.c:1572 +#: builtin/commit.c:1621 msgid "commit message" msgstr "chú thích của lần chuyển giao" -#: builtin/commit.c:1573 +#: builtin/commit.c:1622 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:1574 +#: builtin/commit.c:1623 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:1575 +#: builtin/commit.c:1624 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:1576 +#: builtin/commit.c:1625 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:1577 +#: builtin/commit.c:1626 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:1578 builtin/log.c:1188 builtin/revert.c:86 +#: builtin/commit.c:1627 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:1579 +#: builtin/commit.c:1628 msgid "use specified template file" msgstr "sử dụng tập tin mẫu đã cho" -#: builtin/commit.c:1580 +#: builtin/commit.c:1629 msgid "force edit of commit" msgstr "ép buộc sửa lần commit" -#: builtin/commit.c:1581 +#: builtin/commit.c:1630 msgid "default" msgstr "mặc định" -#: builtin/commit.c:1581 builtin/tag.c:603 +#: builtin/commit.c:1630 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:1582 +#: builtin/commit.c:1631 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:1583 builtin/merge.c:223 builtin/revert.c:92 -#: builtin/tag.c:604 +#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92 +#: builtin/tag.c:605 msgid "key-id" msgstr "mã-số-khóa" -#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93 +#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93 msgid "GPG sign commit" msgstr "ký lần chuyển giao dùng GPG" -#: builtin/commit.c:1587 +#: builtin/commit.c:1636 msgid "Commit contents options" msgstr "Các tùy nội dung ghi chú commit" -#: builtin/commit.c:1588 +#: builtin/commit.c:1637 msgid "commit all changed files" msgstr "chuyển giao tất cả các tập tin có thay đổi" -#: builtin/commit.c:1589 +#: builtin/commit.c:1638 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:1590 +#: builtin/commit.c:1639 msgid "interactively add files" msgstr "thêm các tập-tin bằng tương tác" -#: builtin/commit.c:1591 +#: builtin/commit.c:1640 msgid "interactively add changes" msgstr "thêm các thay đổi bằng tương tác" -#: builtin/commit.c:1592 +#: builtin/commit.c:1641 msgid "commit only specified files" msgstr "chỉ chuyển giao các tập tin đã chỉ ra" -#: builtin/commit.c:1593 +#: builtin/commit.c:1642 msgid "bypass pre-commit hook" msgstr "vòng qua móc (hook) pre-commit" -#: builtin/commit.c:1594 +#: builtin/commit.c:1643 msgid "show what would be committed" msgstr "hiển thị xem cái gì có thể được chuyển giao" -#: builtin/commit.c:1605 +#: builtin/commit.c:1654 msgid "amend previous commit" msgstr "“tu bổ” (amend) lần commit trước" -#: builtin/commit.c:1606 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" msgstr "vòng qua móc (hook) post-rewrite" -#: builtin/commit.c:1611 +#: builtin/commit.c:1660 msgid "ok to record an empty change" msgstr "ok để ghi lại một thay đổi trống rỗng" -#: builtin/commit.c:1613 +#: builtin/commit.c:1662 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:1641 +#: builtin/commit.c:1691 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" -#: builtin/commit.c:1680 builtin/merge.c:518 +#: builtin/commit.c:1730 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở “%s” để đọc" -#: builtin/commit.c:1687 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1694 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1713 +#: builtin/commit.c:1763 #, c-format msgid "could not read commit message: %s" msgstr "không thể đọc phần chú thích (message) commit (lần chuyển giao): %s" -#: builtin/commit.c:1724 +#: builtin/commit.c:1774 #, 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:1729 +#: builtin/commit.c:1779 #, 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:1744 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875 msgid "failed to write commit object" msgstr "gặp lỗi khi ghi đối tượng chuyển giao" -#: builtin/commit.c:1756 -msgid "cannot lock HEAD ref" -msgstr "không thể khóa HEAD ref (tham chiếu)" - -#: builtin/commit.c:1769 -msgid "cannot update HEAD ref" -msgstr "không thể cập nhật ref (tham chiếu) HEAD" - -#: builtin/commit.c:1780 +#: builtin/commit.c:1827 msgid "" "Repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full or quota is\n" +"new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" -"Kho chứa đã hoàn tất việc cập nhật, nhưng không thể ghi vào\n" -"tập tin new_index (bảng mục lục mới). Hãy kiểm tra xem đĩa có bị đầy quá\n" -"hay quota (hạn nghạch) bị vượt quá, và sau đó \"git reset HEAD\" để khắc " -"phục." +"Kho chứa đã được cập nhật, nhưng không thể ghi vào\n" +"tập tin new_index (bảng mục lục mới). Hãy kiểm tra xem đĩa\n" +"có bị đầy quá hay quota (hạn nghạch đĩa cứng) bị vượt quá,\n" +"và sau đó \"git reset HEAD\" để khắc phục." #: builtin/config.c:8 msgid "git config [options]" @@ -4822,63 +4956,87 @@ msgstr "chấm dứt giá trị với byte NUL" msgid "respect include directives on lookup" msgstr "tôn trọng kể cà các hướng trong tìm kiếm" -#: builtin/count-objects.c:82 +#: builtin/config.c:315 +msgid "unable to parse default color value" +msgstr "không thể phân tích giá trị màu mặc định" + +#: builtin/config.c:455 +#, c-format +msgid "" +"# This is Git's per-user configuration file.\n" +"[core]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tuser = %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" +"# 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" +"#\temail = %s\n" + +#: builtin/config.c:590 +#, c-format +msgid "cannot create configuration file %s" +msgstr "không thể tạo tập tin cấu hình “%s”" + +#: builtin/count-objects.c:55 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:65 msgid "print sizes in human readable format" msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc" -#: builtin/describe.c:16 +#: builtin/describe.c:17 msgid "git describe [options] <commit-ish>*" msgstr "git describe [các-tùy-chọn] <commit-ish>*" -#: builtin/describe.c:17 +#: builtin/describe.c:18 msgid "git describe [options] --dirty" msgstr "git describe [các-tùy-chọn] --dirty" -#: builtin/describe.c:216 +#: builtin/describe.c:217 #, c-format msgid "annotated tag %s not available" msgstr "thẻ đã được ghi chú %s không sẵn để dùng" -#: builtin/describe.c:220 +#: builtin/describe.c:221 #, c-format msgid "annotated tag %s has no embedded name" msgstr "thẻ được chú giải %s không có tên nhúng" -#: builtin/describe.c:222 +#: builtin/describe.c:223 #, c-format msgid "tag '%s' is really '%s' here" msgstr "thẻ “%s” đã thực sự ở đây “%s” rồi" -#: builtin/describe.c:249 +#: builtin/describe.c:250 builtin/log.c:452 #, c-format msgid "Not a valid object name %s" msgstr "Không phải tên đối tượng %s hợp lệ" -#: builtin/describe.c:252 +#: builtin/describe.c:253 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s không phải là một đối tượng “%s” hợp lệ" -#: builtin/describe.c:269 +#: builtin/describe.c:270 #, c-format msgid "no tag exactly matches '%s'" msgstr "không có thẻ nào khớp chính xác với “%s”" -#: builtin/describe.c:271 +#: builtin/describe.c:272 #, c-format msgid "searching to describe %s\n" msgstr "Đang tìm kiếm để mô tả %s\n" -#: builtin/describe.c:318 +#: builtin/describe.c:319 #, c-format msgid "finished search at %s\n" msgstr "việc tìm kiếm đã kết thúc tại %s\n" -#: builtin/describe.c:345 +#: builtin/describe.c:346 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -4887,7 +5045,7 @@ msgstr "" "Không có thẻ được chú giải nào được mô tả là “%s”.\n" "Tuy nhiên, ở đây có những thẻ không được chú giải: hãy thử --tags." -#: builtin/describe.c:349 +#: builtin/describe.c:350 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -4896,12 +5054,12 @@ msgstr "" "Không có thẻ (tag) có thể mô tả “%s”.\n" "Hãy thử --always, hoặt tạo một số thẻ." -#: builtin/describe.c:370 +#: builtin/describe.c:371 #, c-format msgid "traversed %lu commits\n" msgstr "đã xuyên %lu qua lần chuyển giao\n" -#: builtin/describe.c:373 +#: builtin/describe.c:374 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -4910,143 +5068,147 @@ msgstr "" "tìm thấy nhiều hơn %i thẻ (tag); đã liệt kê %i gần đây nhất\n" "bỏ đi tìm kiếm tại %s\n" -#: builtin/describe.c:395 +#: builtin/describe.c:396 msgid "find the tag that comes after the commit" msgstr "tìm các thẻ mà nó đến trước lần chuyển giao" -#: builtin/describe.c:396 +#: builtin/describe.c:397 msgid "debug search strategy on stderr" msgstr "chiến lược tìm kiếm gỡ lỗi trên đầu ra lỗi chuẩn stderr" -#: builtin/describe.c:397 +#: builtin/describe.c:398 msgid "use any ref" msgstr "dùng ref bất kỳ" -#: builtin/describe.c:398 +#: builtin/describe.c:399 msgid "use any tag, even unannotated" msgstr "dùng thẻ bất kỳ, cả khi “unannotated”" -#: builtin/describe.c:399 +#: builtin/describe.c:400 msgid "always use long format" msgstr "luôn dùng định dạng dài" -#: builtin/describe.c:400 +#: builtin/describe.c:401 msgid "only follow first parent" msgstr "chỉ theo cha mẹ đầu tiên" -#: builtin/describe.c:403 +#: builtin/describe.c:404 msgid "only output exact matches" msgstr "chỉ xuất những gì khớp chính xác" -#: builtin/describe.c:405 +#: builtin/describe.c:406 msgid "consider <n> most recent tags (default: 10)" msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)" -#: builtin/describe.c:407 +#: builtin/describe.c:408 msgid "only consider tags matching <pattern>" msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>" -#: builtin/describe.c:409 builtin/name-rev.c:318 +#: builtin/describe.c:410 builtin/name-rev.c:318 msgid "show abbreviated commit object as fallback" msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback" -#: builtin/describe.c:410 +#: builtin/describe.c:411 msgid "mark" msgstr "dấu" -#: builtin/describe.c:411 +#: builtin/describe.c:412 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "thêm <dấu> trên cây thư mục làm việc bẩn (mặc định \"-dirty\")" -#: builtin/describe.c:429 +#: builtin/describe.c:430 msgid "--long is incompatible with --abbrev=0" msgstr "--long là xung khắc với tùy chọn --abbrev=0" -#: builtin/describe.c:455 +#: builtin/describe.c:456 msgid "No names found, cannot describe anything." msgstr "Không tìm thấy các tên, không thể mô tả gì cả." -#: builtin/describe.c:475 +#: builtin/describe.c:476 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty là xung khắc với các tùy chọn commit-ish" -#: builtin/diff.c:85 +#: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" msgstr "“%s”: không phải tập tin bình thường hay liên kết mềm" -#: builtin/diff.c:236 +#: builtin/diff.c:237 #, c-format msgid "invalid option: %s" msgstr "tùy chọn không hợp lệ: %s" -#: builtin/diff.c:357 +#: builtin/diff.c:358 msgid "Not a git repository" msgstr "Không phải là kho git" -#: builtin/diff.c:400 +#: builtin/diff.c:401 #, c-format msgid "invalid object '%s' given." msgstr "đối tượng đã cho “%s” không hợp lệ." -#: builtin/diff.c:409 +#: builtin/diff.c:410 #, c-format msgid "more than two blobs given: '%s'" msgstr "đã cho nhiều hơn hai đối tượng blob: “%s”" -#: builtin/diff.c:416 +#: builtin/diff.c:417 #, c-format msgid "unhandled object '%s' given." msgstr "đã cho đối tượng không thể nắm giữ “%s”." -#: builtin/fast-export.c:23 +#: builtin/fast-export.c:24 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:702 +#: builtin/fast-export.c:979 msgid "show progress after <n> objects" msgstr "hiển thị tiến triển sau <n> đối tượng" -#: builtin/fast-export.c:704 +#: builtin/fast-export.c:981 msgid "select handling of signed tags" msgstr "chọn điều khiển của thẻ đã ký" -#: builtin/fast-export.c:707 +#: builtin/fast-export.c:984 msgid "select handling of tags that tag filtered objects" msgstr "chọn sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được lọc ra" -#: builtin/fast-export.c:710 +#: builtin/fast-export.c:987 msgid "Dump marks to this file" msgstr "Đổ các đánh dấu này vào tập-tin" -#: builtin/fast-export.c:712 +#: builtin/fast-export.c:989 msgid "Import marks from this file" msgstr "nhập vào đánh dấu từ tập tin này" -#: builtin/fast-export.c:714 +#: builtin/fast-export.c:991 msgid "Fake a tagger when tags lack one" msgstr "Làm giả một cái thẻ khi thẻ bị thiếu một cái" -#: builtin/fast-export.c:716 +#: builtin/fast-export.c:993 msgid "Output full tree for each commit" msgstr "Xuất ra toàn bộ cây cho mỗi lần chuyển giao" -#: builtin/fast-export.c:718 +#: builtin/fast-export.c:995 msgid "Use the done feature to terminate the stream" msgstr "Sử dụng tính năng done để chấm dứt luồng dữ liệu" -#: builtin/fast-export.c:719 +#: builtin/fast-export.c:996 msgid "Skip output of blob data" msgstr "Bỏ qua kết xuất của dữ liệu blob" -#: builtin/fast-export.c:720 +#: builtin/fast-export.c:997 msgid "refspec" msgstr "refspec" -#: builtin/fast-export.c:721 +#: builtin/fast-export.c:998 msgid "Apply refspec to exported refs" msgstr "Áp dụng refspec cho refs đã xuất" +#: builtin/fast-export.c:999 +msgid "anonymize output" +msgstr "kết xuất anonymize" + #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<các-tùy-chọn>] [<kho-chứa> [<refspec>...]]" @@ -5073,7 +5235,7 @@ msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó" #: builtin/fetch.c:94 msgid "path to upload pack on remote end" -msgstr "đường dẫn đến gói (pack) tải lên trên máy chủ cuối" +msgstr "đường dẫn đến gói tải lên trên máy chủ cuối" #: builtin/fetch.c:95 msgid "force overwrite of local branch" @@ -5107,7 +5269,7 @@ msgstr "điều khiển việc lấy về đệ quy trong các mô-đun-con" #: builtin/fetch.c:109 msgid "keep downloaded pack" -msgstr "giữ các gói đã tải về" +msgstr "giữ lại gói đã tải về" #: builtin/fetch.c:111 msgid "allow updating of HEAD ref" @@ -5121,7 +5283,7 @@ msgstr "làm sâu hơn lịch sử của bản sao" msgid "convert to a complete repository" msgstr "chuyển đổi hoàn toàn sang kho git" -#: builtin/fetch.c:118 builtin/log.c:1205 +#: builtin/fetch.c:118 builtin/log.c:1208 msgid "dir" msgstr "tmục" @@ -5149,136 +5311,136 @@ msgstr "chỉ ra refmap cần lấy về" 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:440 +#: builtin/fetch.c:454 #, c-format msgid "object %s not found" msgstr "Không tìm thấy đối tượng %s" -#: builtin/fetch.c:445 +#: builtin/fetch.c:459 msgid "[up to date]" msgstr "[đã cập nhật]" -#: builtin/fetch.c:459 +#: builtin/fetch.c:473 #, 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:460 builtin/fetch.c:546 +#: builtin/fetch.c:474 builtin/fetch.c:560 msgid "[rejected]" msgstr "[Bị từ chối]" -#: builtin/fetch.c:471 +#: builtin/fetch.c:485 msgid "[tag update]" msgstr "[cập nhật thẻ]" -#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526 +#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 msgid " (unable to update local ref)" -msgstr " (không thể cập nhật tham chiếu (ref) nội bộ)" +msgstr " (không thể cập nhật tham chiếu nội bộ)" -#: builtin/fetch.c:491 +#: builtin/fetch.c:505 msgid "[new tag]" msgstr "[thẻ mới]" -#: builtin/fetch.c:494 +#: builtin/fetch.c:508 msgid "[new branch]" msgstr "[nhánh mới]" -#: builtin/fetch.c:497 +#: builtin/fetch.c:511 msgid "[new ref]" msgstr "[ref (tham chiếu) mới]" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "unable to update local ref" -msgstr "không thể cập nhật tham chiếu (ref) nội bộ" +msgstr "không thể cập nhật tham chiếu nội bộ" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "forced update" msgstr "cưỡng bức cập nhật" -#: builtin/fetch.c:548 +#: builtin/fetch.c:562 msgid "(non-fast-forward)" msgstr "(non-fast-forward)" -#: builtin/fetch.c:581 builtin/fetch.c:814 +#: builtin/fetch.c:595 builtin/fetch.c:828 #, c-format msgid "cannot open %s: %s\n" msgstr "không thể mở %s: %s\n" -#: builtin/fetch.c:590 +#: builtin/fetch.c:604 #, 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:608 +#: builtin/fetch.c:622 #, 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:696 builtin/fetch.c:779 +#: builtin/fetch.c:710 builtin/fetch.c:793 #, c-format msgid "From %.*s\n" msgstr "Từ %.*s\n" -#: builtin/fetch.c:707 +#: builtin/fetch.c:721 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -"một số tham chiếu (refs) nội bộ không thể được cập nhật; hãy thử chạy\n" +"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:759 +#: builtin/fetch.c:773 #, 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:760 +#: builtin/fetch.c:774 #, c-format msgid " (%s has become dangling)" msgstr " (%s đã trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:784 +#: builtin/fetch.c:798 msgid "[deleted]" msgstr "[đã xóa]" -#: builtin/fetch.c:785 builtin/remote.c:1059 +#: builtin/fetch.c:799 builtin/remote.c:1063 msgid "(none)" msgstr "(không)" -#: builtin/fetch.c:804 +#: builtin/fetch.c:818 #, 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:823 +#: builtin/fetch.c:837 #, 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:826 +#: builtin/fetch.c:840 #, 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:882 +#: builtin/fetch.c:896 #, 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:1044 +#: builtin/fetch.c:1058 #, c-format msgid "Fetching %s\n" -msgstr "Đang lấy về %s\n" +msgstr "Đang lấy “%s” về\n" -#: builtin/fetch.c:1046 builtin/remote.c:90 +#: builtin/fetch.c:1060 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" -msgstr "không thể lấy về %s" +msgstr "không thể “%s” về" -#: builtin/fetch.c:1064 +#: builtin/fetch.c:1078 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5286,32 +5448,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:1087 +#: builtin/fetch.c:1101 msgid "You need to specify a tag name." msgstr "Bạn phải định rõ tên thẻ." -#: builtin/fetch.c:1131 +#: builtin/fetch.c:1143 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:1133 +#: builtin/fetch.c:1145 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:1156 +#: builtin/fetch.c:1168 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:1158 +#: builtin/fetch.c:1170 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:1169 +#: builtin/fetch.c:1181 #, 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:1177 +#: builtin/fetch.c:1189 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ý" @@ -5321,8 +5483,8 @@ msgstr "" "git fmt-merge-msg [-m <chú_thích>] [--log[=<n>]|--no-log] [--file <tập-tin>]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698 -#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589 +#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590 #: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "n" @@ -5347,99 +5509,103 @@ msgstr "dùng <văn bản thường> để bắt đầu ghi chú" msgid "file to read from" msgstr "tập tin để đọc dữ liệu từ đó" -#: builtin/for-each-ref.c:1051 +#: builtin/for-each-ref.c:676 +msgid "unable to parse format" +msgstr "không thể phân tích định dạng" + +#: builtin/for-each-ref.c:1057 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:1066 +#: builtin/for-each-ref.c:1072 msgid "quote placeholders suitably for shells" msgstr "trích dẫn để phù hợp cho hệ vỏ (shell)" -#: builtin/for-each-ref.c:1068 +#: builtin/for-each-ref.c:1074 msgid "quote placeholders suitably for perl" msgstr "trích dẫn để phù hợp cho perl" -#: builtin/for-each-ref.c:1070 +#: builtin/for-each-ref.c:1076 msgid "quote placeholders suitably for python" msgstr "trích dẫn để phù hợp cho python" -#: builtin/for-each-ref.c:1072 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for tcl" msgstr "trích dẫn để phù hợp cho tcl" -#: builtin/for-each-ref.c:1075 +#: builtin/for-each-ref.c:1081 msgid "show only <n> matched refs" msgstr "hiển thị chỉ <n> tham chiếu khớp" -#: builtin/for-each-ref.c:1076 builtin/replace.c:435 +#: builtin/for-each-ref.c:1082 builtin/replace.c:438 msgid "format" msgstr "định dạng" -#: builtin/for-each-ref.c:1076 +#: builtin/for-each-ref.c:1082 msgid "format to use for the output" msgstr "định dạng sẽ dùng cho đầu ra" -#: builtin/for-each-ref.c:1077 +#: builtin/for-each-ref.c:1083 msgid "key" msgstr "khóa" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1084 msgid "field name to sort on" msgstr "tên trường cần sắp xếp" -#: builtin/fsck.c:147 builtin/prune.c:172 +#: builtin/fsck.c:147 builtin/prune.c:136 msgid "Checking connectivity" msgstr "Đang kiểm tra kết nối" -#: builtin/fsck.c:538 +#: builtin/fsck.c:540 msgid "Checking object directories" msgstr "Đang kiểm tra các thư mục đối tượng" -#: builtin/fsck.c:601 +#: builtin/fsck.c:603 msgid "git fsck [options] [<object>...]" msgstr "git fsck [các-tùy-chọn] [<đối-tượng>...]" -#: builtin/fsck.c:607 +#: builtin/fsck.c:609 msgid "show unreachable objects" msgstr "hiển thị các đối tượng không thể đọc được" -#: builtin/fsck.c:608 +#: builtin/fsck.c:610 msgid "show dangling objects" msgstr "hiển thị các đối tượng không được quản lý" -#: builtin/fsck.c:609 +#: builtin/fsck.c:611 msgid "report tags" msgstr "báo cáo các thẻ" -#: builtin/fsck.c:610 +#: builtin/fsck.c:612 msgid "report root nodes" msgstr "báo cáo node gốc" -#: builtin/fsck.c:611 +#: builtin/fsck.c:613 msgid "make index objects head nodes" -msgstr "tạo “ index objects head nodes”" +msgstr "tạo “index objects head nodes”" -#: builtin/fsck.c:612 +#: builtin/fsck.c:614 msgid "make reflogs head nodes (default)" -msgstr "tạo reflogs head nodes (mặc định)" +msgstr "tạo “reflogs head nodes” (mặc định)" -#: builtin/fsck.c:613 +#: builtin/fsck.c:615 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:614 +#: builtin/fsck.c:616 msgid "enable more strict checking" msgstr "cho phép kiểm tra hạn chế hơn" -#: builtin/fsck.c:616 +#: builtin/fsck.c:618 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:617 builtin/prune.c:144 +#: builtin/fsck.c:619 builtin/prune.c:108 msgid "show progress" msgstr "hiển thị quá trình" -#: builtin/fsck.c:667 +#: builtin/fsck.c:669 msgid "Checking objects" msgstr "Đang kiểm tra các đối tượng" @@ -5447,50 +5613,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:91 +#: builtin/gc.c:79 #, c-format -msgid "Invalid %s: '%s'" -msgstr "%s không hợp lệ: “%s”" +msgid "Invalid gc.pruneexpire: '%s'" +msgstr "gc.pruneexpire không hợp lệ: “%s”" -#: builtin/gc.c:118 +#: builtin/gc.c:107 #, 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" +msgstr "thư mục đối tượng dài một cách điên rồ %.*s" -#: builtin/gc.c:287 +#: builtin/gc.c:276 msgid "prune unreferenced objects" msgstr "xóa bỏ các đối tượng không được tham chiếu" -#: builtin/gc.c:289 +#: builtin/gc.c:278 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:290 +#: builtin/gc.c:279 msgid "enable auto-gc mode" msgstr "bật chế độ auto-gc" -#: builtin/gc.c:291 +#: builtin/gc.c:280 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:332 +#: builtin/gc.c:321 #, 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:334 +#: builtin/gc.c:323 #, 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:335 +#: builtin/gc.c:324 #, 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:353 +#: builtin/gc.c:342 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5498,7 +5664,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:375 +#: builtin/gc.c:364 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5632,7 +5798,7 @@ msgstr "hiển thị số lượng khớp thay vì những dòng khớp với m #: builtin/grep.c:692 msgid "highlight matches" -msgstr "tô sáng cái khớp" +msgstr "tô sáng phần khớp mẫu" #: builtin/grep.c:694 msgid "print empty line between matches from different files" @@ -5693,7 +5859,7 @@ msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep” (t #: builtin/grep.c:737 msgid "pager" -msgstr "giấy" +msgstr "dàn trang" #: builtin/grep.c:737 msgid "show matching files in the pager" @@ -5733,7 +5899,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:60 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." @@ -5741,31 +5907,36 @@ msgstr "" "git hash-object [-t <kiểu>] [-w] [--path=<tập-tin>|--no-filters] [--stdin] " "[--] <tập-tin>..." -#: builtin/hash-object.c:61 +#: builtin/hash-object.c:83 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:72 builtin/tag.c:609 +#: builtin/hash-object.c:94 builtin/tag.c:610 msgid "type" msgstr "kiểu" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:94 msgid "object type" msgstr "kiểu đối tượng" -#: builtin/hash-object.c:73 +#: builtin/hash-object.c:95 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:74 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "đọc đối tượng từ đầu vào tiêu chuẩn stdin" -#: builtin/hash-object.c:76 +#: builtin/hash-object.c:99 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:77 +#: builtin/hash-object.c:100 +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 msgid "process file as it were from this path" msgstr "xử lý tập tin như là nó đang ở thư mục này" @@ -5798,25 +5969,25 @@ msgstr "git help [--all] [--guides] [--man|--web|--info] [lệnh]" msgid "unrecognized help format '%s'" msgstr "không nhận ra định dạng trợ giúp “%s”" -#: builtin/help.c:92 +#: builtin/help.c:91 msgid "Failed to start emacsclient." -msgstr "Lỗi khởi chạy emacsclient." +msgstr "Gặp lỗi khi khởi chạy emacsclient." -#: builtin/help.c:105 +#: builtin/help.c:104 msgid "Failed to parse emacsclient version." msgstr "Gặp lỗi khi phân tích phiên bản emacsclient." -#: builtin/help.c:113 +#: builtin/help.c:112 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "phiên bản của emacsclient “%d” quá cũ (< 22)." -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 #, c-format msgid "failed to exec '%s': %s" msgstr "gặp lỗi khi thực thi “%s”: %s" -#: builtin/help.c:216 +#: builtin/help.c:215 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -5825,7 +5996,7 @@ msgstr "" "“%s”: đường dẫn không hỗ trợ bộ trình chiếu man.\n" "Hãy cân nhắc đến việc sử dụng “man.<tool>.cmd” để thay thế." -#: builtin/help.c:228 +#: builtin/help.c:227 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -5834,23 +6005,27 @@ msgstr "" "“%s”: cmd (lệnh) hỗ trợ bộ trình chiếu man.\n" "Hãy cân nhắc đến việc sử dụng “man.<tool>.path” để thay thế." -#: builtin/help.c:353 +#: builtin/help.c:352 #, c-format msgid "'%s': unknown man viewer." msgstr "“%s”: không rõ chương trình xem man." -#: builtin/help.c:370 +#: builtin/help.c:369 msgid "no man viewer handled the request" msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp với yêu cầu" -#: builtin/help.c:378 +#: builtin/help.c:377 msgid "no info viewer handled the request" msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu" -#: builtin/help.c:424 +#: builtin/help.c:423 msgid "Defining attributes per path" msgstr "Định nghĩa các thuộc tính cho mỗi đường dẫn" +#: builtin/help.c:424 +msgid "Everyday Git With 20 Commands Or So" +msgstr "Mỗi ngày học 20 lệnh Git hay hơn" + #: builtin/help.c:425 msgid "A Git glossary" msgstr "Thuật ngữ chuyên môn Git" @@ -5889,291 +6064,291 @@ 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:145 +#: builtin/index-pack.c:150 #, c-format msgid "unable to open %s" msgstr "không thể mở %s" -#: builtin/index-pack.c:191 +#: builtin/index-pack.c:200 #, 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:211 +#: builtin/index-pack.c:220 #, 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:214 +#: builtin/index-pack.c:223 #, 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:256 +#: builtin/index-pack.c:265 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "không thể điền vào %d byte" msgstr[1] "không thể điền vào %d byte" -#: builtin/index-pack.c:266 +#: builtin/index-pack.c:275 msgid "early EOF" -msgstr "gặp kết thúc EOF quá sớm" +msgstr "gặp kết thúc tập tin EOF quá sớm" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:276 msgid "read error on input" msgstr "lỗi đọc ở đầu vào" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:288 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:286 +#: builtin/index-pack.c:295 msgid "pack too large for current definition of off_t" -msgstr "pack quá lớn so với định nghĩa hiện tại của kiểu 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:302 +#: builtin/index-pack.c:311 #, c-format msgid "unable to create '%s'" msgstr "không thể tạo “%s”" -#: builtin/index-pack.c:307 +#: builtin/index-pack.c:316 #, c-format msgid "cannot open packfile '%s'" msgstr "không thể mở packfile “%s”" -#: builtin/index-pack.c:321 +#: builtin/index-pack.c:330 msgid "pack signature mismatch" -msgstr "chữ ký cho pack không khớp" +msgstr "chữ ký cho gói không khớp" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:332 #, c-format msgid "pack version %<PRIu32> unsupported" -msgstr "không hỗ trợ phiên bản pack %<PRIu32>" +msgstr "không hỗ trợ phiên bản gói %<PRIu32>" -#: builtin/index-pack.c:341 +#: builtin/index-pack.c:350 #, c-format msgid "pack has bad object at offset %lu: %s" -msgstr "pack có đối tượng sai khoảng bù (offset) %lu: %s" +msgstr "gói có đối tượng sai khoảng bù (offset) %lu: %s" -#: builtin/index-pack.c:462 +#: builtin/index-pack.c:471 #, c-format msgid "inflate returned %d" msgstr "xả nén trả về %d" -#: builtin/index-pack.c:511 +#: builtin/index-pack.c:520 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:519 +#: builtin/index-pack.c:528 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:527 +#: builtin/index-pack.c:536 #, c-format msgid "unknown object type %d" msgstr "không hiểu kiểu đối tượng %d" -#: builtin/index-pack.c:558 +#: builtin/index-pack.c:567 msgid "cannot pread pack file" -msgstr "không thể chạy hàm pread cho tập tin pack" +msgstr "không thể chạy hàm pread cho tập tin gói" -#: builtin/index-pack.c:560 +#: builtin/index-pack.c:569 #, 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 pack bị kết thúc sớm, thiếu %lu byte" -msgstr[1] "tập tin pack bị kết thúc sớm, thiếu %lu byte" +msgstr[0] "tập tin gói bị kết thúc sớm, thiếu %lu byte" +msgstr[1] "tập tin gói bị kết thúc sớm, thiếu %lu byte" -#: builtin/index-pack.c:586 +#: builtin/index-pack.c:595 msgid "serious inflate inconsistency" msgstr "sự mâu thuẫn xả nén nghiêm trọng" -#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706 -#: builtin/index-pack.c:740 builtin/index-pack.c:749 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!" -#: builtin/index-pack.c:680 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:689 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "không thể đọc %s" -#: builtin/index-pack.c:746 +#: builtin/index-pack.c:755 #, 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:760 +#: builtin/index-pack.c:769 #, c-format msgid "invalid blob object %s" msgstr "đối tượng blob không hợp lệ %s" -#: builtin/index-pack.c:774 +#: builtin/index-pack.c:783 #, c-format msgid "invalid %s" msgstr "%s không hợp lệ" -#: builtin/index-pack.c:777 +#: builtin/index-pack.c:787 msgid "Error in object" msgstr "Lỗi trong đối tượng" -#: builtin/index-pack.c:779 +#: builtin/index-pack.c:789 #, 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:851 builtin/index-pack.c:881 +#: builtin/index-pack.c:861 builtin/index-pack.c:890 msgid "failed to apply delta" msgstr "gặp lỗi khi áp dụng delta" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Receiving objects" msgstr "Đang nhận về các đối tượng" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Indexing objects" msgstr "Các đối tượng bảng mục lục" -#: builtin/index-pack.c:1048 +#: builtin/index-pack.c:1081 msgid "pack is corrupted (SHA1 mismatch)" -msgstr "pack bị sai hỏng (SHA1 không khớp)" +msgstr "gói bị sai hỏng (SHA1 không khớp)" -#: builtin/index-pack.c:1053 +#: builtin/index-pack.c:1086 msgid "cannot fstat packfile" msgstr "không thể lấy thông tin thống kê packfile" -#: builtin/index-pack.c:1056 +#: builtin/index-pack.c:1089 msgid "pack has junk at the end" msgstr "pack có phần thừa ở cuối" -#: builtin/index-pack.c:1067 +#: builtin/index-pack.c:1100 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:1090 +#: builtin/index-pack.c:1123 msgid "Resolving deltas" msgstr "Đang phân giải các delta" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1133 #, c-format msgid "unable to create thread: %s" msgstr "không thể tạo tuyến: %s" -#: builtin/index-pack.c:1142 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity" msgstr "lộn xộn hơn cả điên rồ" -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1181 #, c-format msgid "completed with %d local objects" msgstr "đầy đủ với %d đối tượng nội bộ" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1191 #, 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:1164 +#: builtin/index-pack.c:1195 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" -msgstr[0] "pack có %d delta chưa được giải quyết" -msgstr[1] "pack có %d delta chưa được giải quyết" +msgstr[0] "gói có %d delta chưa được giải quyết" +msgstr[1] "gói có %d delta chưa được giải quyết" -#: builtin/index-pack.c:1189 +#: builtin/index-pack.c:1220 #, 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:1268 +#: builtin/index-pack.c:1299 #, c-format msgid "local object %s is corrupt" msgstr "đối tượng nội bộ %s bị hỏng" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1323 msgid "error while closing pack file" -msgstr "gặp lỗi trong khi đóng tập tin gói (pack)" +msgstr "gặp lỗi trong khi đóng tập tin gói" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1336 #, c-format msgid "cannot write keep file '%s'" msgstr "không thể ghi tập tin giữ lại “%s”" -#: builtin/index-pack.c:1313 +#: builtin/index-pack.c:1344 #, 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:1326 +#: builtin/index-pack.c:1357 msgid "cannot store pack file" -msgstr "không thể lưu tập tin pack" +msgstr "không thể lưu tập tin gói" -#: builtin/index-pack.c:1337 +#: builtin/index-pack.c:1368 msgid "cannot store index file" msgstr "không thể lưu trữ tập tin ghi mục lục" -#: builtin/index-pack.c:1370 +#: builtin/index-pack.c:1401 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "sai pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1376 +#: builtin/index-pack.c:1407 #, 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:1380 builtin/index-pack.c:1559 +#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 #, c-format msgid "no threads support, ignoring %s" msgstr "không hỗ trợ đa tuyến, bỏ qua %s" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1469 #, c-format msgid "Cannot open existing pack file '%s'" -msgstr "Không thể mở tập tin pack đã sẵn có “%s”" +msgstr "Không thể mở tập tin gói đã sẵn có “%s”" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1471 #, c-format msgid "Cannot open existing pack idx file for '%s'" -msgstr "Không thể mở tập tin “pack idx” cho “%s”" +msgstr "Không thể mở tập tin idx của gói cho “%s”" -#: builtin/index-pack.c:1487 +#: builtin/index-pack.c:1518 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "không delta: %d đối tượng" msgstr[1] "không delta: %d đối tượng" -#: builtin/index-pack.c:1494 +#: builtin/index-pack.c:1525 #, 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" msgstr[1] "chiều dài xích = %d: %lu đối tượng" -#: builtin/index-pack.c:1523 +#: builtin/index-pack.c:1554 msgid "Cannot come back to cwd" msgstr "Không thể quay lại cwd" -#: builtin/index-pack.c:1571 builtin/index-pack.c:1574 -#: builtin/index-pack.c:1586 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 +#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1604 +#: builtin/index-pack.c:1635 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:1608 builtin/index-pack.c:1617 +#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 #, c-format msgid "packfile name '%s' does not end with '.pack'" -msgstr "tên tập tin packfile “%s” không được kết thúc bằng đuôi “.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:1625 +#: builtin/index-pack.c:1656 msgid "--verify with no packfile name given" msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" @@ -6282,11 +6457,7 @@ msgstr "Khởi tạo trống rỗng" msgid " shared" msgstr " đã chia sẻ" -#: builtin/init-db.c:439 -msgid "cannot tell cwd" -msgstr "không nói chuyện được với lệnh cwd" - -#: builtin/init-db.c:465 +#: builtin/init-db.c:467 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [directory]" @@ -6294,29 +6465,29 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-" "quyền>]] [thư-mục]" -#: builtin/init-db.c:488 +#: builtin/init-db.c:490 msgid "permissions" msgstr "các quyền" -#: builtin/init-db.c:489 +#: builtin/init-db.c:491 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:491 builtin/prune-packed.c:79 builtin/repack.c:172 +#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172 msgid "be quiet" msgstr "im lặng" -#: builtin/init-db.c:523 builtin/init-db.c:528 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "không thể mkdir (tạo thư mục): %s" -#: builtin/init-db.c:532 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "không thể chdir (chuyển đổi thư mục) sang %s" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6325,15 +6496,31 @@ 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:578 -msgid "Cannot access current working directory" -msgstr "Không thể truy cập thư mục làm việc hiện hành" - -#: builtin/init-db.c:585 +#: builtin/init-db.c:583 #, c-format msgid "Cannot access work tree '%s'" msgstr "không thể truy cập cây (tree) làm việc “%s”" +#: builtin/interpret-trailers.c:15 +msgid "" +"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " +"[<file>...]" +msgstr "" +"git interpret-trailers [--trim-empty] [(--trailer <thẻ>[(=|:)<giá-trị>])...] " +"[<tập-tin>...]" + +#: builtin/interpret-trailers.c:25 +msgid "trim empty trailers" +msgstr "bộ dò vết cắt bỏ phần trống rỗng" + +#: builtin/interpret-trailers.c:26 +msgid "trailer" +msgstr "bộ dò vết" + +#: builtin/interpret-trailers.c:27 +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>...]\n" msgstr "git log [<các-tùy-chọn>] [<vùng xem xét>] [[--] <đường-dẫn>...]\n" @@ -6342,6 +6529,11 @@ msgstr "git log [<các-tùy-chọn>] [<vùng xem xét>] [[--] <đường-dẫn>. msgid " or: git show [options] <object>..." msgstr " hay: git show [các-tùy-chọn] <đối-tượng>..." +#: builtin/log.c:81 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "tùy chọn--decorate không hợp lệ: %s" + #: builtin/log.c:127 msgid "suppress diff output" msgstr "chặn mọi kết xuất từ diff" @@ -6358,240 +6550,249 @@ msgstr "Sử dụng tập tin ánh xạ thư" msgid "decorate options" msgstr "các tùy chọn trang trí" +#: builtin/log.c:133 +msgid "Process line range n,m in file, counting from 1" +msgstr "Xử lý chỉ dòng vùng n,m trong tập tin, tính từ 1" + #: builtin/log.c:229 #, c-format msgid "Final output: %d %s\n" msgstr "Kết xuất cuối cùng: %d %s\n" -#: builtin/log.c:470 builtin/log.c:562 +#: builtin/log.c:458 +#, c-format +msgid "git show %s: bad file" +msgstr "git show %s: sai tập tin" + +#: builtin/log.c:472 builtin/log.c:564 #, c-format msgid "Could not read object %s" msgstr "Không thể đọc đối tượng %s" -#: builtin/log.c:586 +#: builtin/log.c:588 #, c-format msgid "Unknown type: %d" msgstr "Không nhận ra kiểu: %d" -#: builtin/log.c:687 +#: builtin/log.c:689 msgid "format.headers without value" msgstr "format.headers không có giá trị cụ thể" -#: builtin/log.c:771 +#: builtin/log.c:773 msgid "name of output directory is too long" msgstr "tên của thư mục kết xuất quá dài" -#: builtin/log.c:787 +#: builtin/log.c:789 #, c-format msgid "Cannot open patch file %s" msgstr "Không thể mở tập tin miếng vá: %s" -#: builtin/log.c:801 +#: builtin/log.c:803 msgid "Need exactly one range." msgstr "Cần chính xác một vùng." -#: builtin/log.c:809 +#: builtin/log.c:811 msgid "Not a range." msgstr "Không phải là một vùng." -#: builtin/log.c:916 +#: builtin/log.c:919 msgid "Cover letter needs email format" msgstr "“Cover letter” cần cho định dạng thư" -#: builtin/log.c:995 +#: builtin/log.c:998 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to điên rồ: %s" -#: builtin/log.c:1023 +#: builtin/log.c:1026 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [các-tùy-chọn] [<kể-từ> | <vùng-xem-xét>]" -#: builtin/log.c:1068 +#: builtin/log.c:1071 msgid "Two output directories?" msgstr "Hai thư mục kết xuất?" -#: builtin/log.c:1183 +#: builtin/log.c:1186 msgid "use [PATCH n/m] even with a single patch" msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn" -#: builtin/log.c:1186 +#: builtin/log.c:1189 msgid "use [PATCH] even with multiple patches" msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp" -#: builtin/log.c:1190 +#: builtin/log.c:1193 msgid "print patches to standard out" msgstr "hiển thị miếng vá ra đầu ra chuẩn" -#: builtin/log.c:1192 +#: builtin/log.c:1195 msgid "generate a cover letter" msgstr "tạo bì thư" -#: builtin/log.c:1194 +#: builtin/log.c:1197 msgid "use simple number sequence for output file names" msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra" -#: builtin/log.c:1195 +#: builtin/log.c:1198 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1196 +#: builtin/log.c:1199 msgid "use <sfx> instead of '.patch'" msgstr "sử dụng <sfx> thay cho “.patch”" -#: builtin/log.c:1198 +#: builtin/log.c:1201 msgid "start numbering patches at <n> instead of 1" msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1" -#: builtin/log.c:1200 +#: builtin/log.c:1203 msgid "mark the series as Nth re-roll" msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll" -#: builtin/log.c:1202 +#: builtin/log.c:1205 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Dùng [<tiền-tố>] thay cho [VÁ]" -#: builtin/log.c:1205 +#: builtin/log.c:1208 msgid "store resulting files in <dir>" msgstr "lưu các tập tin kết quả trong <t.mục>" -#: builtin/log.c:1208 +#: builtin/log.c:1211 msgid "don't strip/add [PATCH]" msgstr "không strip/add [VÁ]" -#: builtin/log.c:1211 +#: builtin/log.c:1214 msgid "don't output binary diffs" msgstr "không kết xuất diff (những khác biệt) nhị phân" -#: builtin/log.c:1213 +#: builtin/log.c:1216 msgid "don't include a patch matching a commit upstream" msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn" -#: builtin/log.c:1215 +#: builtin/log.c:1218 msgid "show patch format instead of default (patch + stat)" msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)" -#: builtin/log.c:1217 +#: builtin/log.c:1220 msgid "Messaging" msgstr "Lời nhắn" -#: builtin/log.c:1218 +#: builtin/log.c:1221 msgid "header" msgstr "đầu đề thư" -#: builtin/log.c:1219 +#: builtin/log.c:1222 msgid "add email header" msgstr "thêm đầu đề thư" -#: builtin/log.c:1220 builtin/log.c:1222 +#: builtin/log.c:1223 builtin/log.c:1225 msgid "email" msgstr "thư điện tử" -#: builtin/log.c:1220 +#: builtin/log.c:1223 msgid "add To: header" msgstr "thêm To: đầu đề thư" -#: builtin/log.c:1222 +#: builtin/log.c:1225 msgid "add Cc: header" msgstr "thêm Cc: đầu đề thư" -#: builtin/log.c:1224 +#: builtin/log.c:1227 msgid "ident" msgstr "thụt lề" -#: builtin/log.c:1225 +#: builtin/log.c:1228 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "đặt “Địa chỉ gửi” thành <thụ lề> (hoặc thụt lề người commit nếu bỏ quên)" -#: builtin/log.c:1227 +#: builtin/log.c:1230 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1228 +#: builtin/log.c:1231 msgid "make first mail a reply to <message-id>" msgstr "dùng thư đầu tiên để trả lời <message-id>" -#: builtin/log.c:1229 builtin/log.c:1232 +#: builtin/log.c:1232 builtin/log.c:1235 msgid "boundary" msgstr "ranh giới" -#: builtin/log.c:1230 +#: builtin/log.c:1233 msgid "attach the patch" msgstr "đính kèm miếng vá" -#: builtin/log.c:1233 +#: builtin/log.c:1236 msgid "inline the patch" msgstr "dùng miếng vá làm nội dung" -#: builtin/log.c:1237 +#: builtin/log.c:1240 msgid "enable message threading, styles: shallow, deep" msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”" -#: builtin/log.c:1239 +#: builtin/log.c:1242 msgid "signature" msgstr "chữ ký" -#: builtin/log.c:1240 +#: builtin/log.c:1243 msgid "add a signature" msgstr "thêm chữ ký" -#: builtin/log.c:1242 +#: builtin/log.c:1245 msgid "add a signature from a file" msgstr "thêm chữ ký từ một tập tin" -#: builtin/log.c:1243 +#: builtin/log.c:1246 msgid "don't print the patch filenames" msgstr "không hiển thị các tên tập tin của miếng vá" -#: builtin/log.c:1317 +#: builtin/log.c:1320 #, c-format msgid "invalid ident line: %s" msgstr "dòng thụt lề không hợp lệ: %s" -#: builtin/log.c:1332 +#: builtin/log.c:1335 msgid "-n and -k are mutually exclusive." msgstr "-n và -k loại từ lẫn nhau." -#: builtin/log.c:1334 +#: builtin/log.c:1337 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix và -k xung khắc nhau." -#: builtin/log.c:1342 +#: builtin/log.c:1345 msgid "--name-only does not make sense" msgstr "--name-only không hợp lý" -#: builtin/log.c:1344 +#: builtin/log.c:1347 msgid "--name-status does not make sense" msgstr "--name-status không hợp lý" -#: builtin/log.c:1346 +#: builtin/log.c:1349 msgid "--check does not make sense" msgstr "--check không hợp lý" -#: builtin/log.c:1369 +#: builtin/log.c:1372 msgid "standard output, or directory, which one?" msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?" -#: builtin/log.c:1371 +#: builtin/log.c:1374 #, c-format msgid "Could not create directory '%s'" msgstr "Không thể tạo thư mục “%s”" -#: builtin/log.c:1468 +#: builtin/log.c:1472 #, c-format msgid "unable to read signature file '%s'" msgstr "không thể đọc tập tin chữ ký “%s”" -#: builtin/log.c:1531 +#: builtin/log.c:1535 msgid "Failed to create output files" msgstr "Gặp lỗi khi tạo các tập tin kết xuất" -#: builtin/log.c:1579 +#: builtin/log.c:1583 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" -msgstr "git cherry [-v] [<thượng-nguồn> [<head> [<giới-hạn>]]]" +msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]" -#: builtin/log.c:1634 +#: builtin/log.c:1638 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -6599,7 +6800,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:1647 builtin/log.c:1649 builtin/log.c:1661 +#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 #, c-format msgid "Unknown commit %s" msgstr "Không hiểu lần chuyển giao %s" @@ -6647,7 +6848,7 @@ msgid "show files on the filesystem that need to be removed" msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ bỏ" #: builtin/ls-files.c:477 -msgid "show 'other' directories' name only" +msgid "show 'other' directories' names only" msgstr "chỉ hiển thị tên của các thư mục “khác”" #: builtin/ls-files.c:480 @@ -6735,99 +6936,99 @@ msgstr "dùng tên đường dẫn đầy đủ" msgid "list entire tree; not just current directory (implies --full-name)" msgstr "liệt kê cây mục tin; không chỉ thư mục hiện hành (ngụ ý --full-name)" -#: builtin/merge.c:43 +#: builtin/merge.c:44 msgid "git merge [options] [<commit>...]" msgstr "git merge [các-tùy-chọn] [<commit>...]" -#: builtin/merge.c:44 +#: builtin/merge.c:45 msgid "git merge [options] <msg> HEAD <commit>" msgstr "git merge [các-tùy-chọn] <tin-nhắn> HEAD <commit>" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:98 +#: builtin/merge.c:99 msgid "switch `m' requires a value" msgstr "switch “m” yêu cầu một giá trị" -#: builtin/merge.c:135 +#: builtin/merge.c:136 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Không tìm thấy chiến lược hòa trộn “%s”.\n" -#: builtin/merge.c:136 +#: builtin/merge.c:137 #, c-format msgid "Available strategies are:" msgstr "Các chiến lược sẵn sàng là:" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "Available custom strategies are:" msgstr "Các chiến lược tùy chỉnh sẵn sàng là:" -#: builtin/merge.c:191 +#: builtin/merge.c:192 msgid "do not show a diffstat at the end of the merge" msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn" -#: builtin/merge.c:194 +#: builtin/merge.c:195 msgid "show a diffstat at the end of the merge" msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn" -#: builtin/merge.c:195 +#: builtin/merge.c:196 msgid "(synonym to --stat)" msgstr "(đồng nghĩa với --stat)" -#: builtin/merge.c:197 +#: builtin/merge.c:198 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn" -#: builtin/merge.c:200 +#: builtin/merge.c:201 msgid "create a single commit instead of doing a merge" msgstr "tạo một lần chuyển giao đưon thay vì thực hiện việc hòa trộn" -#: builtin/merge.c:202 +#: builtin/merge.c:203 msgid "perform a commit if the merge succeeds (default)" msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)" -#: builtin/merge.c:204 +#: builtin/merge.c:205 msgid "edit message before committing" msgstr "sửa chú thích trước khi chuyển giao" -#: builtin/merge.c:205 +#: builtin/merge.c:206 msgid "allow fast-forward (default)" msgstr "cho phép fast-forward (mặc định)" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "abort if fast-forward is not possible" msgstr "bỏ qua nếu fast-forward không thể được" -#: builtin/merge.c:211 +#: builtin/merge.c:212 msgid "Verify that the named commit has a valid GPG signature" msgstr "Thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không" -#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89 +#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89 msgid "strategy" msgstr "chiến lược" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "merge strategy to use" msgstr "chiến lược hòa trộn sẽ dùng" -#: builtin/merge.c:214 +#: builtin/merge.c:215 msgid "option=value" msgstr "tùy_chọn=giá_trị" -#: builtin/merge.c:215 +#: builtin/merge.c:216 msgid "option for selected merge strategy" msgstr "tùy chọn cho chiến lược hòa trộn đã chọn" -#: builtin/merge.c:217 +#: builtin/merge.c:218 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn non-fast-forward)" -#: builtin/merge.c:221 +#: builtin/merge.c:222 msgid "abort the current in-progress merge" msgstr "bãi bỏ quá trình hòa trộn hiện tại đang thực hiện" @@ -6884,33 +7085,33 @@ msgstr "Chuỗi branch.%s.mergeoptions sai: %s" 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:677 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:691 #, 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:704 #, c-format msgid "unable to write %s" msgstr "không thể ghi %s" -#: builtin/merge.c:794 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "Không thể đọc từ “%s”" -#: builtin/merge.c:803 +#: builtin/merge.c:802 #, 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:808 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6928,166 +7129,166 @@ msgstr "" "rỗng\n" "sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/merge.c:833 +#: builtin/merge.c:832 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:844 #, c-format msgid "Wonderful.\n" msgstr "Thần kỳ.\n" -#: builtin/merge.c:908 +#: builtin/merge.c:907 #, 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:924 +#: builtin/merge.c:923 #, 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:965 +#: builtin/merge.c:964 msgid "No current branch." msgstr "không phải nhánh hiện hành" -#: builtin/merge.c:967 +#: builtin/merge.c:966 msgid "No remote for the current branch." msgstr "Không có máy chủ cho nhánh hiện hành." -#: builtin/merge.c:969 +#: builtin/merge.c:968 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:974 +#: builtin/merge.c:973 #, 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:1130 +#: builtin/merge.c:1129 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:1146 git-pull.sh:31 +#: builtin/merge.c:1145 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" -"Bạn chưa kết thúc việc hòa trộng (MERGE_HEAD vẫn tồn tại).\n" +"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:1149 git-pull.sh:34 +#: builtin/merge.c:1148 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Bạn chưa kết thúc việc hòa trộng (MERGE_HEAD vẫn tồn tại)." -#: builtin/merge.c:1153 +#: builtin/merge.c:1152 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." 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:1156 +#: builtin/merge.c:1155 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:1165 +#: builtin/merge.c:1164 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:1174 +#: builtin/merge.c:1173 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:1206 +#: builtin/merge.c:1205 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:1209 +#: builtin/merge.c:1208 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:1211 +#: builtin/merge.c:1210 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:1216 +#: builtin/merge.c:1215 #, 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:1267 +#: builtin/merge.c:1266 #, 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:1270 +#: builtin/merge.c:1269 #, 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:1273 +#: builtin/merge.c:1272 #, 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:1276 +#: builtin/merge.c:1275 #, 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:1357 +#: builtin/merge.c:1356 #, c-format msgid "Updating %s..%s\n" msgstr "Đang cập nhật %s..%s\n" -#: builtin/merge.c:1396 +#: builtin/merge.c:1395 #, 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:1403 +#: builtin/merge.c:1402 #, c-format msgid "Nope.\n" msgstr "Không.\n" -#: builtin/merge.c:1435 +#: builtin/merge.c:1434 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:1458 builtin/merge.c:1537 +#: builtin/merge.c:1457 builtin/merge.c:1536 #, 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:1462 +#: builtin/merge.c:1461 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Đang thử chiến lược hòa trộn %s...\n" -#: builtin/merge.c:1528 +#: builtin/merge.c:1527 #, 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:1530 +#: builtin/merge.c:1529 #, 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:1539 +#: builtin/merge.c:1538 #, 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:1551 +#: builtin/merge.c:1550 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7194,87 +7395,91 @@ msgstr "cho phép tạo nhiều hơn một cây" msgid "git mv [options] <source>... <destination>" msgstr "git mv [các-tùy-chọn] <nguồn>... <đích>" +#: builtin/mv.c:69 +#, c-format +msgid "Directory %s is in index and no submodule?" +msgstr "Thư mục “%s” có ở trong chỉ mục mà không có mô-đun con?" + #: builtin/mv.c:71 +msgid "Please stage your changes to .gitmodules or stash them to proceed" +msgstr "" +"Hãy đưa các thay đổi của bạn vào .gitmodules hay tạm cất chúng đi để xử lý" + +#: builtin/mv.c:89 +#, c-format +msgid "%.*s is in index" +msgstr "%.*s trong bảng mục lục" + +#: builtin/mv.c:111 msgid "force move/rename even if target exists" msgstr "ép buộc di chuyển hay đổi tên thậm chí cả khi đích đã tồn tại" -#: builtin/mv.c:72 +#: builtin/mv.c:112 msgid "skip move/rename errors" msgstr "bỏ qua các lỗi liên quan đến di chuyển, đổi tên" -#: builtin/mv.c:122 +#: builtin/mv.c:151 +#, c-format +msgid "destination '%s' is not a directory" +msgstr "có đích “%s” nhưng đây không phải là một thư mục" + +#: builtin/mv.c:162 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Đang kiểm tra việc đổi tên của “%s” thành “%s”\n" -#: builtin/mv.c:126 +#: builtin/mv.c:166 msgid "bad source" msgstr "nguồn sai" -#: builtin/mv.c:129 +#: builtin/mv.c:169 msgid "can not move directory into itself" msgstr "không thể di chuyển một thư mục vào trong chính nó được" -#: builtin/mv.c:132 +#: builtin/mv.c:172 msgid "cannot move directory over file" msgstr "không di chuyển được thư mục thông qua tập tin" -#: builtin/mv.c:138 -#, c-format -msgid "Huh? Directory %s is in index and no submodule?" -msgstr "Hả? Thư mục “%s” trong chỉ mục và không mô-đun con?" - -#: builtin/mv.c:140 builtin/rm.c:318 -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/mv.c:156 -#, c-format -msgid "Huh? %.*s is in index?" -msgstr "Hả? %.*s trong bảng mục lục à?" - -#: builtin/mv.c:169 +#: builtin/mv.c:181 msgid "source directory is empty" msgstr "thư mục nguồn là trống rỗng" -#: builtin/mv.c:205 +#: builtin/mv.c:206 msgid "not under version control" msgstr "không nằm dưới sự quản lý mã nguồn" -#: builtin/mv.c:208 +#: builtin/mv.c:209 msgid "destination exists" msgstr "đích đã tồn tại sẵn rồi" -#: builtin/mv.c:216 +#: builtin/mv.c:217 #, c-format msgid "overwriting '%s'" msgstr "đang ghi đè lên “%s”" -#: builtin/mv.c:219 +#: builtin/mv.c:220 msgid "Cannot overwrite" msgstr "Không thể ghi đè" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "multiple sources for the same target" msgstr "Nhiều nguồn cho cùng một đích" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "destination directory does not exist" msgstr "thư mục đích không tồn tại" -#: builtin/mv.c:244 +#: builtin/mv.c:232 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, nguồn=%s, đích=%s" -#: builtin/mv.c:254 +#: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" msgstr "Đổi tên %s thành %s\n" -#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358 #, c-format msgid "renaming '%s' failed" msgstr "gặp lỗi khi đổi tên “%s”" @@ -7301,7 +7506,7 @@ msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao" #: builtin/name-rev.c:312 msgid "only use refs matching <pattern>" -msgstr "chỉ sử dụng các tham chiếu (refs) khớp với <mẫu>" +msgstr "chỉ sử dụng các tham chiếu khớp với <mẫu>" #: builtin/name-rev.c:314 msgid "list all commits reachable from all refs" @@ -7430,119 +7635,119 @@ msgstr "git notes prune [<các-tùy-chọn>]" msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:137 +#: builtin/notes.c:136 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "không thể khởi chạy “show” cho đối tượng “%s”" -#: builtin/notes.c:141 +#: builtin/notes.c:140 msgid "could not read 'show' output" msgstr "không thể đọc kết xuất “show”" -#: builtin/notes.c:149 +#: builtin/notes.c:148 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "gặp lỗi khi hoàn thành “show” cho đối tượng “%s”" -#: builtin/notes.c:167 builtin/tag.c:477 +#: builtin/notes.c:166 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "không thể tạo tập tin “%s”" -#: builtin/notes.c:186 +#: builtin/notes.c:185 msgid "Please supply the note contents using either -m or -F option" msgstr "" "Xin hãy áp dụng nội dung của ghi chú sử dụng hoặc là tùy chọn -m hoặc là -F" -#: builtin/notes.c:207 builtin/notes.c:848 +#: builtin/notes.c:206 builtin/notes.c:847 #, c-format msgid "Removing note for object %s\n" msgstr "Đang gỡ bỏ ghi chú (note) cho đối tượng %s\n" -#: builtin/notes.c:212 +#: builtin/notes.c:211 msgid "unable to write note object" msgstr "không thể ghi đối tượng ghi chú (note)" -#: builtin/notes.c:214 +#: builtin/notes.c:213 #, c-format -msgid "The note contents has been left in %s" +msgid "The note contents have been left in %s" msgstr "Nội dung ghi chú còn lại %s" -#: builtin/notes.c:248 builtin/tag.c:692 +#: builtin/notes.c:247 builtin/tag.c:693 #, c-format msgid "cannot read '%s'" msgstr "không thể đọc “%s”" -#: builtin/notes.c:250 builtin/tag.c:695 +#: builtin/notes.c:249 builtin/tag.c:696 #, c-format msgid "could not open or read '%s'" msgstr "không thể mở hay đọc “%s”" -#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322 -#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519 -#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641 -#: builtin/notes.c:843 builtin/tag.c:708 +#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321 +#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518 +#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640 +#: builtin/notes.c:842 builtin/tag.c:709 #, c-format msgid "Failed to resolve '%s' as a valid ref." -msgstr "Gặp lỗi khi phân giải “%s” như là một tham chiếu (ref) hợp lệ." +msgstr "Gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ." -#: builtin/notes.c:272 +#: builtin/notes.c:271 #, c-format msgid "Failed to read object '%s'." msgstr "Gặp lỗi khi đọc đối tượng “%s”." -#: builtin/notes.c:276 +#: builtin/notes.c:275 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "không thể đọc dữ liệu ghi chú từ đối tượng không-blob “%s”." -#: builtin/notes.c:316 +#: builtin/notes.c:315 #, c-format msgid "Malformed input line: '%s'." msgstr "Dòng đầu vào dị hình: “%s”." -#: builtin/notes.c:331 +#: builtin/notes.c:330 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Gặp lỗi khi sao chép ghi chú (note) từ “%s” tới “%s”" -#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502 -#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634 -#: builtin/notes.c:908 +#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501 +#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633 +#: builtin/notes.c:907 msgid "too many parameters" msgstr "quá nhiều đối số" -#: builtin/notes.c:388 builtin/notes.c:647 +#: builtin/notes.c:387 builtin/notes.c:646 #, c-format msgid "No note found for object %s." msgstr "không tìm thấy ghi chú cho đối tượng %s." -#: builtin/notes.c:410 builtin/notes.c:567 +#: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents as a string" msgstr "nội dung ghi chú (note) nằm trong một chuỗi" -#: builtin/notes.c:413 builtin/notes.c:570 +#: builtin/notes.c:412 builtin/notes.c:569 msgid "note contents in a file" msgstr "nội dung ghi chú (note) nằm trong một tập tin" -#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572 -#: builtin/notes.c:575 builtin/tag.c:627 +#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571 +#: builtin/notes.c:574 builtin/tag.c:628 msgid "object" msgstr "đối tượng" -#: builtin/notes.c:416 builtin/notes.c:573 +#: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "dùng lại nhưng có sửa chữa đối tượng note đã chỉ ra" -#: builtin/notes.c:419 builtin/notes.c:576 +#: builtin/notes.c:418 builtin/notes.c:575 msgid "reuse specified note object" msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra" -#: builtin/notes.c:421 builtin/notes.c:489 +#: builtin/notes.c:420 builtin/notes.c:488 msgid "replace existing notes" msgstr "thay thế ghi chú trước" -#: builtin/notes.c:455 +#: builtin/notes.c:454 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7551,24 +7756,24 @@ msgstr "" "Không thể thêm các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối tượng " "%s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ" -#: builtin/notes.c:460 builtin/notes.c:537 +#: builtin/notes.c:459 builtin/notes.c:536 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Đang ghi đè lên ghi chú cũ cho đối tượng %s\n" -#: builtin/notes.c:490 +#: builtin/notes.c:489 msgid "read objects from stdin" msgstr "đọc các đối tượng từ đầu vào tiêu chuẩn" -#: builtin/notes.c:492 +#: builtin/notes.c:491 msgid "load rewriting config for <command> (implies --stdin)" msgstr "tải cấu hình chép lại cho <lệnh> (ngầm định là --stdin)" -#: builtin/notes.c:510 +#: builtin/notes.c:509 msgid "too few parameters" msgstr "quá ít đối số" -#: builtin/notes.c:531 +#: builtin/notes.c:530 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7577,12 +7782,12 @@ msgstr "" "Không thể sao chép các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối " "tượng %s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ" -#: builtin/notes.c:543 +#: builtin/notes.c:542 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Thiếu ghi chú trên đối tượng nguồn %s. Không thể sao chép." -#: builtin/notes.c:592 +#: builtin/notes.c:591 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -7591,15 +7796,15 @@ msgstr "" "Các tùy chọn -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “edit”.\n" "Xin hãy sử dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-C”.\n" -#: builtin/notes.c:739 +#: builtin/notes.c:738 msgid "General options" msgstr "Tùy chọn chung" -#: builtin/notes.c:741 +#: builtin/notes.c:740 msgid "Merge options" msgstr "Tùy chọn về hòa trộn" -#: builtin/notes.c:743 +#: builtin/notes.c:742 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -7607,229 +7812,233 @@ msgstr "" "phân giải các xung đột “notes” sử dụng chiến lược đã đưa ra (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:745 +#: builtin/notes.c:744 msgid "Committing unmerged notes" msgstr "Chuyển giao các note chưa được hòa trộn" -#: builtin/notes.c:747 +#: builtin/notes.c:746 msgid "finalize notes merge by committing unmerged notes" msgstr "" "các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển " "giao" -#: builtin/notes.c:749 +#: builtin/notes.c:748 msgid "Aborting notes merge resolution" msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn" -#: builtin/notes.c:751 +#: builtin/notes.c:750 msgid "abort notes merge" msgstr "bỏ qua hòa trộn các ghi chú (note)" -#: builtin/notes.c:846 +#: builtin/notes.c:845 #, c-format msgid "Object %s has no note\n" msgstr "Đối tượng %s không có ghi chú (note)\n" -#: builtin/notes.c:858 +#: builtin/notes.c:857 msgid "attempt to remove non-existent note is not an error" msgstr "cố gắng gỡ bỏ một note chưa từng tồn tại không phải là một lỗi" -#: builtin/notes.c:861 +#: builtin/notes.c:860 msgid "read object names from the standard input" msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn" -#: builtin/notes.c:942 +#: builtin/notes.c:941 msgid "notes-ref" msgstr "notes-ref" -#: builtin/notes.c:943 +#: builtin/notes.c:942 msgid "use notes from <notes_ref>" msgstr "dùng “notes” từ <notes_ref>" -#: builtin/notes.c:978 builtin/remote.c:1616 +#: builtin/notes.c:977 builtin/remote.c:1624 #, c-format msgid "Unknown subcommand: %s" msgstr "Không hiểu câu lệnh con: %s" -#: builtin/pack-objects.c:25 +#: builtin/pack-objects.c:28 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "" "git pack-objects --stdout [các-tùy-chọn...] [< danh-sách-ref | < danh-sách-" "đối-tượng]" -#: builtin/pack-objects.c:26 +#: builtin/pack-objects.c:29 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" "git pack-objects [các-tùy-chọn...] base-name [< danh-sách-ref | < danh-sách-" "đối-tượng]" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "lỗi giải nén (%d)" -#: builtin/pack-objects.c:771 +#: builtin/pack-objects.c:773 msgid "Writing objects" msgstr "Đang ghi lại các đối tượng" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1015 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:2174 +#: builtin/pack-objects.c:2175 msgid "Compressing objects" msgstr "Đang nén các đối tượng" -#: builtin/pack-objects.c:2526 +#: builtin/pack-objects.c:2572 #, 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:2530 +#: builtin/pack-objects.c:2576 #, c-format msgid "bad index version '%s'" msgstr "phiên bản mục lục sai “%s”" -#: builtin/pack-objects.c:2553 +#: builtin/pack-objects.c:2599 #, 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:2557 +#: builtin/pack-objects.c:2603 #, 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:2576 +#: builtin/pack-objects.c:2622 msgid "do not show progress meter" msgstr "không hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2578 +#: builtin/pack-objects.c:2624 msgid "show progress meter" msgstr "hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c:2626 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:2583 +#: builtin/pack-objects.c:2629 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:2584 +#: builtin/pack-objects.c:2630 msgid "version[,offset]" msgstr "phiên bản[,offset]" -#: builtin/pack-objects.c:2585 +#: builtin/pack-objects.c:2631 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:2588 +#: builtin/pack-objects.c:2634 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:2590 +#: builtin/pack-objects.c:2636 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:2592 +#: builtin/pack-objects.c:2638 msgid "ignore packed objects" msgstr "bỏ qua các đối tượng đóng gói" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2640 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:2596 +#: builtin/pack-objects.c:2642 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:2598 +#: builtin/pack-objects.c:2644 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:2600 +#: builtin/pack-objects.c:2646 msgid "reuse existing deltas" msgstr "dùng lại các delta sẵn có" -#: builtin/pack-objects.c:2602 +#: builtin/pack-objects.c:2648 msgid "reuse existing objects" msgstr "dùng lại các đối tượng sẵn có" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2650 msgid "use OFS_DELTA objects" msgstr "dùng các đối tượng OFS_DELTA" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2652 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:2608 +#: builtin/pack-objects.c:2654 msgid "do not create an empty pack output" -msgstr "không thể tạo kết xuất gói (pack) trống rỗng" +msgstr "không thể tạo kết xuất gói trống rỗng" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2656 msgid "read revision arguments from standard input" msgstr " đọc tham số “revision” từ thiết bị nhập chuẩn" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2658 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:2615 +#: builtin/pack-objects.c:2661 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:2618 +#: builtin/pack-objects.c:2664 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:2621 +#: builtin/pack-objects.c:2667 +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:2670 msgid "output pack to stdout" msgstr "xuất gói ra đầu ra tiêu chuẩn" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2672 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:2625 +#: builtin/pack-objects.c:2674 msgid "keep unreachable objects" msgstr "giữ lại các đối tượng không thể đọc được" -#: builtin/pack-objects.c:2626 parse-options.h:140 +#: builtin/pack-objects.c:2675 parse-options.h:140 msgid "time" msgstr "thời-gian" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2676 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:2630 +#: builtin/pack-objects.c:2679 msgid "create thin packs" msgstr "tạo gói nhẹ" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2681 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:2634 +#: builtin/pack-objects.c:2683 msgid "pack compression level" msgstr "mức nén gói" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2685 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:2638 +#: builtin/pack-objects.c:2687 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:2640 +#: builtin/pack-objects.c:2689 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:2719 +#: builtin/pack-objects.c:2778 msgid "Counting objects" msgstr "Đang đếm các đối tượng" @@ -7843,13 +8052,13 @@ msgstr "đóng gói mọi thứ" #: builtin/pack-refs.c:15 msgid "prune loose refs (default)" -msgstr "prune (cắt cụt) những tham chiếu (refs) bị mất (mặc định)" +msgstr "prune (cắt cụt) những tham chiếu bị mất (mặc định)" #: builtin/prune-packed.c:7 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" -#: builtin/prune-packed.c:49 +#: builtin/prune-packed.c:40 msgid "Removing duplicate objects" msgstr "Đang gỡ các đối tượng trùng lặp" @@ -7857,15 +8066,15 @@ msgstr "Đang gỡ các đối tượng trùng lặp" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <thời-gian>] [--] [<head>...]" -#: builtin/prune.c:142 +#: builtin/prune.c:106 msgid "do not remove, show only" msgstr "không gỡ bỏ, chỉ hiển thị" -#: builtin/prune.c:143 +#: builtin/prune.c:107 msgid "report pruned objects" msgstr "báo cáo các đối tượng đã prune" -#: builtin/prune.c:146 +#: builtin/prune.c:110 msgid "expire objects older than <time>" msgstr "các đối tượng hết hạn cũ hơn khoảng <thời gian>" @@ -7879,7 +8088,7 @@ msgstr "dùng tốc ký tag không có <thẻ>" #: builtin/push.c:95 msgid "--delete only accepts plain target ref names" -msgstr "--delete chỉ chấp nhận các tên tham chiếu (ref) dạng thường" +msgstr "--delete chỉ chấp nhận các tên tham chiếu dạng thường" #: builtin/push.c:139 msgid "" @@ -8079,7 +8288,7 @@ msgstr "Đang đẩy lên %s\n" #: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" -msgstr "gặp lỗi khi đẩy tới một số tham chiếu (ref) đến “%s”" +msgstr "gặp lỗi khi đẩy tới một số tham chiếu đến “%s”" #: builtin/push.c:394 #, c-format @@ -8127,79 +8336,79 @@ msgstr "--mirror không thể được tổ hợp cùng với đặc tả đư msgid "--all and --mirror are incompatible" msgstr "--all và --mirror xung khắc nhau" -#: builtin/push.c:482 +#: builtin/push.c:493 msgid "repository" msgstr "kho" -#: builtin/push.c:483 +#: builtin/push.c:494 msgid "push all refs" msgstr "đẩy tất cả các tham chiếu" -#: builtin/push.c:484 +#: builtin/push.c:495 msgid "mirror all refs" msgstr "mirror tất cả các tham chiếu" -#: builtin/push.c:486 +#: builtin/push.c:497 msgid "delete refs" msgstr "xóa các tham chiếu" -#: builtin/push.c:487 +#: builtin/push.c:498 msgid "push tags (can't be used with --all or --mirror)" msgstr "đẩy các thẻ (không dùng cùng với --all hay --mirror)" -#: builtin/push.c:490 +#: builtin/push.c:501 msgid "force updates" msgstr "ép buộc cập nhật" -#: builtin/push.c:492 +#: builtin/push.c:503 msgid "refname>:<expect" msgstr "tên-tham-chiếu>:<cần" -#: builtin/push.c:493 +#: builtin/push.c:504 msgid "require old value of ref to be at this value" msgstr "yêu cầu giá-trị cũ của tham chiếu thì là giá-trị này" -#: builtin/push.c:495 -msgid "check" -msgstr "kiểm tra" - -#: builtin/push.c:496 +#: builtin/push.c:507 msgid "control recursive pushing of submodules" msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con" -#: builtin/push.c:498 +#: builtin/push.c:509 msgid "use thin pack" msgstr "tạo gói nhẹ" -#: builtin/push.c:499 builtin/push.c:500 +#: builtin/push.c:510 builtin/push.c:511 msgid "receive pack program" msgstr "chương trình nhận gói" -#: builtin/push.c:501 +#: builtin/push.c:512 msgid "set upstream for git pull/status" msgstr "đặt thượng nguồn cho git pull/status" -#: builtin/push.c:504 +#: builtin/push.c:515 msgid "prune locally removed refs" -msgstr "xén tỉa những tham chiếu (refs) bị gỡ bỏ" +msgstr "xén tỉa những tham chiếu bị gỡ bỏ" -#: builtin/push.c:506 +#: builtin/push.c:517 msgid "bypass pre-push hook" msgstr "vòng qua móc tiền-đẩy (pre-push)" -#: builtin/push.c:507 +#: builtin/push.c:518 msgid "push missing but relevant tags" msgstr "push phần bị thiếu nhưng nhưng các thẻ lại thích hợp" -#: builtin/push.c:517 +#: builtin/push.c:520 +msgid "GPG sign the push" +msgstr "ký lần đẩy dùng GPG" + +#: builtin/push.c:529 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete là xung khắc với các tùy chọn --all, --mirror và --tags" -#: builtin/push.c:519 +#: builtin/push.c:531 msgid "--delete doesn't make sense without any refs" -msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu (refs) nào" +msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu nào" -#: builtin/read-tree.c:36 +#: builtin/read-tree.c:37 msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -8210,68 +8419,68 @@ msgstr "" "[--index-output=<tập-tin>] (--empty | <tree-ish1> [<tree-ish2> [<tree-" "ish3>]])" -#: builtin/read-tree.c:109 +#: builtin/read-tree.c:110 msgid "write resulting index to <file>" msgstr "ghi mục lục kết quả vào <tập-tin>" -#: builtin/read-tree.c:112 +#: builtin/read-tree.c:113 msgid "only empty the index" msgstr "chỉ với bảng mục lục trống rỗng" -#: builtin/read-tree.c:114 +#: builtin/read-tree.c:115 msgid "Merging" msgstr "Hòa trộn" -#: builtin/read-tree.c:116 +#: builtin/read-tree.c:117 msgid "perform a merge in addition to a read" msgstr "thực hiện một hòa trộn thêm vào việc đọc" -#: builtin/read-tree.c:118 +#: builtin/read-tree.c:119 msgid "3-way merge if no file level merging required" msgstr "" "hòa trộn kiểu “3-way” nếu không có tập tin mức hòa trộn nào được yêu cầu " -#: builtin/read-tree.c:120 +#: builtin/read-tree.c:121 msgid "3-way merge in presence of adds and removes" msgstr "hòa trộn 3-way trong sự hiện diện của “adds” và “removes”" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:123 msgid "same as -m, but discard unmerged entries" msgstr "giống với -m, nhưng bỏ qua các mục chưa được hòa trộn" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "<subdirectory>/" msgstr "<thư-mục-con>/" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:125 msgid "read the tree into the index under <subdirectory>/" msgstr "đọc cây vào trong bảng mục lục dưới <thư_mục_con>/" -#: builtin/read-tree.c:127 +#: builtin/read-tree.c:128 msgid "update working tree with merge result" msgstr "cập nhật cây làm việc với kết quả hòa trộn" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:131 msgid "allow explicitly ignored files to be overwritten" msgstr "cho phép các tập tin rõ ràng bị lờ đi được ghi đè" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't check the working tree after merging" msgstr "không kiểm tra cây làm việc sau hòa trộn" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:135 msgid "don't update the index or the work tree" msgstr "không cập nhật bảng mục lục hay cây làm việc" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" msgstr "bỏ qua áp dụng bộ lọc lấy ra (checkout) thưa thớt" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "gỡ lỗi “unpack-trees”" @@ -8421,12 +8630,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:185 builtin/remote.c:640 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "máy chủ %s đã tồn tại rồi." -#: builtin/remote.c:189 builtin/remote.c:644 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "“%s” không phải tên máy chủ hợp lệ" @@ -8436,11 +8645,6 @@ msgstr "“%s” không phải tên máy chủ hợp lệ" msgid "Could not setup master '%s'" msgstr "Không thể cài đặt nhánh master “%s”" -#: builtin/remote.c:288 -#, c-format -msgid "more than one %s" -msgstr "nhiều hơn một %s" - #: builtin/remote.c:333 #, c-format msgid "Could not get fetch map for refspec %s" @@ -8454,27 +8658,27 @@ msgstr "(khớp)" msgid "(delete)" msgstr "(xóa)" -#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Không thể nối thêm “%s” vào “%s”" -#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894 +#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898 #, c-format msgid "No such remote: %s" msgstr "Không có máy chủ nào như thế: %s" -#: builtin/remote.c:650 +#: builtin/remote.c:651 #, 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:656 builtin/remote.c:846 +#: builtin/remote.c:657 builtin/remote.c:850 #, 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:671 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8485,32 +8689,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:677 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "Không thể nối thêm “%s”" -#: builtin/remote.c:688 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "Không thể đặt “%s”" -#: builtin/remote.c:710 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "gặp lỗi khi xoá “%s”" -#: builtin/remote.c:744 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "gặp lỗi khi tạo “%s”" -#: builtin/remote.c:765 +#: builtin/remote.c:769 #, c-format msgid "Could not remove branch %s" msgstr "Không thể gỡ bỏ nhánh “%s”" -#: builtin/remote.c:832 +#: builtin/remote.c:836 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8525,262 +8729,262 @@ msgstr[1] "" "đi;\n" "để xóa đi, sử dụng:" -#: builtin/remote.c:947 +#: builtin/remote.c:951 #, 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:950 +#: builtin/remote.c:954 msgid " tracked" msgstr " được theo dõi" -#: builtin/remote.c:952 +#: builtin/remote.c:956 msgid " stale (use 'git remote prune' to remove)" msgstr " cũ rích (dùng “git remote prune” để gỡ bỏ)" -#: builtin/remote.c:954 +#: builtin/remote.c:958 msgid " ???" msgstr " ???" -#: builtin/remote.c:995 +#: builtin/remote.c:999 #, 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:1002 +#: builtin/remote.c:1006 #, c-format msgid "rebases onto remote %s" msgstr "thực hiện rebase trên máy chủ %s" -#: builtin/remote.c:1005 +#: builtin/remote.c:1009 #, c-format msgid " merges with remote %s" msgstr " hòa trộn với máy chủ %s" -#: builtin/remote.c:1006 +#: builtin/remote.c:1010 msgid " and with remote" msgstr " và với máy chủ" -#: builtin/remote.c:1008 +#: builtin/remote.c:1012 #, c-format msgid "merges with remote %s" msgstr "hòa trộn với máy chủ %s" -#: builtin/remote.c:1009 +#: builtin/remote.c:1013 msgid " and with remote" msgstr " và với máy chủ" -#: builtin/remote.c:1055 +#: builtin/remote.c:1059 msgid "create" msgstr "tạo" -#: builtin/remote.c:1058 +#: builtin/remote.c:1062 msgid "delete" msgstr "xoá" -#: builtin/remote.c:1062 +#: builtin/remote.c:1066 msgid "up to date" msgstr "đã cập nhật" -#: builtin/remote.c:1065 +#: builtin/remote.c:1069 msgid "fast-forwardable" msgstr "có-thể-fast-forward" -#: builtin/remote.c:1068 +#: builtin/remote.c:1072 msgid "local out of date" msgstr "dữ liệu nội bộ đã cũ" -#: builtin/remote.c:1075 +#: builtin/remote.c:1079 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s ép buộc thành %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1082 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s đẩy lên thành %-*s (%s)" -#: builtin/remote.c:1082 +#: builtin/remote.c:1086 #, c-format msgid " %-*s forces to %s" msgstr " %-*s ép buộc thành %s" -#: builtin/remote.c:1085 +#: builtin/remote.c:1089 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s đẩy lên thành %s" -#: builtin/remote.c:1153 +#: builtin/remote.c:1157 msgid "do not query remotes" msgstr "không truy vấn các máy chủ" -#: builtin/remote.c:1180 +#: builtin/remote.c:1184 #, c-format msgid "* remote %s" msgstr "* máy chủ %s" -#: builtin/remote.c:1181 +#: builtin/remote.c:1185 #, c-format msgid " Fetch URL: %s" msgstr " URL để lấy về: %s" -#: builtin/remote.c:1182 builtin/remote.c:1329 +#: builtin/remote.c:1186 builtin/remote.c:1333 msgid "(no URL)" msgstr "(không có URL)" -#: builtin/remote.c:1191 builtin/remote.c:1193 +#: builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " Push URL: %s" msgstr " URL để đẩy lên: %s" -#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199 +#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203 #, c-format msgid " HEAD branch: %s" msgstr " Nhánh HEAD: %s" -#: builtin/remote.c:1201 +#: builtin/remote.c:1205 #, 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:1213 +#: builtin/remote.c:1217 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Nhánh trên máy chủ:%s" msgstr[1] " Những nhánh trên máy chủ:%s" -#: builtin/remote.c:1216 builtin/remote.c:1243 +#: builtin/remote.c:1220 builtin/remote.c:1247 msgid " (status not queried)" msgstr " (trạng thái không được yêu cầu)" -#: builtin/remote.c:1225 +#: builtin/remote.c:1229 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Nhánh nội bộ đã được cấu hình cho lệnh “git pull”:" msgstr[1] " Những nhánh nội bộ đã được cấu hình cho lệnh “git pull”:" -#: builtin/remote.c:1233 +#: builtin/remote.c:1237 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:1240 +#: builtin/remote.c:1244 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Tham chiếu nội bộ được cấu hình cho lệnh “git push”%s:" msgstr[1] " Những tham chiếu nội bộ được cấu hình cho lệnh “git push”%s:" -#: builtin/remote.c:1261 +#: builtin/remote.c:1265 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:1263 +#: builtin/remote.c:1267 msgid "delete refs/remotes/<name>/HEAD" msgstr "xóa refs/remotes/<tên>/HEAD" -#: builtin/remote.c:1278 +#: builtin/remote.c:1282 msgid "Cannot determine remote HEAD" msgstr "Không thể xác định được HEAD máy chủ" -#: builtin/remote.c:1280 +#: builtin/remote.c:1284 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:1290 +#: builtin/remote.c:1294 #, c-format msgid "Could not delete %s" msgstr "Không thể xóa bỏ %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1302 #, c-format msgid "Not a valid ref: %s" msgstr "Không phải là tham chiếu hợp lệ: %s" -#: builtin/remote.c:1300 +#: builtin/remote.c:1304 #, c-format msgid "Could not setup %s" msgstr "Không thể cài đặt %s" -#: builtin/remote.c:1318 +#: builtin/remote.c:1322 #, 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:1319 +#: builtin/remote.c:1323 #, c-format msgid " %s has become dangling!" msgstr " %s đã trở thành không đầu (không được quản lý)!" -#: builtin/remote.c:1325 +#: builtin/remote.c:1329 #, c-format msgid "Pruning %s" msgstr "Đang xén bớt %s" -#: builtin/remote.c:1326 +#: builtin/remote.c:1330 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1349 +#: builtin/remote.c:1357 #, c-format msgid " * [would prune] %s" msgstr " * [nên xén bớt] %s" -#: builtin/remote.c:1352 +#: builtin/remote.c:1360 #, c-format msgid " * [pruned] %s" msgstr " *[đã bị xén] %s" -#: builtin/remote.c:1397 +#: builtin/remote.c:1405 msgid "prune remotes after fetching" msgstr "cắt máy chủ sau khi lấy về" -#: builtin/remote.c:1463 builtin/remote.c:1537 +#: builtin/remote.c:1471 builtin/remote.c:1545 #, c-format msgid "No such remote '%s'" msgstr "Không có máy chủ nào có tên “%s”" -#: builtin/remote.c:1483 +#: builtin/remote.c:1491 msgid "add branch" msgstr "thêm nhánh" -#: builtin/remote.c:1490 +#: builtin/remote.c:1498 msgid "no remote specified" msgstr "chưa chỉ ra máy chủ nào" -#: builtin/remote.c:1512 +#: builtin/remote.c:1520 msgid "manipulate push URLs" msgstr "đẩy các “URL” bằng tay" -#: builtin/remote.c:1514 +#: builtin/remote.c:1522 msgid "add URL" msgstr "thêm URL" -#: builtin/remote.c:1516 +#: builtin/remote.c:1524 msgid "delete URLs" msgstr "xóa URLs" -#: builtin/remote.c:1523 +#: builtin/remote.c:1531 msgid "--add --delete doesn't make sense" msgstr "--add --delete không hợp lý" -#: builtin/remote.c:1563 +#: builtin/remote.c:1571 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Kiểu mẫu URL cũ không hợp lệ: %s" -#: builtin/remote.c:1571 +#: builtin/remote.c:1579 #, c-format msgid "No such URL found: %s" msgstr "Không tìm thấy URL như vậy: %s" -#: builtin/remote.c:1573 +#: builtin/remote.c:1581 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:1587 +#: builtin/remote.c:1595 msgid "be verbose; must be placed before a subcommand" msgstr "chi tiết; phải được đặt trước một lệnh-con" @@ -8877,22 +9081,22 @@ msgstr "git replace -d <đối tượng>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<định_dạng>] [-l [<mẫu>]]" -#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388 +#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 #, c-format msgid "Not a valid object name: '%s'" msgstr "Không phải là tên đối tượng hợp lệ: “%s”" -#: builtin/replace.c:352 +#: builtin/replace.c:355 #, c-format msgid "bad mergetag in commit '%s'" msgstr "thẻ hòa trộn sai trong lần chuyển giao “%s”" -#: builtin/replace.c:354 +#: builtin/replace.c:357 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "thẻ hòa trộn không đúng dạng ở lần chuyển giao “%s”" -#: builtin/replace.c:365 +#: builtin/replace.c:368 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -8901,45 +9105,45 @@ msgstr "" "lần chuyển giao gốc “%s” có chứa thẻ hòa trộn “%s” cái mà bị loại bỏ; dùng " "tùy chọn --edit thay cho --graft" -#: builtin/replace.c:398 +#: builtin/replace.c:401 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "lần chuyển giao gốc “%s” có chữ ký GPG." -#: builtin/replace.c:399 +#: builtin/replace.c:402 msgid "the signature will be removed in the replacement commit!" msgstr "chữ ký sẽ được bỏ đi trong lần chuyển giao thay thế!" -#: builtin/replace.c:405 +#: builtin/replace.c:408 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "không thể ghi lần chuyển giao thay thế cho: “%s”" -#: builtin/replace.c:429 +#: builtin/replace.c:432 msgid "list replace refs" msgstr "liệt kê các refs thay thế" -#: builtin/replace.c:430 +#: builtin/replace.c:433 msgid "delete replace refs" -msgstr "xóa tham chiếu (refs) thay thế" +msgstr "xóa tham chiếu thay thế" -#: builtin/replace.c:431 +#: builtin/replace.c:434 msgid "edit existing object" msgstr "sửa đối tượng sẵn có" -#: builtin/replace.c:432 +#: builtin/replace.c:435 msgid "change a commit's parents" msgstr "thay đổi cha mẹ của lần chuyển giao" -#: builtin/replace.c:433 +#: builtin/replace.c:436 msgid "replace the ref if it exists" -msgstr "thay thế tham chiếu (ref) nếu nó đã sẵn có" +msgstr "thay thế tham chiếu nếu nó đã sẵn có" -#: builtin/replace.c:434 +#: builtin/replace.c:437 msgid "do not pretty-print contents for --edit" msgstr "đừng in đẹp các nội dung cho --edit" -#: builtin/replace.c:435 +#: builtin/replace.c:438 msgid "use this format" msgstr "dùng định dạng này" @@ -8951,156 +9155,156 @@ msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" msgid "register clean resolutions in index" msgstr "sổ ghi dọn sạch các phân giải trong bản mục lục" -#: builtin/reset.c:25 +#: builtin/reset.c:26 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -#: builtin/reset.c:26 +#: builtin/reset.c:27 msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "git reset [-q] <tree-ish> [--] <đường-dẫn>..." -#: builtin/reset.c:27 +#: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<tree-ish>] [--] [<các-đường-dẫn>...]" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "mixed" msgstr "pha trộn" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "soft" msgstr "mềm" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "hard" msgstr "cứng" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "merge" msgstr "hòa trộn" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "keep" msgstr "giữ lại" -#: builtin/reset.c:73 +#: builtin/reset.c:74 msgid "You do not have a valid HEAD." msgstr "Bạn không có HEAD nào hợp lệ." -#: builtin/reset.c:75 +#: builtin/reset.c:76 msgid "Failed to find tree of HEAD." msgstr "Gặp lỗi khi tìm cây của HEAD." -#: builtin/reset.c:81 +#: builtin/reset.c:82 #, c-format msgid "Failed to find tree of %s." msgstr "Gặp lỗi khi tìm cây của %s." -#: builtin/reset.c:99 +#: builtin/reset.c:100 #, c-format msgid "HEAD is now at %s" msgstr "HEAD hiện giờ tại %s" -#: builtin/reset.c:182 +#: builtin/reset.c:183 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Không thể thực hiện một %s reset ở giữa của quá trình hòa trộn." -#: builtin/reset.c:275 +#: builtin/reset.c:276 msgid "be quiet, only report errors" msgstr "làm việc ở chế độ im lặng, chỉ hiển thị khi có lỗi" -#: builtin/reset.c:277 +#: builtin/reset.c:278 msgid "reset HEAD and index" msgstr "đặt lại (reset) HEAD và bảng mục lục" -#: builtin/reset.c:278 +#: builtin/reset.c:279 msgid "reset only HEAD" msgstr "chỉ đặt lại (reset) HEAD" -#: builtin/reset.c:280 builtin/reset.c:282 +#: builtin/reset.c:281 builtin/reset.c:283 msgid "reset HEAD, index and working tree" msgstr "đặt lại HEAD, bảng mục lục và cây làm việc" -#: builtin/reset.c:284 +#: builtin/reset.c:285 msgid "reset HEAD but keep local changes" msgstr "đặt lại HEAD nhưng giữ lại các thay đổi nội bộ" -#: builtin/reset.c:287 +#: builtin/reset.c:288 msgid "record only the fact that removed paths will be added later" msgstr "chỉ ghi lại những đường dẫn thực sự sẽ được thêm vào sau này" -#: builtin/reset.c:304 +#: builtin/reset.c:305 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Gặp lỗi khi phân giải “%s” như là điểm xét duyệt hợp lệ." -#: builtin/reset.c:307 builtin/reset.c:315 +#: builtin/reset.c:308 builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "không thể phân tích đối tượng “%s”." -#: builtin/reset.c:312 +#: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Gặp lỗi khi phân giải “%s” như là một cây (tree) hợp lệ." -#: builtin/reset.c:321 +#: builtin/reset.c:322 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch xung khắc với --{hard,mixed,soft}" -#: builtin/reset.c:330 +#: builtin/reset.c:331 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed với các đường dẫn không còn dùng nữa; hãy thay thế bằng lệnh “git " "reset -- <đường_dẫn>”." -#: builtin/reset.c:332 +#: builtin/reset.c:333 #, c-format msgid "Cannot do %s reset with paths." msgstr "Không thể thực hiện lệnh %s reset với các đường dẫn." -#: builtin/reset.c:342 +#: builtin/reset.c:343 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s reset không được phép trên kho thuần" -#: builtin/reset.c:346 +#: builtin/reset.c:347 msgid "-N can only be used with --mixed" msgstr "-N chỉ được dùng khi có --mixed" -#: builtin/reset.c:363 +#: builtin/reset.c:364 msgid "Unstaged changes after reset:" msgstr "Những thay đổi được đưa ra khỏi bệ phóng sau khi reset:" -#: builtin/reset.c:369 +#: builtin/reset.c:370 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét duyệt “%s”." -#: builtin/reset.c:373 +#: builtin/reset.c:374 msgid "Could not write new index file." msgstr "Không thể ghi tập tin lưu bảng mục lục mới." -#: builtin/rev-parse.c:360 +#: builtin/rev-parse.c:361 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [các-tùy-chọn] -- [<th.số>...]" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" msgstr "giữ lại “--” chuyển sang làm tham số" -#: builtin/rev-parse.c:367 +#: builtin/rev-parse.c:368 msgid "stop parsing after the first non-option argument" msgstr "dừng phân tích sau đối số đầu tiên không có tùy chọn" -#: builtin/rev-parse.c:370 +#: builtin/rev-parse.c:371 msgid "output in stuck long form" msgstr "kết xuất trong định dạng gậy dài" -#: builtin/rev-parse.c:498 +#: builtin/rev-parse.c:499 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -9212,7 +9416,7 @@ msgid "" "the following submodule (or one of its nested submodules)\n" "uses a .git directory:" msgid_plural "" -"the following submodules (or one of its nested submodules)\n" +"the following submodules (or one of their nested submodules)\n" "use a .git directory:" msgstr[0] "" "mô-đun-con sau đây (hay một trong số mô-đun-con bên trong của nó)\n" @@ -9292,6 +9496,12 @@ msgstr "cho phép gỡ bỏ đệ qui" msgid "exit with a zero status even if nothing matched" msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp" +#: builtin/rm.c:318 +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 #, c-format msgid "not removing '%s' recursively without -r" @@ -9434,8 +9644,7 @@ msgstr "chỉ hiển thị đầu (có thể tổ hợp cùng với thẻ)" #: builtin/show-ref.c:170 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 " -"(ref)" +"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 msgid "show the HEAD reference, even if it would be filtered out" @@ -9457,8 +9666,8 @@ msgstr "" #: builtin/show-ref.c:185 msgid "show refs from stdin that aren't in local repository" msgstr "" -"hiển thị các tham chiếu (refs) từ đầu vào tiêu chuẩn (stdin) cái mà không ở " -"kho nội bộ" +"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 " +"bộ" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [options] name [ref]" @@ -9470,22 +9679,21 @@ msgstr "git symbolic-ref -d [-q] tên" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" -msgstr "" -"chặn các thông tin lỗi cho các tham chiếu (refs) “non-symbolic” (bị tách ra)" +msgstr "chặn các thông tin lỗi cho các tham chiếu “không-mềm” (bị tách ra)" #: builtin/symbolic-ref.c:41 msgid "delete symbolic ref" -msgstr "xóa tham chiếu (ref) tượng trưng" +msgstr "xóa tham chiếu mềm" #: builtin/symbolic-ref.c:42 msgid "shorten ref output" msgstr "làm ngắn kết xuất ref (tham chiếu)" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "lý do" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "lý do cập nhật" @@ -9545,7 +9753,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "" "\n" -"Viết các ghi chú cho (thẻ) tag\n" +"Viết các ghi chú cho thẻ:\n" " %s\n" "Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n" @@ -9608,240 +9816,230 @@ msgstr "chuyển đến “points-at” yêu cần một đối tượng" msgid "malformed object name '%s'" msgstr "tên đối tượng dị hình “%s”" -#: builtin/tag.c:588 +#: builtin/tag.c:589 msgid "list tag names" msgstr "chỉ liệt kê tên các thẻ" -#: builtin/tag.c:590 +#: builtin/tag.c:591 msgid "print <n> lines of each tag message" msgstr "hiển thị <n> dòng cho mỗi ghi chú" -#: builtin/tag.c:592 +#: builtin/tag.c:593 msgid "delete tags" msgstr "xóa thẻ" -#: builtin/tag.c:593 +#: builtin/tag.c:594 msgid "verify tags" msgstr "thẩm tra thẻ" -#: builtin/tag.c:595 +#: builtin/tag.c:596 msgid "Tag creation options" msgstr "Tùy chọn tạo tag" -#: builtin/tag.c:597 +#: builtin/tag.c:598 msgid "annotated tag, needs a message" msgstr "để chú giải cho thẻ, cần một lời ghi chú" -#: builtin/tag.c:599 +#: builtin/tag.c:600 msgid "tag message" msgstr "tin nhắn cho thẻ (tag)" -#: builtin/tag.c:601 +#: builtin/tag.c:602 msgid "annotated and GPG-signed tag" msgstr "thẻ chú giải và ký kiểu GPG" -#: builtin/tag.c:605 +#: builtin/tag.c:606 msgid "use another key to sign the tag" msgstr "dùng kháo khác để ký thẻ" -#: builtin/tag.c:606 +#: builtin/tag.c:607 msgid "replace the tag if exists" msgstr "thay thế nếu tag đó đã có trước" -#: builtin/tag.c:607 +#: builtin/tag.c:608 msgid "show tag list in columns" msgstr "hiển thị danh sách thẻ trong các cột" -#: builtin/tag.c:609 +#: builtin/tag.c:610 msgid "sort tags" msgstr "sắp xếp các thẻ" -#: builtin/tag.c:613 +#: builtin/tag.c:614 msgid "Tag listing options" msgstr "Các tùy chọn liệt kê thẻ" -#: builtin/tag.c:616 builtin/tag.c:622 +#: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" -#: builtin/tag.c:628 +#: builtin/tag.c:629 msgid "print only tags of the object" msgstr "chỉ hiển thị các thẻ của đối tượng" -#: builtin/tag.c:654 +#: builtin/tag.c:655 msgid "--column and -n are incompatible" msgstr "--column và -n xung khắc nhau" -#: builtin/tag.c:666 +#: builtin/tag.c:667 msgid "--sort and -n are incompatible" msgstr "--sort và -n xung khắc nhau" -#: builtin/tag.c:673 +#: builtin/tag.c:674 msgid "-n option is only allowed with -l." msgstr "tùy chọn -n chỉ cho phép dùng với -l." -#: builtin/tag.c:675 +#: builtin/tag.c:676 msgid "--contains option is only allowed with -l." msgstr "tùy chọn --contains chỉ cho phép dùng với -l." -#: builtin/tag.c:677 +#: builtin/tag.c:678 msgid "--points-at option is only allowed with -l." msgstr "tùy chọn --points-at chỉ cho phép dùng với -l." -#: builtin/tag.c:685 +#: builtin/tag.c:686 msgid "only one -F or -m option is allowed." msgstr "chỉ có một tùy chọn -F hoặc -m là được phép." -#: builtin/tag.c:705 +#: builtin/tag.c:706 msgid "too many params" msgstr "quá nhiều đối số" -#: builtin/tag.c:711 +#: builtin/tag.c:712 #, c-format msgid "'%s' is not a valid tag name." msgstr "“%s” không phải thẻ hợp lệ." -#: builtin/tag.c:716 +#: builtin/tag.c:717 #, c-format msgid "tag '%s' already exists" msgstr "Thẻ “%s” đã tồn tại rồi" -#: builtin/tag.c:734 -#, c-format -msgid "%s: cannot lock the ref" -msgstr "%s: không thể khóa ref (tham chiếu)" - -#: builtin/tag.c:736 -#, c-format -msgid "%s: cannot update the ref" -msgstr "%s: không thể cập nhật ref (tham chiếu)" - -#: builtin/tag.c:738 +#: builtin/tag.c:741 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n" -#: builtin/unpack-objects.c:483 +#: builtin/unpack-objects.c:489 msgid "Unpacking objects" msgstr "Đang giải nén các đối tượng" -#: builtin/update-index.c:402 +#: builtin/update-index.c:403 msgid "git update-index [options] [--] [<file>...]" msgstr "git update-index [các-tùy-chọn] [<tập-tin>...]" -#: builtin/update-index.c:755 +#: builtin/update-index.c:756 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:758 +#: builtin/update-index.c:759 msgid "refresh: ignore submodules" msgstr "refresh: lờ đi mô-đun-con" -#: builtin/update-index.c:761 +#: builtin/update-index.c:762 msgid "do not ignore new files" msgstr "không bỏ qua các tập tin mới tạo" -#: builtin/update-index.c:763 +#: builtin/update-index.c:764 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:765 +#: builtin/update-index.c:766 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:767 +#: builtin/update-index.c:768 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:770 +#: builtin/update-index.c:771 msgid "refresh stat information" msgstr "lấy lại thông tin thống kê" -#: builtin/update-index.c:774 +#: builtin/update-index.c:775 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:778 +#: builtin/update-index.c:779 msgid "<mode>,<object>,<path>" msgstr "<chế_độ>,<đối_tượng>,<đường_dẫn>" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 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:783 +#: builtin/update-index.c:784 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 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:788 +#: builtin/update-index.c:789 msgid "mark files as \"not changing\"" msgstr "Đánh dấu các tập tin là \"không thay đổi\"" -#: builtin/update-index.c:791 +#: builtin/update-index.c:792 msgid "clear assumed-unchanged bit" msgstr "xóa bít assumed-unchanged" -#: builtin/update-index.c:794 +#: builtin/update-index.c:795 msgid "mark files as \"index-only\"" msgstr "đánh dấu các tập tin là “chỉ-đọc”" -#: builtin/update-index.c:797 +#: builtin/update-index.c:798 msgid "clear skip-worktree bit" msgstr "xóa bít skip-worktree" -#: builtin/update-index.c:800 +#: builtin/update-index.c:801 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:802 +#: builtin/update-index.c:803 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:804 +#: builtin/update-index.c:805 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:806 +#: builtin/update-index.c:807 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:810 +#: builtin/update-index.c:811 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:814 +#: builtin/update-index.c:815 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:818 +#: builtin/update-index.c:819 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:822 +#: builtin/update-index.c:823 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:825 +#: builtin/update-index.c:826 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:827 +#: builtin/update-index.c:828 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:831 +#: builtin/update-index.c:832 msgid "write index in this format" msgstr "ghi mục lục ở định dạng này" -#: builtin/update-index.c:833 +#: builtin/update-index.c:834 msgid "enable or disable split index" msgstr "bật/tắt chia cắt bảng mục lục" @@ -9857,19 +10055,19 @@ msgstr "git update-ref [các-tùy-chọn] <refname> <biến-mới> [<biến-c msgid "git update-ref [options] --stdin [-z]" msgstr "git update-ref [các-tùy-chọn] --stdin [-z]" -#: builtin/update-ref.c:350 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "xóa tham chiếu" -#: builtin/update-ref.c:352 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "cập nhật <tên-tham-chiếu> không phải cái nó chỉ tới" -#: builtin/update-ref.c:353 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "đầu vào tiêu chuẩn có các đối số được chấm dứt bởi NUL" -#: builtin/update-ref.c:354 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "đọc cập nhật từ đầu vào tiêu chuẩn" @@ -9889,15 +10087,15 @@ msgstr "git verify-commit [-v|--verbose] <lần_chuyển_giao>..." msgid "print commit contents" msgstr "hiển thị nội dung của lần chuyển giao" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:54 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <gói>..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:64 msgid "verbose" msgstr "chi tiết" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:66 msgid "show statistics only" msgstr "chỉ hiển thị thống kê" @@ -9925,9 +10123,13 @@ msgstr "ghi đối tượng cây (tree) cho <tiền tố> thư mục con" msgid "only useful for debugging" msgstr "chỉ hữu ích khi cần gỡ lỗi" +#: credential-cache--daemon.c:267 +msgid "print debugging messages to stderr" +msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn" + #: git.c:17 msgid "" -"'git help -a' and 'git help -g' lists available subcommands and some\n" +"'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" @@ -9935,26 +10137,6 @@ 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ể." -#: parse-options.h:143 -msgid "expiry-date" -msgstr "ngày hết hạn" - -#: parse-options.h:158 -msgid "no-op (backward compatibility)" -msgstr "no-op (tương thích ngược)" - -#: parse-options.h:232 -msgid "be more verbose" -msgstr "chi tiết hơn nữa" - -#: parse-options.h:234 -msgid "be more quiet" -msgstr "im lặng hơn nữa" - -#: parse-options.h:240 -msgid "use <n> digits to display SHA-1s" -msgstr "sử dụng <n> chữ số để hiển thị SHA-1s" - #: common-cmds.h:8 msgid "Add file contents to the index" msgstr "Thêm nội dung tập tin vào bảng mục lục" @@ -10043,6 +10225,30 @@ msgstr "Hiển thị trạng thái cây làm việc" 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 +msgid "expiry-date" +msgstr "ngày hết hạn" + +#: parse-options.h:158 +msgid "no-op (backward compatibility)" +msgstr "no-op (tương thích ngược)" + +#: parse-options.h:232 +msgid "be more verbose" +msgstr "chi tiết hơn nữa" + +#: parse-options.h:234 +msgid "be more quiet" +msgstr "im lặng hơn nữa" + +#: parse-options.h:240 +msgid "use <n> digits to display SHA-1s" +msgstr "sử dụng <n> chữ số để hiển thị SHA-1s" + +#: rerere.h:27 +msgid "update the index with reused conflict resolution if possible" +msgstr "cập nhật bảng mục lục với phân giải xung đột dùng lại nếu được" + #: git-am.sh:52 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 đã" @@ -10265,7 +10471,7 @@ msgstr "sẽ không bisect trêm cây được cg-seek" #: git-bisect.sh:144 msgid "Bad HEAD - strange symbolic ref" -msgstr "HEAD sai - tham chiếu (ref) tượng trưng kỳ lạ" +msgstr "HEAD sai - tham chiếu mềm kỳ lạ" #: git-bisect.sh:189 #, sh-format @@ -10303,7 +10509,7 @@ msgstr "Bạn có chắc chắn chưa [Y/n]? " #: git-bisect.sh:289 msgid "" -"You need to give me at least one good and one bad revisions.\n" +"You need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Bạn phải chỉ cho tôi ít nhất một điểm xét duyệt tốt và một điểm sai.\n" @@ -10312,7 +10518,7 @@ msgstr "" #: git-bisect.sh:292 msgid "" "You need to start by \"git bisect start\".\n" -"You then need to give me at least one good and one bad revisions.\n" +"You then need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Bạn cần bắt đầu bằng lệnh \"git bisect start\".\n" @@ -10386,18 +10592,26 @@ msgstr "bisect chạy thành công" 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, or use 'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" "Pull là không thể được bởi vì bạn có những tập tin chưa được hòa trộn.\n" "Xin hãy sửa chữa chúng trước, và sau đó sử dụng lệnh “git add/rm <tập-tin>”\n" -"để phê chuẩn việc đánh dấu đây cần được giải quyết, hoặc là sử dụng “git " -"commit -a”." +"để 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 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 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +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 msgid "updating an unborn branch with changes added to the index" msgstr "" @@ -10664,7 +10878,7 @@ msgstr "Chỉ ra quá nhiều điểm xét duyệt: $REV" #: git-stash.sh:397 #, sh-format -msgid "$reference is not valid reference" +msgid "$reference is not a valid reference" msgstr "$reference không phải là tham chiếu hợp lệ" #: git-stash.sh:425 @@ -10711,11 +10925,11 @@ msgstr "Đã xóa ${REV} ($s)" msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Không thể xóa bỏ mục stash" -#: git-stash.sh:538 +#: git-stash.sh:539 msgid "No branch name specified" msgstr "Chưa chỉ ra tên của nhánh" -#: git-stash.sh:610 +#: git-stash.sh:611 msgid "(To restore them type \"git stash apply\")" msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")" @@ -11025,12 +11239,42 @@ 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 "Failed to lock ref for update" +#~ msgstr "Gặp lỗi khi khóa tham chiếu để cập nhật" + +#~ msgid "Failed to write ref" +#~ msgstr "Gặp lỗi khi ghi tham chiếu" + +#~ msgid "invalid commit: %s" +#~ msgstr "lần chuyển giao không hợp lệ: %s" + #~ msgid "commit has empty message" #~ msgstr "lần chuyển giao có ghi chú trống rỗng" +#~ msgid "cannot lock HEAD ref" +#~ msgstr "không thể khóa HEAD ref (tham chiếu)" + +#~ 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" +#~ msgid "cannot tell cwd" +#~ msgstr "không nói chuyện được với lệnh cwd" + +#~ msgid "%s: cannot lock the ref" +#~ msgstr "%s: không thể khóa ref (tham chiếu)" + +#~ msgid "%s: cannot update the ref" +#~ msgstr "%s: không thể cập nhật ref (tham chiếu)" + +#~ msgid "Failed to lock HEAD during fast_forward_to" +#~ msgstr "Gặp lỗi khi khóa HEAD trong quá trình fast_forward_to" + #~ msgid "key id" #~ msgstr "id của khóa" diff --git a/po/zh_CN.po b/po/zh_CN.po index 7cb670e..4b0e9ee 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2014-08-04 14:48+0800\n" -"PO-Revision-Date: 2014-08-04 16:16+0800\n" +"POT-Creation-Date: 2014-11-20 09:42+0800\n" +"PO-Revision-Date: 2014-11-20 16:10+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language: zh_CN\n" @@ -30,104 +30,103 @@ msgstr "提示：%.*s\n" #: advice.c:88 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, or use\n" -"'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" "请在工作区改正文件，然后酌情使用 'git add/rm <file>' 命令标记\n" -"解决方案并提交，或者使用 'git commit -a'。" +"解决方案并提交。" -#: archive.c:10 +#: archive.c:11 msgid "git archive [options] <tree-ish> [<path>...]" msgstr "git archive [选项] <树或提交> [<路径>...]" -#: archive.c:11 +#: archive.c:12 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:12 +#: archive.c:13 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" msgstr "" "git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]" -#: archive.c:13 +#: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <版本库> [--exec <命令>] --list" -#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规则 '%s' 未匹配任何文件" -#: archive.c:328 +#: archive.c:419 msgid "fmt" msgstr "格式" -#: archive.c:328 +#: archive.c:419 msgid "archive format" msgstr "归档格式" -#: archive.c:329 builtin/log.c:1201 +#: archive.c:420 builtin/log.c:1204 msgid "prefix" msgstr "前缀" -#: archive.c:330 +#: archive.c:421 msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709 -#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412 -#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151 +#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411 +#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "文件" -#: archive.c:332 builtin/archive.c:89 +#: archive.c:423 builtin/archive.c:89 msgid "write the archive to this file" msgstr "归档写入此文件" -#: archive.c:334 +#: archive.c:425 msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" -#: archive.c:335 +#: archive.c:426 msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" -#: archive.c:336 +#: archive.c:427 msgid "store only" msgstr "只存储" -#: archive.c:337 +#: archive.c:428 msgid "compress faster" msgstr "压缩速度更快" -#: archive.c:345 +#: archive.c:436 msgid "compress better" msgstr "压缩效果更好" -#: archive.c:348 +#: archive.c:439 msgid "list supported archive formats" msgstr "列出支持的归档格式" -#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 +#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85 msgid "repo" msgstr "版本库" -#: archive.c:351 builtin/archive.c:91 +#: archive.c:442 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "从远程版本库（<版本库>）提取归档文件" -#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 +#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490 msgid "command" msgstr "命令" -#: archive.c:353 builtin/archive.c:93 +#: archive.c:444 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" -#: attr.c:259 +#: attr.c:258 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -185,31 +184,31 @@ msgstr "分支 %s 设置为跟踪本地引用 %s。" msgid "Not tracking: ambiguous information for ref %s" msgstr "未跟踪：引用 %s 有歧义" -#: branch.c:178 +#: branch.c:162 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' 不是一个有效的分支名称。" -#: branch.c:183 +#: branch.c:167 #, c-format msgid "A branch named '%s' already exists." msgstr "一个分支名 '%s' 已经存在。" -#: branch.c:191 +#: branch.c:175 msgid "Cannot force update the current branch." msgstr "无法强制更新当前分支。" -#: branch.c:211 +#: branch.c:195 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。" -#: branch.c:213 +#: branch.c:197 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' 不存在" -#: branch.c:215 +#: branch.c:199 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -227,107 +226,105 @@ msgstr "" "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n" "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" -#: branch.c:260 +#: branch.c:243 #, c-format msgid "Not a valid object name: '%s'." msgstr "不是一个有效的对象名：'%s'。" -#: branch.c:280 +#: branch.c:263 #, c-format msgid "Ambiguous object name: '%s'." msgstr "歧义的对象名：'%s'。" -#: branch.c:285 +#: branch.c:268 #, c-format msgid "Not a valid branch point: '%s'." msgstr "无效的分支点：'%s'。" -#: branch.c:291 -msgid "Failed to lock ref for update" -msgstr "无法为更新锁定引用" - -#: branch.c:309 -msgid "Failed to write ref" -msgstr "不能写引用" - -#: bundle.c:33 +#: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' 不像是一个 v2 版本的包文件" -#: bundle.c:60 +#: bundle.c:61 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:86 builtin/commit.c:755 +#: bundle.c:87 builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" -#: bundle.c:138 +#: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的提交：" -#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330 -#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357 +#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706 +#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "版本遍历设置失败" -#: bundle.c:184 +#: bundle.c:185 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个包中含有这个引用：" msgstr[1] "这个包中含有 %d 个引用：" -#: bundle.c:191 +#: bundle.c:192 msgid "The bundle records a complete history." msgstr "这个包记录一个完整历史。" -#: bundle.c:193 +#: bundle.c:194 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个包需要这个引用：" msgstr[1] "这个包需要 %d 个引用：" -#: bundle.c:289 +#: bundle.c:251 +msgid "Could not spawn pack-objects" +msgstr "不能生成 pack-objects 进程" + +#: bundle.c:269 +msgid "pack-objects died" +msgstr "pack-objects 终止" + +#: bundle.c:309 msgid "rev-list died" msgstr "rev-list 终止" -#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261 -#, c-format -msgid "unrecognized argument: %s" -msgstr "未能识别的参数：%s" - -#: bundle.c:330 +#: bundle.c:358 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:375 +#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#, c-format +msgid "unrecognized argument: %s" +msgstr "未能识别的参数：%s" + +#: bundle.c:444 msgid "Refusing to create empty bundle." msgstr "不能创建空包。" -#: bundle.c:390 -msgid "Could not spawn pack-objects" -msgstr "不能生成 pack-objects 进程" - -#: bundle.c:408 -msgid "pack-objects died" -msgstr "pack-objects 终止" - -#: bundle.c:411 +#: bundle.c:454 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" -#: bundle.c:433 +#: bundle.c:475 msgid "index-pack died" msgstr "index-pack 终止" +#: color.c:157 +#, c-format +msgid "invalid color value: %.*s" +msgstr "无效的颜色值：%.*s" + #: commit.c:40 #, c-format msgid "could not parse %s" @@ -342,16 +339,69 @@ msgstr "%s %s 不是一个提交!" msgid "memory exhausted" msgstr "内存耗尽" -#: connected.c:70 +#: config.c:469 config.c:471 +#, c-format +msgid "bad config file line %d in %s" +msgstr "配置文件 %2$s 出错于第 %1$d 行" + +#: config.c:587 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s" + +#: config.c:589 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s" + +#: config.c:674 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "无法扩展 '%s' 中的用户目录" + +#: config.c:752 config.c:763 +#, c-format +msgid "bad zlib compression level %d" +msgstr "错误的 zlib 压缩级别 %d" + +#: config.c:885 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "无效的对象创建模式：%s" + +#: config.c:1201 +msgid "unable to parse command-line config" +msgstr "无法解析命令行中的配置" + +#: config.c:1262 +msgid "unknown error occured while reading the configuration files" +msgstr "在读取配置文件时遇到未知错误" + +#: config.c:1586 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "无法解析命令行配置中的 '%s'" + +#: config.c:1588 +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" + +#: config.c:1647 +#, c-format +msgid "%s has multiple values" +msgstr "%s 有多个取值" + +#: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "不能执行 'git rev-list'" -#: connected.c:90 +#: connected.c:89 #, c-format msgid "failed write to rev-list: %s" msgstr "无法写入 rev-list：%s" -#: connected.c:98 +#: connected.c:97 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "无法关闭 rev-list 的标准输入：%s" @@ -429,7 +479,7 @@ msgstr[1] "%lu 年前" msgid "failed to read orderfile '%s'" msgstr "无法读取排序文件 '%s'" -#: diffcore-rename.c:514 +#: diffcore-rename.c:516 msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名检测" @@ -450,7 +500,7 @@ msgstr " 未知的 dirstat 参数 '%s'\n" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" -#: diff.c:267 +#: diff.c:266 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -459,16 +509,16 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:2934 +#: diff.c:2957 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" -#: diff.c:3329 +#: diff.c:3352 msgid "--follow requires exactly one pathspec" msgstr "--follow 参数后只跟一个 pathspec" -#: diff.c:3492 +#: diff.c:3515 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -477,44 +527,44 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:3506 +#: diff.c:3529 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" -#: gpg-interface.c:73 gpg-interface.c:145 +#: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "不能执行 gpg。" -#: gpg-interface.c:85 +#: gpg-interface.c:141 msgid "gpg did not accept the data" msgstr "gpg 没有接受数据" -#: gpg-interface.c:96 +#: gpg-interface.c:152 msgid "gpg failed to sign the data" msgstr "gpg 无法为数据签名" -#: gpg-interface.c:129 +#: gpg-interface.c:185 #, c-format msgid "could not create temporary file '%s': %s" msgstr "不能创建临时文件 '%s'：%s" -#: gpg-interface.c:132 +#: gpg-interface.c:188 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "无法将分离式签名写入 '%s'：%s" -#: grep.c:1703 +#: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1720 +#: grep.c:1735 #, c-format msgid "'%s': %s" msgstr "'%s'：%s" -#: grep.c:1731 +#: grep.c:1746 #, c-format msgid "'%s': short read %s" msgstr "'%s'：读取不完整 %s" @@ -583,87 +633,95 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s：%s - %s" -#: merge.c:40 +#: lockfile.c:275 +msgid "BUG: reopen a lockfile that is still open" +msgstr "BUG: 重新打开一个仍打开着的锁文件" + +#: lockfile.c:277 +msgid "BUG: reopen a lockfile that has been committed" +msgstr "BUG: 重新打开一个已提交的锁文件" + +#: merge.c:41 msgid "failed to read the cache" msgstr "无法读取缓存" -#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556 -#: builtin/clone.c:661 +#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562 +#: builtin/clone.c:659 msgid "unable to write new index file" msgstr "无法写新的索引文件" -#: merge-recursive.c:190 +#: merge-recursive.c:189 #, c-format msgid "(bad commit)\n" msgstr "（坏提交）\n" -#: merge-recursive.c:210 +#: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "为路径 '%s' addinfo_cache 失败" -#: merge-recursive.c:271 +#: merge-recursive.c:270 msgid "error building trees" msgstr "无法创建树" -#: merge-recursive.c:692 +#: merge-recursive.c:691 #, c-format msgid "failed to create path '%s'%s" msgstr "无法创建路径 '%s'%s" -#: merge-recursive.c:703 +#: merge-recursive.c:702 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" -#: merge-recursive.c:717 merge-recursive.c:738 +#: merge-recursive.c:716 merge-recursive.c:737 msgid ": perhaps a D/F conflict?" msgstr "：可能是一个目录/文件冲突？" -#: merge-recursive.c:728 +#: merge-recursive.c:727 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" -#: merge-recursive.c:768 +#: merge-recursive.c:767 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" -#: merge-recursive.c:770 +#: merge-recursive.c:769 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据（blob）对象" -#: merge-recursive.c:793 builtin/clone.c:317 +#: merge-recursive.c:792 builtin/clone.c:318 #, c-format msgid "failed to open '%s'" msgstr "无法打开 '%s'" -#: merge-recursive.c:801 +#: merge-recursive.c:800 #, c-format msgid "failed to symlink '%s'" msgstr "无法创建符号链接 '%s'" -#: merge-recursive.c:804 +#: merge-recursive.c:803 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:942 +#: merge-recursive.c:941 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" -#: merge-recursive.c:946 +#: merge-recursive.c:945 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" -#: merge-recursive.c:962 +#: merge-recursive.c:961 msgid "unsupported object type in the tree" msgstr "在树中有不支持的对象类型" -#: merge-recursive.c:1037 merge-recursive.c:1051 +#: merge-recursive.c:1036 merge-recursive.c:1050 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -672,7 +730,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本被保留。" -#: merge-recursive.c:1043 merge-recursive.c:1056 +#: merge-recursive.c:1042 merge-recursive.c:1055 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -681,20 +739,20 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本保留于 %8$s 中。" -#: merge-recursive.c:1097 +#: merge-recursive.c:1096 msgid "rename" msgstr "重命名" -#: merge-recursive.c:1097 +#: merge-recursive.c:1096 msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1153 +#: merge-recursive.c:1152 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" -#: merge-recursive.c:1175 +#: merge-recursive.c:1174 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -703,144 +761,144 @@ msgstr "" "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1180 +#: merge-recursive.c:1179 msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1234 +#: merge-recursive.c:1233 #, 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:1264 +#: merge-recursive.c:1263 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是重命名 %s 至 %s，以及 %s 至 %s" -#: merge-recursive.c:1463 +#: merge-recursive.c:1462 #, 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:1473 +#: merge-recursive.c:1472 #, c-format msgid "Adding merged %s" msgstr "添加合并后的 %s" -#: merge-recursive.c:1478 merge-recursive.c:1676 +#: merge-recursive.c:1477 merge-recursive.c:1675 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" -#: merge-recursive.c:1529 +#: merge-recursive.c:1528 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" -#: merge-recursive.c:1532 +#: merge-recursive.c:1531 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个数据（blob）对象" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modify" msgstr "修改" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modified" msgstr "修改" -#: merge-recursive.c:1590 +#: merge-recursive.c:1589 msgid "content" msgstr "内容" -#: merge-recursive.c:1597 +#: merge-recursive.c:1596 msgid "add/add" msgstr "添加/添加" -#: merge-recursive.c:1631 +#: merge-recursive.c:1630 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:1645 +#: merge-recursive.c:1644 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-recursive.c:1649 git-submodule.sh:1150 +#: merge-recursive.c:1648 git-submodule.sh:1150 msgid "submodule" msgstr "子模组" -#: merge-recursive.c:1650 +#: merge-recursive.c:1649 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" -#: merge-recursive.c:1740 +#: merge-recursive.c:1735 #, c-format msgid "Removing %s" msgstr "删除 %s" -#: merge-recursive.c:1765 +#: merge-recursive.c:1760 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:1771 +#: merge-recursive.c:1766 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:1776 +#: merge-recursive.c:1771 #, 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:1786 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:1803 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "严重的合并错误，不应发生。" -#: merge-recursive.c:1822 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "已经是最新的！" -#: merge-recursive.c:1831 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:1861 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "未处理的路径??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:1919 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:1956 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:2013 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:2024 builtin/merge.c:666 +#: merge-recursive.c:2019 builtin/merge.c:666 msgid "Unable to write index." msgstr "不能写入索引。" @@ -865,34 +923,34 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" -#: object.c:234 +#: object.c:241 #, c-format msgid "unable to parse object: %s" msgstr "不能解析对象：%s" -#: parse-options.c:534 +#: parse-options.c:546 msgid "..." msgstr "..." -#: parse-options.c:552 +#: parse-options.c:564 #, c-format msgid "usage: %s" msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:556 +#: parse-options.c:568 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:559 +#: parse-options.c:571 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:593 +#: parse-options.c:605 msgid "-NUM" msgstr "-数字" @@ -958,11 +1016,15 @@ msgstr "" "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" "添加 ':/' 或 '.' ？" +#: pretty.c:968 +msgid "unable to parse --pretty format" +msgstr "不能解析 --pretty 格式" + #: progress.c:225 msgid "done" msgstr "完成" -#: read-cache.c:1260 +#: read-cache.c:1261 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -971,7 +1033,7 @@ msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1270 +#: read-cache.c:1271 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -980,51 +1042,51 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" -#: remote.c:753 +#: remote.c:782 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同时获取 %s 和 %s 至 %s" -#: remote.c:757 +#: remote.c:786 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %s，而非 %s" -#: remote.c:761 +#: remote.c:790 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同时跟踪 %s 和 %s" -#: remote.c:769 +#: remote.c:798 msgid "Internal error" msgstr "内部错误" -#: remote.c:1943 +#: remote.c:1968 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n" -#: remote.c:1947 +#: remote.c:1972 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n" -#: remote.c:1950 +#: remote.c:1975 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" -#: remote.c:1954 +#: remote.c:1979 #, 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:1960 +#: remote.c:1985 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 来发布您的本地提交）\n" -#: remote.c:1963 +#: remote.c:1988 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1033,11 +1095,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" # 译者：注意保持前导空格 -#: remote.c:1971 +#: remote.c:1996 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" -#: remote.c:1974 +#: remote.c:1999 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1053,32 +1115,40 @@ msgstr[1] "" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者：注意保持前导空格 -#: remote.c:1984 +#: remote.c:2009 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" -#: run-command.c:80 +#: run-command.c:87 msgid "open /dev/null failed" msgstr "不能打开 /dev/null" -#: run-command.c:82 +#: run-command.c:89 #, c-format msgid "dup2(%d,%d) failed" msgstr "不能调用 dup2(%d,%d)" -#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893 -#: builtin/merge.c:1003 builtin/merge.c:1013 +#: send-pack.c:265 +msgid "failed to sign the push certificate" +msgstr "无法为推送证书签名" + +#: send-pack.c:322 +msgid "the receiving end does not support --signed push" +msgstr "接收端不支持签名推送" + +#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892 +#: builtin/merge.c:1002 builtin/merge.c:1012 #, c-format msgid "Could not open '%s' for writing" msgstr "不能为写入打开 '%s'" -#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785 -#: builtin/merge.c:1005 builtin/merge.c:1018 +#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784 +#: builtin/merge.c:1004 builtin/merge.c:1017 #, c-format msgid "Could not write to '%s'" msgstr "不能写入 '%s'" -#: sequencer.c:194 +#: sequencer.c:195 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1086,7 +1156,7 @@ msgstr "" "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" "命令标记修正后的文件" -#: sequencer.c:197 +#: sequencer.c:198 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1095,228 +1165,224 @@ msgstr "" "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:210 sequencer.c:841 sequencer.c:924 +#: sequencer.c:211 sequencer.c:852 sequencer.c:935 #, c-format msgid "Could not write to %s" msgstr "不能写入 %s" -#: sequencer.c:213 +#: sequencer.c:214 #, c-format msgid "Error wrapping up %s" msgstr "错误收尾 %s" -#: sequencer.c:228 +#: sequencer.c:229 msgid "Your local changes would be overwritten by cherry-pick." msgstr "您的本地修改将被拣选操作覆盖。" -#: sequencer.c:230 +#: sequencer.c:231 msgid "Your local changes would be overwritten by revert." msgstr "您的本地修改将被还原操作覆盖。" -#: sequencer.c:233 +#: sequencer.c:234 msgid "Commit your changes or stash them to proceed." msgstr "提交您的修改或保存进度后再继续。" -#: sequencer.c:250 -msgid "Failed to lock HEAD during fast_forward_to" -msgstr "在快进时无法为 HEAD 加锁" - #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:293 +#: sequencer.c:304 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新索引文件" -#: sequencer.c:324 +#: sequencer.c:335 msgid "Could not resolve HEAD commit\n" msgstr "不能解析 HEAD 提交\n" -#: sequencer.c:344 +#: sequencer.c:355 msgid "Unable to update cache tree\n" msgstr "不能更新缓存\n" -#: sequencer.c:391 +#: sequencer.c:402 #, c-format msgid "Could not parse commit %s\n" msgstr "不能解析提交 %s\n" -#: sequencer.c:396 +#: sequencer.c:407 #, c-format msgid "Could not parse parent commit %s\n" msgstr "不能解析父提交 %s\n" -#: sequencer.c:462 +#: sequencer.c:473 msgid "Your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:481 +#: sequencer.c:492 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:489 +#: sequencer.c:500 #, c-format msgid "Commit %s does not have parent %d" msgstr "提交 %s 没有父提交 %d" -#: sequencer.c:493 +#: sequencer.c:504 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "指定了主线但提交 %s 不是一个合并。" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:506 +#: sequencer.c:517 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:510 +#: sequencer.c:521 #, c-format msgid "Cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" -#: sequencer.c:596 +#: sequencer.c:607 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:597 +#: sequencer.c:608 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:633 +#: sequencer.c:644 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:641 +#: sequencer.c:652 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:645 +#: sequencer.c:656 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:705 +#: sequencer.c:716 #, c-format msgid "Cannot %s during a %s" msgstr "无法 %s 在一个 %s 过程中" -#: sequencer.c:727 +#: sequencer.c:738 #, c-format msgid "Could not parse line %d." msgstr "不能解析第 %d 行。" -#: sequencer.c:732 +#: sequencer.c:743 msgid "No commits parsed." msgstr "没有提交被解析。" -#: sequencer.c:745 +#: sequencer.c:756 #, c-format msgid "Could not open %s" msgstr "不能打开 %s" -#: sequencer.c:749 +#: sequencer.c:760 #, c-format msgid "Could not read %s." msgstr "不能读取 %s。" -#: sequencer.c:756 +#: sequencer.c:767 #, c-format msgid "Unusable instruction sheet: %s" msgstr "无用的指令表单：%s" -#: sequencer.c:786 +#: sequencer.c:797 #, c-format msgid "Invalid key: %s" msgstr "无效键名：%s" -#: sequencer.c:789 +#: sequencer.c:800 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:801 +#: sequencer.c:812 #, c-format msgid "Malformed options sheet: %s" msgstr "非法的选项表单：%s" -#: sequencer.c:822 +#: sequencer.c:833 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" -#: sequencer.c:823 +#: sequencer.c:834 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:827 +#: sequencer.c:838 #, c-format msgid "Could not create sequencer directory %s" msgstr "不能创建序列目录 %s" -#: sequencer.c:843 sequencer.c:928 +#: sequencer.c:854 sequencer.c:939 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:873 sequencer.c:1009 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:864 +#: sequencer.c:875 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:866 +#: sequencer.c:877 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:888 builtin/apply.c:4062 +#: sequencer.c:899 builtin/apply.c:4128 #, c-format msgid "cannot open %s: %s" msgstr "不能打开 %s：%s" -#: sequencer.c:891 +#: sequencer.c:902 #, c-format msgid "cannot read %s: %s" msgstr "不能读取 %s：%s" -#: sequencer.c:892 +#: sequencer.c:903 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:898 +#: sequencer.c:909 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:921 +#: sequencer.c:932 #, c-format msgid "Could not format %s." msgstr "不能格式化 %s。" -#: sequencer.c:1066 +#: sequencer.c:1077 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:1069 +#: sequencer.c:1080 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:1103 +#: sequencer.c:1114 msgid "Can't revert as initial commit" msgstr "不能作为初始提交还原" -#: sequencer.c:1104 +#: sequencer.c:1115 msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" -#: sha1_name.c:439 +#: sha1_name.c:440 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" @@ -1337,21 +1403,21 @@ msgstr "" "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" "命令关闭本消息通知。" -#: sha1_name.c:1060 +#: sha1_name.c:1068 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" -#: sha1_name.c:1063 +#: sha1_name.c:1071 #, c-format msgid "No such branch: '%s'" msgstr "没有此分支：'%s'" -#: sha1_name.c:1065 +#: sha1_name.c:1073 #, c-format msgid "No upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: sha1_name.c:1069 +#: sha1_name.c:1077 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" @@ -1379,16 +1445,41 @@ msgstr "无法移除 %s 的 .gitmodules 条目" msgid "staging updated .gitmodules failed" msgstr "将更新后 .gitmodules 添加暂存区失败" -#: submodule.c:1118 builtin/init-db.c:363 +#: submodule.c:1111 builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "不能创建 git link %s" -#: submodule.c:1129 +#: submodule.c:1122 #, c-format msgid "Could not set core.worktree in %s" msgstr "不能在 %s 中设置 core.worktree" +#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565 +#: trailer.c:569 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "键 '%2$s' 的未知取值 '%1$s'" + +#: trailer.c:551 trailer.c:556 builtin/remote.c:288 +#, c-format +msgid "more than one %s" +msgstr "多于一个 %s" + +#: trailer.c:589 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "签名 '%.*s' 的键为空" + +#: trailer.c:709 +#, c-format +msgid "could not read input file '%s'" +msgstr "不能读取输入文件 '%s'" + +#: trailer.c:712 +msgid "could not read from stdin" +msgstr "不能自标准输入读取" + #: unpack-trees.c:202 msgid "Checking out files" msgstr "正在检出文件" @@ -1422,25 +1513,29 @@ msgstr "无效的端口号" msgid "invalid '..' path segment" msgstr "无效的 '..' 路径片段" -#: wrapper.c:460 +#: wrapper.c:509 #, c-format msgid "unable to access '%s': %s" msgstr "不能访问 '%s'：%s" -#: wrapper.c:481 +#: wrapper.c:530 #, c-format msgid "unable to access '%s'" msgstr "不能访问 '%s'" -#: wrapper.c:492 +#: wrapper.c:541 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "无法在口令文件中查询到当前用户：%s" -#: wrapper.c:493 +#: wrapper.c:542 msgid "no such user" msgstr "无此用户" +#: wrapper.c:550 +msgid "unable to get current working directory" +msgstr "不能获取当前工作目录" + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "未合并的路径：" @@ -1591,15 +1686,15 @@ msgstr "未跟踪的内容, " msgid "bug: unhandled diff status %c" msgstr "bug：无法处理的差异状态 %c" -#: wt-status.c:764 +#: wt-status.c:761 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:766 +#: wt-status.c:763 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:845 +#: wt-status.c:842 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1607,198 +1702,198 @@ msgstr "" "不要改动上面的一行。\n" "下面的所有内容均将被删除。" -#: wt-status.c:936 +#: wt-status.c:933 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:939 +#: wt-status.c:936 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" -#: wt-status.c:942 +#: wt-status.c:939 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:945 +#: wt-status.c:942 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:955 +#: wt-status.c:952 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:958 +#: wt-status.c:955 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:962 +#: wt-status.c:959 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:964 +#: wt-status.c:961 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:966 +#: wt-status.c:963 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:1026 wt-status.c:1043 +#: wt-status.c:1023 wt-status.c:1040 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:1031 wt-status.c:1048 +#: wt-status.c:1028 wt-status.c:1045 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者：注意保持前导空格 -#: wt-status.c:1034 +#: wt-status.c:1031 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1036 +#: wt-status.c:1033 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1038 +#: wt-status.c:1035 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:1051 +#: wt-status.c:1048 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:1055 +#: wt-status.c:1052 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:1060 +#: wt-status.c:1057 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 -#: wt-status.c:1063 +#: wt-status.c:1060 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:1067 +#: wt-status.c:1064 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:1072 +#: wt-status.c:1069 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 -#: wt-status.c:1075 +#: wt-status.c:1072 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:1077 +#: wt-status.c:1074 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:1087 +#: wt-status.c:1084 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1092 +#: wt-status.c:1089 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1095 +#: wt-status.c:1092 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1097 +#: wt-status.c:1094 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1106 +#: wt-status.c:1103 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1111 +#: wt-status.c:1108 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1114 +#: wt-status.c:1111 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1116 +#: wt-status.c:1113 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1127 +#: wt-status.c:1124 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1131 +#: wt-status.c:1128 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1134 +#: wt-status.c:1131 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1309 +#: wt-status.c:1306 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1316 +#: wt-status.c:1313 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1323 +#: wt-status.c:1320 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1325 +#: wt-status.c:1322 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1328 +#: wt-status.c:1325 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1345 +#: wt-status.c:1342 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1359 +#: wt-status.c:1356 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1361 +#: wt-status.c:1358 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1365 +#: wt-status.c:1362 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1808,129 +1903,129 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1371 +#: wt-status.c:1368 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1373 +#: wt-status.c:1370 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1379 +#: wt-status.c:1376 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1384 +#: wt-status.c:1381 #, 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:1387 +#: wt-status.c:1384 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1390 +#: wt-status.c:1387 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1393 +#: wt-status.c:1390 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1396 +#: wt-status.c:1393 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1399 wt-status.c:1404 +#: wt-status.c:1396 wt-status.c:1401 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1402 +#: wt-status.c:1399 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1406 +#: wt-status.c:1403 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1515 +#: wt-status.c:1512 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" # 译者：注意保持句尾空格 -#: wt-status.c:1521 +#: wt-status.c:1518 msgid "Initial commit on " msgstr "初始提交于 " -#: wt-status.c:1553 +#: wt-status.c:1550 msgid "gone" msgstr "丢失" # 译者：注意保持句尾空格 -#: wt-status.c:1555 wt-status.c:1563 +#: wt-status.c:1552 wt-status.c:1560 msgid "behind " msgstr "落后 " -#: compat/precompose_utf8.c:55 builtin/clone.c:356 +#: compat/precompose_utf8.c:55 builtin/clone.c:357 #, c-format msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" -#: builtin/add.c:21 +#: builtin/add.c:22 msgid "git add [options] [--] <pathspec>..." msgstr "git add [选项] [--] <路径规则>..." -#: builtin/add.c:64 +#: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:69 builtin/commit.c:261 +#: builtin/add.c:70 builtin/commit.c:275 msgid "updating files failed" msgstr "更新文件失败" -#: builtin/add.c:79 +#: builtin/add.c:80 #, c-format msgid "remove '%s'\n" msgstr "删除 '%s'\n" -#: builtin/add.c:133 +#: builtin/add.c:134 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:193 builtin/rev-parse.c:781 +#: builtin/add.c:194 builtin/rev-parse.c:785 msgid "Could not read the index" msgstr "不能读取索引" -#: builtin/add.c:204 +#: builtin/add.c:205 #, c-format msgid "Could not open '%s' for writing." msgstr "不能打开 '%s' 以写入。" -#: builtin/add.c:208 +#: builtin/add.c:209 msgid "Could not write patch" msgstr "不能生成补丁" -#: builtin/add.c:213 +#: builtin/add.c:214 #, c-format msgid "Could not stat '%s'" msgstr "不能查看文件状态 '%s'" -#: builtin/add.c:215 +#: builtin/add.c:216 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" @@ -1943,15 +2038,15 @@ msgstr "不能应用 '%s'" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70 -#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375 #: builtin/rm.c:269 msgid "dry run" msgstr "演习" -#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19 -#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606 -#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113 +#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 +#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "冗长输出" @@ -1959,7 +2054,7 @@ msgstr "冗长输出" msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286 msgid "select hunks interactively" msgstr "交互式挑选数据块" @@ -2031,74 +2126,74 @@ 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:919 -#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: builtin/apply.c:57 +#: builtin/apply.c:58 msgid "git apply [options] [<patch>...]" msgstr "git apply [选项] [<补丁>...]" -#: builtin/apply.c:110 +#: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" -#: builtin/apply.c:125 +#: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: builtin/apply.c:825 +#: builtin/apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" -#: builtin/apply.c:834 +#: builtin/apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" -#: builtin/apply.c:915 +#: builtin/apply.c:916 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" -#: builtin/apply.c:947 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s" -#: builtin/apply.c:951 +#: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" -#: builtin/apply.c:952 +#: builtin/apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" -#: builtin/apply.c:959 +#: builtin/apply.c:960 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" -#: builtin/apply.c:1422 +#: builtin/apply.c:1423 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: builtin/apply.c:1479 +#: builtin/apply.c:1480 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" -#: builtin/apply.c:1496 +#: builtin/apply.c:1497 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2109,77 +2204,77 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: builtin/apply.c:1656 +#: builtin/apply.c:1657 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: builtin/apply.c:1658 +#: builtin/apply.c:1659 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: builtin/apply.c:1684 +#: builtin/apply.c:1685 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" -#: builtin/apply.c:1720 +#: builtin/apply.c:1721 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: builtin/apply.c:1722 +#: builtin/apply.c:1723 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: builtin/apply.c:1725 +#: builtin/apply.c:1726 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: builtin/apply.c:1871 +#: builtin/apply.c:1872 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" -#: builtin/apply.c:1900 +#: builtin/apply.c:1901 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: builtin/apply.c:1986 +#: builtin/apply.c:2052 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: builtin/apply.c:2076 +#: builtin/apply.c:2142 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: builtin/apply.c:2080 +#: builtin/apply.c:2146 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: builtin/apply.c:2688 +#: builtin/apply.c:2754 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: builtin/apply.c:2806 +#: builtin/apply.c:2872 #, 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:2818 +#: builtin/apply.c:2884 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: builtin/apply.c:2824 +#: builtin/apply.c:2890 #, c-format msgid "" "while searching for:\n" @@ -2188,317 +2283,317 @@ msgstr "" "当查询：\n" "%.*s" -#: builtin/apply.c:2843 +#: builtin/apply.c:2909 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: builtin/apply.c:2944 +#: builtin/apply.c:3010 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: builtin/apply.c:2950 +#: builtin/apply.c:3016 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" -#: builtin/apply.c:2971 +#: builtin/apply.c:3037 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: builtin/apply.c:3095 +#: builtin/apply.c:3161 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 +#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 #, c-format msgid "read of %s failed" msgstr "读取 %s 失败" -#: builtin/apply.c:3174 builtin/apply.c:3396 +#: builtin/apply.c:3240 builtin/apply.c:3462 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: builtin/apply.c:3255 builtin/apply.c:3410 +#: builtin/apply.c:3321 builtin/apply.c:3476 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 +#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: builtin/apply.c:3264 builtin/apply.c:3418 +#: builtin/apply.c:3330 builtin/apply.c:3484 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: builtin/apply.c:3366 +#: builtin/apply.c:3432 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: builtin/apply.c:3435 +#: builtin/apply.c:3501 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: builtin/apply.c:3437 +#: builtin/apply.c:3503 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: builtin/apply.c:3538 +#: builtin/apply.c:3604 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: builtin/apply.c:3541 +#: builtin/apply.c:3607 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: builtin/apply.c:3561 +#: builtin/apply.c:3627 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: builtin/apply.c:3566 +#: builtin/apply.c:3632 #, 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:3574 +#: builtin/apply.c:3640 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: builtin/apply.c:3587 +#: builtin/apply.c:3653 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134 +#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: builtin/apply.c:3823 +#: builtin/apply.c:3889 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: builtin/apply.c:3852 +#: builtin/apply.c:3918 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: builtin/apply.c:3856 +#: builtin/apply.c:3922 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能枚举新建文件 '%s' 的状态" -#: builtin/apply.c:3861 +#: builtin/apply.c:3927 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: builtin/apply.c:3864 builtin/apply.c:3972 +#: builtin/apply.c:3930 builtin/apply.c:4038 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: builtin/apply.c:3897 +#: builtin/apply.c:3963 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: builtin/apply.c:3946 +#: builtin/apply.c:4012 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: builtin/apply.c:4033 +#: builtin/apply.c:4099 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: builtin/apply.c:4041 +#: builtin/apply.c:4107 msgid "internal error" msgstr "内部错误" -#: builtin/apply.c:4044 +#: builtin/apply.c:4110 #, 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:4054 +#: builtin/apply.c:4120 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: builtin/apply.c:4075 +#: builtin/apply.c:4141 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: builtin/apply.c:4078 +#: builtin/apply.c:4144 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: builtin/apply.c:4228 +#: builtin/apply.c:4234 msgid "unrecognized input" msgstr "未能识别的输入" -#: builtin/apply.c:4239 +#: builtin/apply.c:4245 msgid "unable to read index file" msgstr "无法读取索引文件" -#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91 #: builtin/fetch.c:93 msgid "path" msgstr "路径" -#: builtin/apply.c:4359 +#: builtin/apply.c:4363 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: builtin/apply.c:4362 +#: builtin/apply.c:4366 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: builtin/apply.c:4364 +#: builtin/apply.c:4368 msgid "num" msgstr "数字" -#: builtin/apply.c:4365 +#: builtin/apply.c:4369 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: builtin/apply.c:4368 +#: builtin/apply.c:4372 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: builtin/apply.c:4370 +#: builtin/apply.c:4374 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: builtin/apply.c:4374 +#: builtin/apply.c:4378 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: builtin/apply.c:4376 +#: builtin/apply.c:4380 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: builtin/apply.c:4378 +#: builtin/apply.c:4382 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: builtin/apply.c:4380 +#: builtin/apply.c:4384 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: builtin/apply.c:4382 +#: builtin/apply.c:4386 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: builtin/apply.c:4384 +#: builtin/apply.c:4388 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: builtin/apply.c:4386 +#: builtin/apply.c:4390 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三路合并" -#: builtin/apply.c:4388 +#: builtin/apply.c:4392 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: builtin/apply.c:4393 +#: builtin/apply.c:4397 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: builtin/apply.c:4394 +#: builtin/apply.c:4398 msgid "action" msgstr "动作" -#: builtin/apply.c:4395 +#: builtin/apply.c:4399 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: builtin/apply.c:4398 builtin/apply.c:4401 +#: builtin/apply.c:4402 builtin/apply.c:4405 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: builtin/apply.c:4404 +#: builtin/apply.c:4408 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: builtin/apply.c:4406 +#: builtin/apply.c:4410 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: builtin/apply.c:4408 +#: builtin/apply.c:4412 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: builtin/apply.c:4410 +#: builtin/apply.c:4414 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: builtin/apply.c:4413 +#: builtin/apply.c:4417 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: builtin/apply.c:4416 +#: builtin/apply.c:4420 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: builtin/apply.c:4418 +#: builtin/apply.c:4422 msgid "root" msgstr "根目录" -#: builtin/apply.c:4419 +#: builtin/apply.c:4423 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: builtin/apply.c:4441 +#: builtin/apply.c:4445 msgid "--3way outside a repository" msgstr "--3way 在一个版本库之外" -#: builtin/apply.c:4449 +#: builtin/apply.c:4453 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" -#: builtin/apply.c:4452 +#: builtin/apply.c:4456 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" -#: builtin/apply.c:4468 +#: builtin/apply.c:4472 #, c-format msgid "can't open patch '%s'" msgstr "不能打开补丁 '%s'" -#: builtin/apply.c:4482 +#: builtin/apply.c:4486 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: builtin/apply.c:4488 builtin/apply.c:4498 +#: builtin/apply.c:4492 builtin/apply.c:4502 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2658,7 +2753,7 @@ msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2599 +#: builtin/blame.c:2602 msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" @@ -2679,7 +2774,7 @@ msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:150 +#: builtin/branch.c:152 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2689,7 +2784,7 @@ msgstr "" " '%s'，但未合并到 HEAD。" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:154 +#: builtin/branch.c:156 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2698,12 +2793,12 @@ msgstr "" "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" " 然而却尚未被合并到分支 '%s' 。" -#: builtin/branch.c:168 +#: builtin/branch.c:170 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "无法查询 '%s' 指向的提交对象" -#: builtin/branch.c:172 +#: builtin/branch.c:174 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2712,338 +2807,338 @@ msgstr "" "分支 '%s' 没有完全合并。\n" "如果您确认要删除它，执行 'git branch -D %s'。" -#: builtin/branch.c:185 +#: builtin/branch.c:187 msgid "Update of config-file failed" msgstr "无法更新 config 文件" -#: builtin/branch.c:213 +#: builtin/branch.c:215 msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" -#: builtin/branch.c:219 +#: builtin/branch.c:221 msgid "Couldn't look up commit object for HEAD" msgstr "无法查询 HEAD 指向的提交对象" -#: builtin/branch.c:227 +#: builtin/branch.c:229 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "无法删除您当前所在的分支 '%s'。" -#: builtin/branch.c:240 +#: builtin/branch.c:245 #, c-format msgid "remote branch '%s' not found." msgstr "远程分支 '%s' 未发现。" -#: builtin/branch.c:241 +#: builtin/branch.c:246 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未发现。" -#: builtin/branch.c:255 +#: builtin/branch.c:260 #, c-format msgid "Error deleting remote branch '%s'" msgstr "删除远程分支 '%s' 时出错" -#: builtin/branch.c:256 +#: builtin/branch.c:261 #, c-format msgid "Error deleting branch '%s'" msgstr "删除分支 '%s' 时出错" -#: builtin/branch.c:263 +#: builtin/branch.c:268 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "已删除远程分支 %s（曾为 %s）。\n" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s（曾为 %s）。\n" -#: builtin/branch.c:366 +#: builtin/branch.c:370 #, c-format msgid "branch '%s' does not point at a commit" msgstr "分支 '%s' 未指向一个提交" -#: builtin/branch.c:454 +#: builtin/branch.c:459 #, c-format msgid "[%s: gone]" msgstr "[%s: 丢失]" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:464 +#: builtin/branch.c:469 #, c-format msgid "[%s: behind %d]" msgstr "[%s：落后 %d]" -#: builtin/branch.c:466 +#: builtin/branch.c:471 #, c-format msgid "[behind %d]" msgstr "[落后 %d]" -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d]" msgstr "[%s：领先 %d]" -#: builtin/branch.c:472 +#: builtin/branch.c:477 #, c-format msgid "[ahead %d]" msgstr "[领先 %d]" -#: builtin/branch.c:475 +#: builtin/branch.c:480 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s：领先 %d，落后 %d]" -#: builtin/branch.c:478 +#: builtin/branch.c:483 #, c-format msgid "[ahead %d, behind %d]" msgstr "[领先 %d，落后 %d]" -#: builtin/branch.c:502 +#: builtin/branch.c:496 msgid " **** invalid ref ****" msgstr " **** 无效引用 ****" -#: builtin/branch.c:594 +#: builtin/branch.c:587 #, c-format msgid "(no branch, rebasing %s)" msgstr "（非分支，正变基 %s）" -#: builtin/branch.c:597 +#: builtin/branch.c:590 #, c-format msgid "(no branch, bisect started on %s)" msgstr "（非分支，二分查找开始于 %s）" -#: builtin/branch.c:600 +#: builtin/branch.c:593 #, c-format msgid "(detached from %s)" msgstr "（分离自 %s）" -#: builtin/branch.c:603 +#: builtin/branch.c:596 msgid "(no branch)" msgstr "（非分支）" -#: builtin/branch.c:649 +#: builtin/branch.c:643 #, c-format msgid "object '%s' does not point to a commit" msgstr "对象 '%s' 没有指向一个提交" -#: builtin/branch.c:681 +#: builtin/branch.c:691 msgid "some refs could not be read" msgstr "一些引用不能读取" -#: builtin/branch.c:694 +#: builtin/branch.c:704 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" -#: builtin/branch.c:704 +#: builtin/branch.c:714 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c:719 +#: builtin/branch.c:729 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "重命名掉一个错误命名的旧分支 '%s'" -#: builtin/branch.c:727 +#: builtin/branch.c:737 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: builtin/branch.c:734 +#: builtin/branch.c:744 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新 config 文件失败" -#: builtin/branch.c:749 +#: builtin/branch.c:759 #, c-format msgid "malformed object name %s" msgstr "非法的对象名 %s" -#: builtin/branch.c:773 +#: builtin/branch.c:783 #, c-format msgid "could not write branch description template: %s" msgstr "不能写分支描述模版：%s" -#: builtin/branch.c:803 +#: builtin/branch.c:813 msgid "Generic options" msgstr "通用选项" -#: builtin/branch.c:805 +#: builtin/branch.c:815 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" -#: builtin/branch.c:806 +#: builtin/branch.c:816 msgid "suppress informational messages" msgstr "不显示信息" -#: builtin/branch.c:807 +#: builtin/branch.c:817 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模式（参见 git-pull(1)）" -#: builtin/branch.c:809 +#: builtin/branch.c:819 msgid "change upstream info" msgstr "改变上游信息" -#: builtin/branch.c:813 +#: builtin/branch.c:823 msgid "use colored output" msgstr "使用彩色输出" -#: builtin/branch.c:814 +#: builtin/branch.c:824 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" -#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 -#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574 -#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615 -#: builtin/tag.c:621 +#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 +#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623 +#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616 +#: builtin/tag.c:622 msgid "commit" msgstr "提交" -#: builtin/branch.c:818 builtin/branch.c:824 +#: builtin/branch.c:828 builtin/branch.c:834 msgid "print only branches that contain the commit" msgstr "只打印包含该提交的分支" -#: builtin/branch.c:830 +#: builtin/branch.c:840 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作：" -#: builtin/branch.c:831 +#: builtin/branch.c:841 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪及本地分支" -#: builtin/branch.c:833 +#: builtin/branch.c:843 msgid "delete fully merged branch" msgstr "删除完全合并的分支" -#: builtin/branch.c:834 +#: builtin/branch.c:844 msgid "delete branch (even if not merged)" msgstr "删除分支（即使没有合并）" -#: builtin/branch.c:835 +#: builtin/branch.c:845 msgid "move/rename a branch and its reflog" msgstr "移动/重命名一个分支，以及它的引用日志" -#: builtin/branch.c:836 +#: builtin/branch.c:846 msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支，即使目标已存在" -#: builtin/branch.c:837 +#: builtin/branch.c:847 msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c:838 +#: builtin/branch.c:848 msgid "create the branch's reflog" msgstr "创建分支的引用日志" -#: builtin/branch.c:840 +#: builtin/branch.c:850 msgid "edit the description for the branch" msgstr "标记分支的描述" -#: builtin/branch.c:841 +#: builtin/branch.c:851 msgid "force creation (when already exists)" msgstr "强制创建（当已经存在）" -#: builtin/branch.c:844 +#: builtin/branch.c:854 msgid "print only not merged branches" msgstr "只打印没有合并的分支" -#: builtin/branch.c:850 +#: builtin/branch.c:860 msgid "print only merged branches" msgstr "只打印合并的分支" -#: builtin/branch.c:854 +#: builtin/branch.c:864 msgid "list branches in columns" msgstr "以列的方式显示分支" -#: builtin/branch.c:867 +#: builtin/branch.c:877 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:872 builtin/clone.c:636 +#: builtin/branch.c:881 builtin/clone.c:634 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c:896 +#: builtin/branch.c:903 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" -#: builtin/branch.c:902 builtin/branch.c:941 +#: builtin/branch.c:909 builtin/branch.c:948 msgid "branch name required" msgstr "必须提供分支名" -#: builtin/branch.c:917 +#: builtin/branch.c:924 msgid "Cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" -#: builtin/branch.c:922 +#: builtin/branch.c:929 msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" -#: builtin/branch.c:929 +#: builtin/branch.c:936 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚无提交。" -#: builtin/branch.c:932 +#: builtin/branch.c:939 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" -#: builtin/branch.c:947 +#: builtin/branch.c:954 msgid "too many branches for a rename operation" msgstr "为重命名操作提供了太多的分支名" -#: builtin/branch.c:952 +#: builtin/branch.c:959 msgid "too many branches to set new upstream" msgstr "为设置新上游提供了太多的分支名" -#: builtin/branch.c:956 +#: builtin/branch.c:963 #, 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:959 builtin/branch.c:981 builtin/branch.c:1002 +#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009 #, c-format msgid "no such branch '%s'" msgstr "没有此分支 '%s'" -#: builtin/branch.c:963 +#: builtin/branch.c:970 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:975 +#: builtin/branch.c:982 msgid "too many branches to unset upstream" msgstr "为取消上游设置操作提供了太多的分支名" -#: builtin/branch.c:979 +#: builtin/branch.c:986 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" -#: builtin/branch.c:985 +#: builtin/branch.c:992 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" -#: builtin/branch.c:999 +#: builtin/branch.c:1006 msgid "it does not make sense to create 'HEAD' manually" msgstr "手工创建 'HEAD' 没有意义" -#: builtin/branch.c:1005 +#: builtin/branch.c:1012 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" -#: builtin/branch.c:1008 +#: builtin/branch.c:1015 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3051,7 +3146,7 @@ msgid "" msgstr "" "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" -#: builtin/branch.c:1025 +#: builtin/branch.c:1032 #, c-format msgid "" "\n" @@ -3062,12 +3157,12 @@ msgstr "" "如果你想用 '%s' 跟踪 '%s', 这么做：\n" "\n" -#: builtin/branch.c:1026 +#: builtin/branch.c:1033 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1027 +#: builtin/branch.c:1034 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3085,43 +3180,43 @@ msgstr "需要一个版本库来创建包。" msgid "Need a repository to unbundle." msgstr "需要一个版本库来解包。" -#: builtin/cat-file.c:331 +#: builtin/cat-file.c:332 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>" -#: builtin/cat-file.c:332 +#: builtin/cat-file.c:333 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <对象列表>" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:370 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:371 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:372 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:374 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:374 +#: builtin/cat-file.c:375 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:377 msgid "for blob objects, run textconv on object's content" msgstr "对于数据（blob）对象，对其内容执行 textconv" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:379 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" -#: builtin/cat-file.c:381 +#: builtin/cat-file.c:382 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" @@ -3141,7 +3236,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:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "从标准输入读出文件名" @@ -3149,7 +3244,7 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274 msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -3313,47 +3408,47 @@ msgstr "路径 '%s' 未合并" msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:591 +#: builtin/checkout.c:597 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "不能对 '%s' 执行 reflog 操作\n" -#: builtin/checkout.c:629 +#: builtin/checkout.c:635 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:636 +#: builtin/checkout.c:642 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:639 +#: builtin/checkout.c:645 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:643 +#: builtin/checkout.c:649 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:645 builtin/checkout.c:1026 +#: builtin/checkout.c:651 builtin/checkout.c:1032 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:647 +#: builtin/checkout.c:653 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:699 +#: builtin/checkout.c:705 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c:705 +#: builtin/checkout.c:711 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3374,7 +3469,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:723 +#: builtin/checkout.c:729 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3389,139 +3484,139 @@ msgstr "" " git branch new_branch_name %s\n" "\n" -#: builtin/checkout.c:753 +#: builtin/checkout.c:759 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:757 +#: builtin/checkout.c:763 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:784 builtin/checkout.c:1021 +#: builtin/checkout.c:790 builtin/checkout.c:1027 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:928 +#: builtin/checkout.c:934 #, c-format msgid "only one reference expected, %d given." msgstr "只要一个引用，却给出了 %d 个" -#: builtin/checkout.c:967 +#: builtin/checkout.c:973 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1002 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1041 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1038 builtin/checkout.c:1042 +#: builtin/checkout.c:1044 builtin/checkout.c:1048 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054 -#: builtin/checkout.c:1057 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 +#: builtin/checkout.c:1063 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1068 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1085 +#: builtin/checkout.c:1091 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1087 +#: builtin/checkout.c:1093 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1088 +#: builtin/checkout.c:1094 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1089 +#: builtin/checkout.c:1095 msgid "detach the HEAD at named commit" msgstr "成为指向该提交的分离头指针" -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1096 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1099 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1101 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1097 +#: builtin/checkout.c:1103 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1104 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三路合并" -#: builtin/checkout.c:1099 builtin/merge.c:225 +#: builtin/checkout.c:1105 builtin/merge.c:226 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245 +#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245 msgid "style" msgstr "风格" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1107 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1110 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1112 msgid "second guess 'git checkout no-such-branch'" msgstr "再者猜测'git checkout no-such-branch'" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1135 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b、-B 和 --orphan 是互斥的" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1152 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1157 msgid "Missing branch name; try -b" msgstr "缺少分支名；尝试 -b" -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1194 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1201 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3530,12 +3625,12 @@ msgstr "" "不能同时更新路径并切换到分支'%s'。\n" "您是想要检出 '%s' 但其未能解析为提交么？" -#: builtin/checkout.c:1202 +#: builtin/checkout.c:1206 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1206 +#: builtin/checkout.c:1210 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3685,7 +3780,7 @@ msgstr "交互式清除" msgid "remove whole directories" msgstr "删除整个目录" -#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714 +#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "模式" @@ -3720,145 +3815,145 @@ msgid "" msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clone.c:36 +#: builtin/clone.c:37 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [选项] [--] <版本库> [<路径>]" -#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222 -#: builtin/push.c:503 +#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223 +#: builtin/push.c:514 msgid "force progress reporting" msgstr "强制显示进度报告" -#: builtin/clone.c:66 +#: builtin/clone.c:67 msgid "don't create a checkout" msgstr "不创建一个检出" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 msgid "create a bare repository" -msgstr "创建一个裸版本库" +msgstr "创建一个纯版本库" -#: builtin/clone.c:71 +#: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" -msgstr "创建一个镜像版本库（也是裸版本库）" +msgstr "创建一个镜像版本库（也是纯版本库）" -#: builtin/clone.c:73 +#: builtin/clone.c:74 msgid "to clone from a local repository" msgstr "从本地版本库克隆" -#: builtin/clone.c:75 +#: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" msgstr "不使用本地硬链接，始终复制" -#: builtin/clone.c:77 +#: builtin/clone.c:78 msgid "setup as shared repository" msgstr "设置为共享版本库" -#: builtin/clone.c:79 builtin/clone.c:81 +#: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" msgstr "在克隆时初始化子模组" -#: builtin/clone.c:82 builtin/init-db.c:483 +#: builtin/clone.c:83 builtin/init-db.c:485 msgid "template-directory" msgstr "模板目录" -#: builtin/clone.c:83 builtin/init-db.c:484 +#: builtin/clone.c:84 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "模板目录将被使用" -#: builtin/clone.c:85 +#: builtin/clone.c:86 msgid "reference repository" msgstr "参考版本库" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "名称" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用<名称>而不是 'origin' 去跟踪上游" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" msgstr "检出<分支>而不是远程HEAD" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659 msgid "depth" msgstr "深度" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:95 +#: builtin/clone.c:96 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" -#: builtin/clone.c:96 builtin/init-db.c:492 +#: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:97 builtin/init-db.c:493 +#: builtin/clone.c:98 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "key=value" msgstr "key=value" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "set config inside the new repository" msgstr "在新版本库中设置配置信息" -#: builtin/clone.c:252 +#: builtin/clone.c:253 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "参考版本库 '%s' 不是一个本地版本库。" -#: builtin/clone.c:256 +#: builtin/clone.c:257 #, c-format msgid "reference repository '%s' is shallow" msgstr "参考版本库 '%s' 是一个浅克隆" -#: builtin/clone.c:259 +#: builtin/clone.c:260 #, c-format msgid "reference repository '%s' is grafted" msgstr "参考版本库 '%s' 已被嫁接" -#: builtin/clone.c:321 +#: builtin/clone.c:322 #, c-format msgid "failed to create directory '%s'" msgstr "无法创建目录 '%s'" -#: builtin/clone.c:323 builtin/diff.c:83 +#: builtin/clone.c:324 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "无法枚举 '%s' 状态" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" -#: builtin/clone.c:339 +#: builtin/clone.c:340 #, c-format msgid "failed to stat %s\n" msgstr "无法枚举 %s 状态\n" -#: builtin/clone.c:361 +#: builtin/clone.c:362 #, c-format msgid "failed to create link '%s'" msgstr "无法创建链接 '%s'" -#: builtin/clone.c:365 +#: builtin/clone.c:366 #, c-format msgid "failed to copy file to '%s'" msgstr "无法拷贝文件至 '%s'" -#: builtin/clone.c:388 builtin/clone.c:565 +#: builtin/clone.c:389 builtin/clone.c:563 #, c-format msgid "done.\n" msgstr "完成。\n" @@ -3873,108 +3968,108 @@ msgstr "" "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" "'git checkout -f HEAD' 重试\n" -#: builtin/clone.c:480 +#: builtin/clone.c:478 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:560 +#: builtin/clone.c:558 #, c-format msgid "Checking connectivity... " msgstr "检查连接... " -#: builtin/clone.c:563 +#: builtin/clone.c:561 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必须的对象" -#: builtin/clone.c:627 +#: builtin/clone.c:625 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:658 +#: builtin/clone.c:656 msgid "unable to checkout working tree" msgstr "不能检出工作区" -#: builtin/clone.c:768 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:772 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "您必须指定一个版本库来克隆。" -#: builtin/clone.c:783 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:786 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 选项不兼容。" -#: builtin/clone.c:799 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "版本库 '%s' 不存在" -#: builtin/clone.c:805 builtin/fetch.c:1143 +#: builtin/clone.c:802 builtin/fetch.c:1155 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" -#: builtin/clone.c:815 +#: builtin/clone.c:812 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:825 +#: builtin/clone.c:822 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:838 builtin/clone.c:850 +#: builtin/clone.c:835 builtin/clone.c:847 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:841 +#: builtin/clone.c:838 #, c-format msgid "could not create work tree dir '%s'." msgstr "不能为 '%s' 创建工作区目录。" -#: builtin/clone.c:860 +#: builtin/clone.c:857 #, c-format msgid "Cloning into bare repository '%s'...\n" -msgstr "克隆到裸版本库 '%s'...\n" +msgstr "克隆到纯版本库 '%s'...\n" -#: builtin/clone.c:862 +#: builtin/clone.c:859 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:898 +#: builtin/clone.c:895 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" -#: builtin/clone.c:901 +#: builtin/clone.c:898 msgid "source repository is shallow, ignoring --local" msgstr "源版本库是浅克隆，忽略 --local" -#: builtin/clone.c:906 +#: builtin/clone.c:903 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:910 +#: builtin/clone.c:907 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" -#: builtin/clone.c:961 builtin/clone.c:969 +#: builtin/clone.c:958 builtin/clone.c:966 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:972 +#: builtin/clone.c:969 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" @@ -4010,15 +4105,39 @@ msgstr "两列之间的填充空间" msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" -#: builtin/commit.c:36 +#: builtin/commit.c:37 msgid "git commit [options] [--] <pathspec>..." msgstr "git commit [选项] [--] <路径规则>..." -#: builtin/commit.c:41 +#: builtin/commit.c:42 msgid "git status [options] [--] <pathspec>..." msgstr "git status [选项] [--] <路径规则>..." -#: builtin/commit.c:46 +#: builtin/commit.c:47 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" +"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" +"中编辑您的配置文件：\n" +"\n" +" git config --global --edit\n" +"\n" +"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n" +"\n" +" git commit --amend --reset-author\n" + +#: builtin/commit.c:60 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4032,7 +4151,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" -"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息：\n" +"与否。您可以对其进行设置以免再出现本提示信息：\n" "\n" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" @@ -4041,7 +4160,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:58 +#: builtin/commit.c:72 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -4050,7 +4169,7 @@ msgstr "" "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" -#: builtin/commit.c:63 +#: builtin/commit.c:77 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4064,11 +4183,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:70 +#: builtin/commit.c:84 msgid "Otherwise, please use 'git reset'\n" msgstr "否则，请使用命令 'git reset'\n" -#: builtin/commit.c:73 +#: builtin/commit.c:87 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4084,100 +4203,117 @@ msgstr "" "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" "操作。\n" -#: builtin/commit.c:288 +#: builtin/commit.c:302 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" -#: builtin/commit.c:328 +#: builtin/commit.c:342 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:334 +#: builtin/commit.c:348 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435 +#: builtin/commit.c:359 +msgid "unable to write index file" +msgstr "无法写入索引文件" + +#: builtin/commit.c:361 +msgid "unable to update temporary index" +msgstr "无法更新临时索引" + +#: builtin/commit.c:363 +msgid "Failed to update main cache tree" +msgstr "不能更新树的主缓存" + +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:418 +#: builtin/commit.c:443 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:420 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:429 +#: builtin/commit.c:454 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:447 +#: builtin/commit.c:473 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:557 builtin/commit.c:563 +#: builtin/commit.c:592 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "提交 '%s' 缺少作者信息" + +#: builtin/commit.c:594 #, c-format -msgid "invalid commit: %s" -msgstr "无效的提交：%s" +msgid "commit '%s' has malformed author line" +msgstr "提交 '%s' 有非法的作者信息" -#: builtin/commit.c:585 +#: builtin/commit.c:613 msgid "malformed --author parameter" msgstr "非法的 --author 参数" -#: builtin/commit.c:592 +#: builtin/commit.c:621 #, c-format msgid "invalid date format: %s" msgstr "无效的日期格式：%s" -#: builtin/commit.c:609 +#: builtin/commit.c:642 #, c-format msgid "Malformed ident string: '%s'" msgstr "非法的身份字符串：'%s'" -#: builtin/commit.c:642 +#: builtin/commit.c:675 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086 +#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:691 builtin/shortlog.c:273 +#: builtin/commit.c:724 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:693 +#: builtin/commit.c:726 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:697 +#: builtin/commit.c:730 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:719 +#: builtin/commit.c:752 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:723 +#: builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:727 +#: builtin/commit.c:760 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: builtin/commit.c:798 +#: builtin/commit.c:831 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:816 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -4191,7 +4327,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:821 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -4205,7 +4341,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:834 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4214,7 +4350,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:841 +#: builtin/commit.c:874 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4225,364 +4361,356 @@ msgstr "" "也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:855 +#: builtin/commit.c:888 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:863 +#: builtin/commit.c:896 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:870 +#: builtin/commit.c:903 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:888 +#: builtin/commit.c:921 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:945 +#: builtin/commit.c:978 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:960 builtin/tag.c:495 +#: builtin/commit.c:993 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:1061 +#: builtin/commit.c:1095 #, c-format msgid "No existing author found with '%s'" msgstr "没有找到匹配 '%s' 的作者" -#: builtin/commit.c:1076 builtin/commit.c:1316 +#: builtin/commit.c:1110 builtin/commit.c:1350 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1113 +#: builtin/commit.c:1147 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" -#: builtin/commit.c:1143 +#: builtin/commit.c:1177 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1152 +#: builtin/commit.c:1186 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1155 +#: builtin/commit.c:1189 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1157 +#: builtin/commit.c:1191 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1160 +#: builtin/commit.c:1194 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1170 +#: builtin/commit.c:1204 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1172 +#: builtin/commit.c:1206 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" -#: builtin/commit.c:1180 +#: builtin/commit.c:1214 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1197 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1199 +#: builtin/commit.c:1233 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1201 +#: builtin/commit.c:1235 msgid "Clever... amending the last one with dirty index." msgstr "聪明... 在索引不干净下修补最后的提交。" -#: builtin/commit.c:1203 +#: builtin/commit.c:1237 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..." -#: builtin/commit.c:1215 builtin/tag.c:727 +#: builtin/commit.c:1249 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" -#: builtin/commit.c:1220 +#: builtin/commit.c:1254 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项同时使用没有意义。" -#: builtin/commit.c:1330 builtin/commit.c:1595 +#: builtin/commit.c:1364 builtin/commit.c:1644 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1332 builtin/commit.c:1597 +#: builtin/commit.c:1366 builtin/commit.c:1646 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489 +#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1337 builtin/commit.c:1601 +#: builtin/commit.c:1371 builtin/commit.c:1650 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1340 builtin/commit.c:1604 +#: builtin/commit.c:1374 builtin/commit.c:1653 msgid "terminate entries with NUL" msgstr "条目以NUL字符结尾" -#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703 -#: builtin/fast-export.c:706 builtin/tag.c:602 +#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980 +#: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "模式" -#: builtin/commit.c:1343 builtin/commit.c:1607 +#: builtin/commit.c:1377 builtin/commit.c:1656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1346 +#: builtin/commit.c:1380 msgid "show ignored files" msgstr "显示忽略的文件" -#: builtin/commit.c:1347 parse-options.h:153 +#: builtin/commit.c:1381 parse-options.h:153 msgid "when" msgstr "何时" -#: builtin/commit.c:1348 +#: builtin/commit.c:1382 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1350 +#: builtin/commit.c:1384 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1419 +#: builtin/commit.c:1471 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1421 +#: builtin/commit.c:1473 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1469 +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:1471 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr "（根提交）" -#: builtin/commit.c:1565 +#: builtin/commit.c:1614 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1566 +#: builtin/commit.c:1615 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1568 +#: builtin/commit.c:1617 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1569 builtin/tag.c:600 +#: builtin/commit.c:1618 builtin/tag.c:601 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "author" msgstr "作者" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1571 builtin/gc.c:286 +#: builtin/commit.c:1620 builtin/gc.c:275 msgid "date" msgstr "日期" -#: builtin/commit.c:1571 +#: builtin/commit.c:1620 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409 -#: builtin/notes.c:566 builtin/tag.c:598 +#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/tag.c:599 msgid "message" msgstr "说明" -#: builtin/commit.c:1572 +#: builtin/commit.c:1621 msgid "commit message" msgstr "提交说明" -#: builtin/commit.c:1573 +#: builtin/commit.c:1622 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1574 +#: builtin/commit.c:1623 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" -#: builtin/commit.c:1575 +#: builtin/commit.c:1624 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1576 +#: builtin/commit.c:1625 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1577 +#: builtin/commit.c:1626 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86 +#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "添加 Signed-off-by: 签名" -#: builtin/commit.c:1579 +#: builtin/commit.c:1628 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1580 +#: builtin/commit.c:1629 msgid "force edit of commit" msgstr "强制编辑提交" # 译者：可选值，不能翻译（或是原文中笔误，应为 mode） -#: builtin/commit.c:1581 +#: builtin/commit.c:1630 msgid "default" msgstr "default" -#: builtin/commit.c:1581 builtin/tag.c:603 +#: builtin/commit.c:1630 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "设置如何删除提交说明里的空格和#注释" -#: builtin/commit.c:1582 +#: builtin/commit.c:1631 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92 -#: builtin/tag.c:604 +#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92 +#: builtin/tag.c:605 msgid "key-id" msgstr "key-id" -#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93 +#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG 提交签名" -#: builtin/commit.c:1587 +#: builtin/commit.c:1636 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1588 +#: builtin/commit.c:1637 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1589 +#: builtin/commit.c:1638 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1590 +#: builtin/commit.c:1639 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1591 +#: builtin/commit.c:1640 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1592 +#: builtin/commit.c:1641 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1593 +#: builtin/commit.c:1642 msgid "bypass pre-commit hook" msgstr "绕过 pre-commit 钩子" -#: builtin/commit.c:1594 +#: builtin/commit.c:1643 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1605 +#: builtin/commit.c:1654 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1606 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1611 +#: builtin/commit.c:1660 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1613 +#: builtin/commit.c:1662 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1641 +#: builtin/commit.c:1691 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1680 builtin/merge.c:518 +#: builtin/commit.c:1730 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "不能为读入打开 '%s'" -#: builtin/commit.c:1687 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1694 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1713 +#: builtin/commit.c:1763 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1724 +#: builtin/commit.c:1774 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1729 +#: builtin/commit.c:1779 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/commit.c:1756 -msgid "cannot lock HEAD ref" -msgstr "无法锁定 HEAD 引用" - -#: builtin/commit.c:1769 -msgid "cannot update HEAD ref" -msgstr "无法更新 HEAD 引用" - -#: builtin/commit.c:1780 +#: builtin/commit.c:1827 msgid "" "Repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full or quota is\n" +"new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" "版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n" @@ -4716,63 +4844,87 @@ msgstr "终止值是NUL字节" msgid "respect include directives on lookup" msgstr "查询时参照 include 指令递归查找" -#: builtin/count-objects.c:82 +#: builtin/config.c:315 +msgid "unable to parse default color value" +msgstr "不能解析缺省的颜色值" + +#: builtin/config.c:455 +#, c-format +msgid "" +"# This is Git's per-user configuration file.\n" +"[core]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tuser = %s\n" +"#\temail = %s\n" +msgstr "" +"# This is Git's per-user configuration file.\n" +"[core]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tuser = %s\n" +"#\temail = %s\n" + +#: builtin/config.c:590 +#, c-format +msgid "cannot create configuration file %s" +msgstr "不能创建配置文件 %s" + +#: builtin/count-objects.c:55 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:65 msgid "print sizes in human readable format" msgstr "以用户可读的格式显示大小" -#: builtin/describe.c:16 +#: builtin/describe.c:17 msgid "git describe [options] <commit-ish>*" msgstr "git describe [选项] <提交号>*" -#: builtin/describe.c:17 +#: builtin/describe.c:18 msgid "git describe [options] --dirty" msgstr "git describe [选项] --dirty" -#: builtin/describe.c:216 +#: builtin/describe.c:217 #, c-format msgid "annotated tag %s not available" msgstr "注释 tag %s 无效" -#: builtin/describe.c:220 +#: builtin/describe.c:221 #, c-format msgid "annotated tag %s has no embedded name" msgstr "注释 tag %s 没有嵌入名称" -#: builtin/describe.c:222 +#: builtin/describe.c:223 #, c-format msgid "tag '%s' is really '%s' here" msgstr "tag '%s' 的确是在 '%s'" -#: builtin/describe.c:249 +#: builtin/describe.c:250 builtin/log.c:452 #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" -#: builtin/describe.c:252 +#: builtin/describe.c:253 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: builtin/describe.c:269 +#: builtin/describe.c:270 #, c-format msgid "no tag exactly matches '%s'" msgstr "没有 tag 准确匹配 '%s'" -#: builtin/describe.c:271 +#: builtin/describe.c:272 #, c-format msgid "searching to describe %s\n" msgstr "搜索描述 %s\n" -#: builtin/describe.c:318 +#: builtin/describe.c:319 #, c-format msgid "finished search at %s\n" msgstr "完成搜索 %s\n" -#: builtin/describe.c:345 +#: builtin/describe.c:346 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -4781,7 +4933,7 @@ msgstr "" "没有注释 tag 能描述 '%s'。\n" "然而，有非注释 tag：尝试 --tags。" -#: builtin/describe.c:349 +#: builtin/describe.c:350 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -4790,12 +4942,12 @@ msgstr "" "没有注释 tag 能描述 '%s'。\n" "尝试 --always，或者创建一些 tag。" -#: builtin/describe.c:370 +#: builtin/describe.c:371 #, c-format msgid "traversed %lu commits\n" msgstr "已遍历 %lu 个提交\n" -#: builtin/describe.c:373 +#: builtin/describe.c:374 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -4804,143 +4956,147 @@ msgstr "" "发现多于 %i 个 tag，列出最近的 %i 个\n" "在 %s 放弃搜索\n" -#: builtin/describe.c:395 +#: builtin/describe.c:396 msgid "find the tag that comes after the commit" msgstr "寻找提交之后的 tag（用于描述提交）" -#: builtin/describe.c:396 +#: builtin/describe.c:397 msgid "debug search strategy on stderr" msgstr "在标准错误上调试搜索策略" -#: builtin/describe.c:397 +#: builtin/describe.c:398 msgid "use any ref" msgstr "使用任意引用" -#: builtin/describe.c:398 +#: builtin/describe.c:399 msgid "use any tag, even unannotated" msgstr "使用任意 tag，即使未带注解" -#: builtin/describe.c:399 +#: builtin/describe.c:400 msgid "always use long format" msgstr "始终使用长提交号格式" -#: builtin/describe.c:400 +#: builtin/describe.c:401 msgid "only follow first parent" msgstr "只跟随第一个父提交" -#: builtin/describe.c:403 +#: builtin/describe.c:404 msgid "only output exact matches" msgstr "只输出精确匹配" -#: builtin/describe.c:405 +#: builtin/describe.c:406 msgid "consider <n> most recent tags (default: 10)" msgstr "考虑最近 <n> 个 tags（默认：10）" -#: builtin/describe.c:407 +#: builtin/describe.c:408 msgid "only consider tags matching <pattern>" msgstr "只考虑匹配 <模式> 的 tags" -#: builtin/describe.c:409 builtin/name-rev.c:318 +#: builtin/describe.c:410 builtin/name-rev.c:318 msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" -#: builtin/describe.c:410 +#: builtin/describe.c:411 msgid "mark" msgstr "标记" -#: builtin/describe.c:411 +#: builtin/describe.c:412 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）" -#: builtin/describe.c:429 +#: builtin/describe.c:430 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 不兼容" -#: builtin/describe.c:455 +#: builtin/describe.c:456 msgid "No names found, cannot describe anything." msgstr "没有发现名称，无法描述任何东西。" -#: builtin/describe.c:475 +#: builtin/describe.c:476 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty 不能与提交同时使用" -#: builtin/diff.c:85 +#: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个正规文件或符号链接" -#: builtin/diff.c:236 +#: builtin/diff.c:237 #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" -#: builtin/diff.c:357 +#: builtin/diff.c:358 msgid "Not a git repository" msgstr "不是一个 git 版本库" -#: builtin/diff.c:400 +#: builtin/diff.c:401 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:409 +#: builtin/diff.c:410 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个数据（blob）对象：'%s'" -#: builtin/diff.c:416 +#: builtin/diff.c:417 #, c-format msgid "unhandled object '%s' given." msgstr "无法处理的对象 '%s'。" -#: builtin/fast-export.c:23 +#: builtin/fast-export.c:24 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:702 +#: builtin/fast-export.c:979 msgid "show progress after <n> objects" msgstr "在 <n> 个对象之后显示进度" -#: builtin/fast-export.c:704 +#: builtin/fast-export.c:981 msgid "select handling of signed tags" msgstr "选择如何处理签名 tags" -#: builtin/fast-export.c:707 +#: builtin/fast-export.c:984 msgid "select handling of tags that tag filtered objects" msgstr "选择当 tag 指向被过滤时 tags 的处理方式" -#: builtin/fast-export.c:710 +#: builtin/fast-export.c:987 msgid "Dump marks to this file" msgstr "把标记存储到这个文件" -#: builtin/fast-export.c:712 +#: builtin/fast-export.c:989 msgid "Import marks from this file" msgstr "从这个文件导入标记" -#: builtin/fast-export.c:714 +#: builtin/fast-export.c:991 msgid "Fake a tagger when tags lack one" msgstr "当 tags 缺少标记者字段时，假装提供一个" -#: builtin/fast-export.c:716 +#: builtin/fast-export.c:993 msgid "Output full tree for each commit" msgstr "每次提交都输出整个树" -#: builtin/fast-export.c:718 +#: builtin/fast-export.c:995 msgid "Use the done feature to terminate the stream" msgstr "使用 done 功能来终止流" -#: builtin/fast-export.c:719 +#: builtin/fast-export.c:996 msgid "Skip output of blob data" msgstr "跳过数据对象的输出" -#: builtin/fast-export.c:720 +#: builtin/fast-export.c:997 msgid "refspec" msgstr "引用表达式" -#: builtin/fast-export.c:721 +#: builtin/fast-export.c:998 msgid "Apply refspec to exported refs" msgstr "对导出的引用应用引用表达式" +#: builtin/fast-export.c:999 +msgid "anonymize output" +msgstr "匿名输出" + #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]" @@ -5014,7 +5170,7 @@ msgstr "深化浅克隆的历史" msgid "convert to a complete repository" msgstr "转换为一个完整的版本库" -#: builtin/fetch.c:118 builtin/log.c:1205 +#: builtin/fetch.c:118 builtin/log.c:1208 msgid "dir" msgstr "目录" @@ -5042,78 +5198,78 @@ msgstr "指定获取操作的引用映射" msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:440 +#: builtin/fetch.c:454 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:445 +#: builtin/fetch.c:459 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:459 +#: builtin/fetch.c:473 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）" -#: builtin/fetch.c:460 builtin/fetch.c:546 +#: builtin/fetch.c:474 builtin/fetch.c:560 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:471 +#: builtin/fetch.c:485 msgid "[tag update]" msgstr "[tag更新]" # 译者：注意保持前导空格 -#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526 +#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 msgid " (unable to update local ref)" msgstr " （不能更新本地引用）" -#: builtin/fetch.c:491 +#: builtin/fetch.c:505 msgid "[new tag]" msgstr "[新tag]" -#: builtin/fetch.c:494 +#: builtin/fetch.c:508 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:497 +#: builtin/fetch.c:511 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:548 +#: builtin/fetch.c:562 msgid "(non-fast-forward)" msgstr "（非快进式）" -#: builtin/fetch.c:581 builtin/fetch.c:814 +#: builtin/fetch.c:595 builtin/fetch.c:828 #, c-format msgid "cannot open %s: %s\n" msgstr "无法打开 %s：%s\n" -#: builtin/fetch.c:590 +#: builtin/fetch.c:604 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必须的对象\n" -#: builtin/fetch.c:608 +#: builtin/fetch.c:622 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "拒绝 %s 因为浅克隆不允许被更新" -#: builtin/fetch.c:696 builtin/fetch.c:779 +#: builtin/fetch.c:710 builtin/fetch.c:793 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:707 +#: builtin/fetch.c:721 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5123,87 +5279,87 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:759 +#: builtin/fetch.c:773 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为摇摆状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:760 +#: builtin/fetch.c:774 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为摇摆状态）" -#: builtin/fetch.c:784 +#: builtin/fetch.c:798 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:785 builtin/remote.c:1059 +#: builtin/fetch.c:799 builtin/remote.c:1063 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:804 +#: builtin/fetch.c:818 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "拒绝获取到非裸版本库的当前分支 %s" +msgstr "拒绝获取到非纯版本库的当前分支 %s" -#: builtin/fetch.c:823 +#: builtin/fetch.c:837 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:826 +#: builtin/fetch.c:840 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:882 +#: builtin/fetch.c:896 #, c-format msgid "Don't know how to fetch from %s" msgstr "不知道如何从 %s 获取" -#: builtin/fetch.c:1044 +#: builtin/fetch.c:1058 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:1046 builtin/remote.c:90 +#: builtin/fetch.c:1060 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:1064 +#: builtin/fetch.c:1078 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:1087 +#: builtin/fetch.c:1101 msgid "You need to specify a tag name." msgstr "您需要指定一个 tag 名称。" -#: builtin/fetch.c:1131 +#: builtin/fetch.c:1143 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:1133 +#: builtin/fetch.c:1145 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的版本库，参数 --unshallow 没有意义" -#: builtin/fetch.c:1156 +#: builtin/fetch.c:1168 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个版本库参数" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1170 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规则没有任何意义" -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1181 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1189 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规则没有意义" @@ -5213,8 +5369,8 @@ msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698 -#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589 +#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590 #: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "n" @@ -5239,99 +5395,103 @@ msgstr "使用 <文本> 作为提交说明的开始" msgid "file to read from" msgstr "从文件中读取" -#: builtin/for-each-ref.c:1051 +#: builtin/for-each-ref.c:676 +msgid "unable to parse format" +msgstr "不能解析格式" + +#: builtin/for-each-ref.c:1057 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [选项] [<模式>]" -#: builtin/for-each-ref.c:1066 +#: builtin/for-each-ref.c:1072 msgid "quote placeholders suitably for shells" msgstr "引用占位符适用于 shells" -#: builtin/for-each-ref.c:1068 +#: builtin/for-each-ref.c:1074 msgid "quote placeholders suitably for perl" msgstr "引用占位符适用于 perl" -#: builtin/for-each-ref.c:1070 +#: builtin/for-each-ref.c:1076 msgid "quote placeholders suitably for python" msgstr "引用占位符适用于 python" -#: builtin/for-each-ref.c:1072 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for tcl" msgstr "引用占位符适用于 tcl" -#: builtin/for-each-ref.c:1075 +#: builtin/for-each-ref.c:1081 msgid "show only <n> matched refs" msgstr "只显示 <n> 个匹配的引用" -#: builtin/for-each-ref.c:1076 builtin/replace.c:435 +#: builtin/for-each-ref.c:1082 builtin/replace.c:438 msgid "format" msgstr "格式" -#: builtin/for-each-ref.c:1076 +#: builtin/for-each-ref.c:1082 msgid "format to use for the output" msgstr "输出格式" -#: builtin/for-each-ref.c:1077 +#: builtin/for-each-ref.c:1083 msgid "key" msgstr "key" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1084 msgid "field name to sort on" msgstr "排序的字段名" -#: builtin/fsck.c:147 builtin/prune.c:172 +#: builtin/fsck.c:147 builtin/prune.c:136 msgid "Checking connectivity" msgstr "检查连接中" -#: builtin/fsck.c:538 +#: builtin/fsck.c:540 msgid "Checking object directories" msgstr "检查对象目录中" -#: builtin/fsck.c:601 +#: builtin/fsck.c:603 msgid "git fsck [options] [<object>...]" msgstr "git fsck [选项] [<对象>...]" -#: builtin/fsck.c:607 +#: builtin/fsck.c:609 msgid "show unreachable objects" msgstr "显示不可达的对象" -#: builtin/fsck.c:608 +#: builtin/fsck.c:610 msgid "show dangling objects" msgstr "显示摇摆的对象" -#: builtin/fsck.c:609 +#: builtin/fsck.c:611 msgid "report tags" msgstr "报告 tags" -#: builtin/fsck.c:610 +#: builtin/fsck.c:612 msgid "report root nodes" msgstr "报告根节点" -#: builtin/fsck.c:611 +#: builtin/fsck.c:613 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" -#: builtin/fsck.c:612 +#: builtin/fsck.c:614 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点（默认）" -#: builtin/fsck.c:613 +#: builtin/fsck.c:615 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" -#: builtin/fsck.c:614 +#: builtin/fsck.c:616 msgid "enable more strict checking" msgstr "启用更严格的检查" -#: builtin/fsck.c:616 +#: builtin/fsck.c:618 msgid "write dangling objects in .git/lost-found" msgstr "将摇摆对象写入 .git/lost-found 中" -#: builtin/fsck.c:617 builtin/prune.c:144 +#: builtin/fsck.c:619 builtin/prune.c:108 msgid "show progress" msgstr "显示进度" -#: builtin/fsck.c:667 +#: builtin/fsck.c:669 msgid "Checking objects" msgstr "检查对象中" @@ -5339,55 +5499,55 @@ msgstr "检查对象中" msgid "git gc [options]" msgstr "git gc [选项]" -#: builtin/gc.c:91 +#: builtin/gc.c:79 #, c-format -msgid "Invalid %s: '%s'" -msgstr "无效的 %s：'%s'" +msgid "Invalid gc.pruneexpire: '%s'" +msgstr "无效的 gc.pruneexpire：'%s'" -#: builtin/gc.c:118 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "不正常的长对象目录 %.*s" -#: builtin/gc.c:287 +#: builtin/gc.c:276 msgid "prune unreferenced objects" msgstr "清除未引用的对象" -#: builtin/gc.c:289 +#: builtin/gc.c:278 msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" -#: builtin/gc.c:290 +#: builtin/gc.c:279 msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" -#: builtin/gc.c:291 +#: builtin/gc.c:280 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" -#: builtin/gc.c:332 +#: builtin/gc.c:321 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在后台执行版本库打包以求最佳性能。\n" -#: builtin/gc.c:334 +#: builtin/gc.c:323 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包版本库以求最佳性能。\n" -#: builtin/gc.c:335 +#: builtin/gc.c:324 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护参见 \"git help gc\"。\n" -#: builtin/gc.c:353 +#: builtin/gc.c:342 #, 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:375 +#: builtin/gc.c:364 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" @@ -5618,7 +5778,7 @@ msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" -#: builtin/hash-object.c:60 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." @@ -5626,31 +5786,36 @@ msgstr "" "git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] " "<文件>..." -#: builtin/hash-object.c:61 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <路径列表>" -#: builtin/hash-object.c:72 builtin/tag.c:609 +#: builtin/hash-object.c:94 builtin/tag.c:610 msgid "type" msgstr "类型" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:94 msgid "object type" msgstr "对象类型" -#: builtin/hash-object.c:73 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "将对象写入对象数据库" -#: builtin/hash-object.c:74 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "从标准输入读取对象" -#: builtin/hash-object.c:76 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "原样存储文件不使用过滤器" -#: builtin/hash-object.c:77 +#: builtin/hash-object.c:100 +msgid "" +"just hash any random garbage to create corrupt objects for debugging Git" +msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" + +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "处理文件并假设其来自于此路径" @@ -5683,25 +5848,25 @@ msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]" msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c:92 +#: builtin/help.c:91 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c:105 +#: builtin/help.c:104 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c:113 +#: builtin/help.c:112 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 #, c-format msgid "failed to exec '%s': %s" msgstr "无法执行 '%s'：%s" -#: builtin/help.c:216 +#: builtin/help.c:215 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -5710,7 +5875,7 @@ msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<tool>.cmd'。" -#: builtin/help.c:228 +#: builtin/help.c:227 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -5719,23 +5884,27 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<tool>.path'。" -#: builtin/help.c:353 +#: builtin/help.c:352 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:370 +#: builtin/help.c:369 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:378 +#: builtin/help.c:377 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:424 +#: builtin/help.c:423 msgid "Defining attributes per path" msgstr "定义路径的属性" +#: builtin/help.c:424 +msgid "Everyday Git With 20 Commands Or So" +msgstr "每一天 Git 常用的约 20 条命令" + #: builtin/help.c:425 msgid "A Git glossary" msgstr "Git 词汇表" @@ -5774,291 +5943,291 @@ msgstr "用法：%s%s" msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别名" -#: builtin/index-pack.c:145 +#: builtin/index-pack.c:150 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" -#: builtin/index-pack.c:191 +#: builtin/index-pack.c:200 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型不匹配" -#: builtin/index-pack.c:211 +#: builtin/index-pack.c:220 #, c-format msgid "did not receive expected object %s" msgstr "未能获取期望的对象 %s" -#: builtin/index-pack.c:214 +#: builtin/index-pack.c:223 #, c-format msgid "object %s: expected type %s, found %s" msgstr "对象 %s：期待类型 %s，却是 %s" -#: builtin/index-pack.c:256 +#: builtin/index-pack.c:265 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "无法填充 %d 字节" msgstr[1] "无法填充 %d 字节" -#: builtin/index-pack.c:266 +#: builtin/index-pack.c:275 msgid "early EOF" msgstr "过早的文件结束符（EOF）" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:276 msgid "read error on input" msgstr "输入上的读错误" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:288 msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c:286 +#: builtin/index-pack.c:295 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" -#: builtin/index-pack.c:302 +#: builtin/index-pack.c:311 #, c-format msgid "unable to create '%s'" msgstr "不能创建 '%s'" -#: builtin/index-pack.c:307 +#: builtin/index-pack.c:316 #, c-format msgid "cannot open packfile '%s'" msgstr "无法打开包文件 '%s'" -#: builtin/index-pack.c:321 +#: builtin/index-pack.c:330 msgid "pack signature mismatch" msgstr "包签名不匹配" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:332 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "不支持包版本 %<PRIu32>" -#: builtin/index-pack.c:341 +#: builtin/index-pack.c:350 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "包中有错误的对象位于 %lu：%s" -#: builtin/index-pack.c:462 +#: builtin/index-pack.c:471 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" -#: builtin/index-pack.c:511 +#: builtin/index-pack.c:520 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" -#: builtin/index-pack.c:519 +#: builtin/index-pack.c:528 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" -#: builtin/index-pack.c:527 +#: builtin/index-pack.c:536 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" -#: builtin/index-pack.c:558 +#: builtin/index-pack.c:567 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: builtin/index-pack.c:560 +#: builtin/index-pack.c:569 #, 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:586 +#: builtin/index-pack.c:595 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" -#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706 -#: builtin/index-pack.c:740 builtin/index-pack.c:749 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:680 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:689 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "不能读 %s" -#: builtin/index-pack.c:746 +#: builtin/index-pack.c:755 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" -#: builtin/index-pack.c:760 +#: builtin/index-pack.c:769 #, c-format msgid "invalid blob object %s" msgstr "无效的数据（blob）对象 %s" -#: builtin/index-pack.c:774 +#: builtin/index-pack.c:783 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/index-pack.c:777 +#: builtin/index-pack.c:787 msgid "Error in object" msgstr "对象中出错" -#: builtin/index-pack.c:779 +#: builtin/index-pack.c:789 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c:851 builtin/index-pack.c:881 +#: builtin/index-pack.c:861 builtin/index-pack.c:890 msgid "failed to apply delta" msgstr "无法应用 delta" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:1048 +#: builtin/index-pack.c:1081 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c:1053 +#: builtin/index-pack.c:1086 msgid "cannot fstat packfile" msgstr "不能枚举包文件状态" -#: builtin/index-pack.c:1056 +#: builtin/index-pack.c:1089 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:1067 +#: builtin/index-pack.c:1100 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" -#: builtin/index-pack.c:1090 +#: builtin/index-pack.c:1123 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1133 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" -#: builtin/index-pack.c:1142 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1181 #, c-format msgid "completed with %d local objects" msgstr "完成 %d 个本地对象" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1191 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" -#: builtin/index-pack.c:1164 +#: builtin/index-pack.c:1195 #, 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:1189 +#: builtin/index-pack.c:1220 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1299 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1323 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1336 #, c-format msgid "cannot write keep file '%s'" msgstr "无法写保留文件 '%s'" -#: builtin/index-pack.c:1313 +#: builtin/index-pack.c:1344 #, c-format msgid "cannot close written keep file '%s'" msgstr "无法关闭保留文件 '%s'" -#: builtin/index-pack.c:1326 +#: builtin/index-pack.c:1357 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1337 +#: builtin/index-pack.c:1368 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1370 +#: builtin/index-pack.c:1401 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1376 +#: builtin/index-pack.c:1407 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" -#: builtin/index-pack.c:1380 builtin/index-pack.c:1559 +#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1469 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1471 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1487 +#: builtin/index-pack.c:1518 #, 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:1494 +#: builtin/index-pack.c:1525 #, 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:1523 +#: builtin/index-pack.c:1554 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c:1571 builtin/index-pack.c:1574 -#: builtin/index-pack.c:1586 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 +#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1604 +#: builtin/index-pack.c:1635 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1608 builtin/index-pack.c:1617 +#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1625 +#: builtin/index-pack.c:1656 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包名参数" @@ -6168,11 +6337,7 @@ msgstr "初始化空的" msgid " shared" msgstr "共享" -#: builtin/init-db.c:439 -msgid "cannot tell cwd" -msgstr "无法获知当前路径" - -#: builtin/init-db.c:465 +#: builtin/init-db.c:467 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [directory]" @@ -6180,29 +6345,29 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " "[目录]" -#: builtin/init-db.c:488 +#: builtin/init-db.c:490 msgid "permissions" msgstr "权限" -#: builtin/init-db.c:489 +#: builtin/init-db.c:491 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 版本库是多个用户之间共享的" -#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172 +#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172 msgid "be quiet" msgstr "保持安静" -#: builtin/init-db.c:523 builtin/init-db.c:528 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:532 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6211,15 +6376,31 @@ msgstr "" "不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-" "dir=<directory>）" -#: builtin/init-db.c:578 -msgid "Cannot access current working directory" -msgstr "不能访问当前工作目录" - -#: builtin/init-db.c:585 +#: builtin/init-db.c:583 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" +#: builtin/interpret-trailers.c:15 +msgid "" +"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " +"[<file>...]" +msgstr "" +"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件" +">...]" + +#: builtin/interpret-trailers.c:25 +msgid "trim empty trailers" +msgstr "删除空签名" + +#: builtin/interpret-trailers.c:26 +msgid "trailer" +msgstr "签名" + +#: builtin/interpret-trailers.c:27 +msgid "trailer(s) to add" +msgstr "要添加的签名" + #: builtin/log.c:41 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n" @@ -6228,6 +6409,11 @@ msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n" msgid " or: git show [options] <object>..." msgstr " 或者：git show [选项] <对象>..." +#: builtin/log.c:81 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "无效的 --decorate 选项：%s" + #: builtin/log.c:127 msgid "suppress diff output" msgstr "不显示差异输出" @@ -6244,245 +6430,254 @@ msgstr "使用邮件映射文件" msgid "decorate options" msgstr "修饰选项" +#: builtin/log.c:133 +msgid "Process line range n,m in file, counting from 1" +msgstr "处理文件中第 n 到 m 之间的行，从 1 开始" + #: builtin/log.c:229 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:470 builtin/log.c:562 +#: builtin/log.c:458 +#, c-format +msgid "git show %s: bad file" +msgstr "git show %s: 损坏的文件" + +#: builtin/log.c:472 builtin/log.c:564 #, c-format msgid "Could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:586 +#: builtin/log.c:588 #, c-format msgid "Unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:687 +#: builtin/log.c:689 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:771 +#: builtin/log.c:773 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:787 +#: builtin/log.c:789 #, c-format msgid "Cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:801 +#: builtin/log.c:803 msgid "Need exactly one range." msgstr "只需要一个范围。" -#: builtin/log.c:809 +#: builtin/log.c:811 msgid "Not a range." msgstr "不是一个范围。" -#: builtin/log.c:916 +#: builtin/log.c:919 msgid "Cover letter needs email format" msgstr "信封需要邮件地址格式" -#: builtin/log.c:995 +#: builtin/log.c:998 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1023 +#: builtin/log.c:1026 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [选项] [<从> | <修订集范围>]" -#: builtin/log.c:1068 +#: builtin/log.c:1071 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1183 +#: builtin/log.c:1186 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c:1186 +#: builtin/log.c:1189 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c:1190 +#: builtin/log.c:1193 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c:1192 +#: builtin/log.c:1195 msgid "generate a cover letter" msgstr "生成一封附信" -#: builtin/log.c:1194 +#: builtin/log.c:1197 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1195 +#: builtin/log.c:1198 msgid "sfx" msgstr "后缀" -#: builtin/log.c:1196 +#: builtin/log.c:1199 msgid "use <sfx> instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1198 +#: builtin/log.c:1201 msgid "start numbering patches at <n> instead of 1" msgstr "补丁以 <n> 开始编号，而不是1" -#: builtin/log.c:1200 +#: builtin/log.c:1203 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c:1202 +#: builtin/log.c:1205 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1205 +#: builtin/log.c:1208 msgid "store resulting files in <dir>" msgstr "把结果文件存储在 <dir>" -#: builtin/log.c:1208 +#: builtin/log.c:1211 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1211 +#: builtin/log.c:1214 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c:1213 +#: builtin/log.c:1216 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1215 +#: builtin/log.c:1218 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c:1217 +#: builtin/log.c:1220 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c:1218 +#: builtin/log.c:1221 msgid "header" msgstr "header" -#: builtin/log.c:1219 +#: builtin/log.c:1222 msgid "add email header" msgstr "添加邮件头" -#: builtin/log.c:1220 builtin/log.c:1222 +#: builtin/log.c:1223 builtin/log.c:1225 msgid "email" msgstr "邮件地址" -#: builtin/log.c:1220 +#: builtin/log.c:1223 msgid "add To: header" msgstr "添加收件人" -#: builtin/log.c:1222 +#: builtin/log.c:1225 msgid "add Cc: header" msgstr "添加抄送" -#: builtin/log.c:1224 +#: builtin/log.c:1227 msgid "ident" msgstr "ident" -#: builtin/log.c:1225 +#: builtin/log.c:1228 msgid "set From address to <ident> (or committer ident if absent)" msgstr "设置 From 地址为 <ident>（如若不提供，用提交者ID做为地址）" -#: builtin/log.c:1227 +#: builtin/log.c:1230 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1228 +#: builtin/log.c:1231 msgid "make first mail a reply to <message-id>" msgstr "使第一封邮件作为对 <message-id> 的回复" -#: builtin/log.c:1229 builtin/log.c:1232 +#: builtin/log.c:1232 builtin/log.c:1235 msgid "boundary" msgstr "边界" -#: builtin/log.c:1230 +#: builtin/log.c:1233 msgid "attach the patch" msgstr "附件方式添加补丁" -#: builtin/log.c:1233 +#: builtin/log.c:1236 msgid "inline the patch" msgstr "内联显示补丁" -#: builtin/log.c:1237 +#: builtin/log.c:1240 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" -#: builtin/log.c:1239 +#: builtin/log.c:1242 msgid "signature" msgstr "签名" -#: builtin/log.c:1240 +#: builtin/log.c:1243 msgid "add a signature" msgstr "添加一个签名" -#: builtin/log.c:1242 +#: builtin/log.c:1245 msgid "add a signature from a file" msgstr "从文件添加一个签名" -#: builtin/log.c:1243 +#: builtin/log.c:1246 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" -#: builtin/log.c:1317 +#: builtin/log.c:1320 #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" -#: builtin/log.c:1332 +#: builtin/log.c:1335 msgid "-n and -k are mutually exclusive." msgstr "-n 和 -k 互斥。" -#: builtin/log.c:1334 +#: builtin/log.c:1337 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix 和 -k 互斥。" -#: builtin/log.c:1342 +#: builtin/log.c:1345 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1344 +#: builtin/log.c:1347 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1346 +#: builtin/log.c:1349 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1369 +#: builtin/log.c:1372 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1371 +#: builtin/log.c:1374 #, c-format msgid "Could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/log.c:1468 +#: builtin/log.c:1472 #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" -#: builtin/log.c:1531 +#: builtin/log.c:1535 msgid "Failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:1579 +#: builtin/log.c:1583 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:1634 +#: builtin/log.c:1638 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n" -#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661 +#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 #, c-format msgid "Unknown commit %s" msgstr "未知提交 %s" @@ -6528,7 +6723,7 @@ msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需要删除的文件" #: builtin/ls-files.c:477 -msgid "show 'other' directories' name only" +msgid "show 'other' directories' names only" msgstr "只显示“其他”目录的名称" #: builtin/ls-files.c:480 @@ -6615,98 +6810,98 @@ msgstr "使用文件的全路径" msgid "list entire tree; not just current directory (implies --full-name)" msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）" -#: builtin/merge.c:43 +#: builtin/merge.c:44 msgid "git merge [options] [<commit>...]" msgstr "git merge [选项] [<提交>...]" -#: builtin/merge.c:44 +#: builtin/merge.c:45 msgid "git merge [options] <msg> HEAD <commit>" msgstr "git merge [选项] <说明> HEAD <提交>" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:98 +#: builtin/merge.c:99 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" -#: builtin/merge.c:135 +#: builtin/merge.c:136 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合并策略 '%s'。\n" -#: builtin/merge.c:136 +#: builtin/merge.c:137 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" -#: builtin/merge.c:191 +#: builtin/merge.c:192 msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" -#: builtin/merge.c:194 +#: builtin/merge.c:195 msgid "show a diffstat at the end of the merge" msgstr "在合并的最后显示差异统计" -#: builtin/merge.c:195 +#: builtin/merge.c:196 msgid "(synonym to --stat)" msgstr "（和 --stat 同义）" -#: builtin/merge.c:197 +#: builtin/merge.c:198 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录" -#: builtin/merge.c:200 +#: builtin/merge.c:201 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" -#: builtin/merge.c:202 +#: builtin/merge.c:203 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" -#: builtin/merge.c:204 +#: builtin/merge.c:205 msgid "edit message before committing" msgstr "在提交前编辑提交说明" -#: builtin/merge.c:205 +#: builtin/merge.c:206 msgid "allow fast-forward (default)" msgstr "允许快进（默认）" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" -#: builtin/merge.c:211 +#: builtin/merge.c:212 msgid "Verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89 +#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89 msgid "strategy" msgstr "策略" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c:214 +#: builtin/merge.c:215 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:215 +#: builtin/merge.c:216 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" -#: builtin/merge.c:217 +#: builtin/merge.c:218 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" -#: builtin/merge.c:221 +#: builtin/merge.c:222 msgid "abort the current in-progress merge" msgstr "放弃当前正在进行的合并" @@ -6764,31 +6959,31 @@ msgstr "坏的 branch.%s.mergeoptions 字符串：%s" msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入一树对象" -#: builtin/merge.c:678 +#: builtin/merge.c:677 msgid "Not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" -#: builtin/merge.c:692 +#: builtin/merge.c:691 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:705 +#: builtin/merge.c:704 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:794 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:803 +#: builtin/merge.c:802 #, 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:808 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6802,160 +6997,160 @@ msgstr "" "\n" "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n" -#: builtin/merge.c:833 +#: builtin/merge.c:832 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:845 +#: builtin/merge.c:844 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:908 +#: builtin/merge.c:907 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:924 +#: builtin/merge.c:923 #, c-format msgid "'%s' is not a commit" msgstr "'%s' 不是一个提交" -#: builtin/merge.c:965 +#: builtin/merge.c:964 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:967 +#: builtin/merge.c:966 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程版本库。" -#: builtin/merge.c:969 +#: builtin/merge.c:968 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:974 +#: builtin/merge.c:973 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1130 +#: builtin/merge.c:1129 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1146 git-pull.sh:31 +#: builtin/merge.c:1145 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1149 git-pull.sh:34 +#: builtin/merge.c:1148 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: builtin/merge.c:1153 +#: builtin/merge.c:1152 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1156 +#: builtin/merge.c:1155 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1165 +#: builtin/merge.c:1164 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 与 --no-ff 同时使用。" -#: builtin/merge.c:1174 +#: builtin/merge.c:1173 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1206 +#: builtin/merge.c:1205 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1209 +#: builtin/merge.c:1208 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1211 +#: builtin/merge.c:1210 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1216 +#: builtin/merge.c:1215 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1267 +#: builtin/merge.c:1266 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: builtin/merge.c:1270 +#: builtin/merge.c:1269 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" -#: builtin/merge.c:1273 +#: builtin/merge.c:1272 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有一个 GPG 签名。" -#: builtin/merge.c:1276 +#: builtin/merge.c:1275 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: builtin/merge.c:1357 +#: builtin/merge.c:1356 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1396 +#: builtin/merge.c:1395 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1403 +#: builtin/merge.c:1402 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1435 +#: builtin/merge.c:1434 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1458 builtin/merge.c:1537 +#: builtin/merge.c:1457 builtin/merge.c:1536 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1462 +#: builtin/merge.c:1461 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1528 +#: builtin/merge.c:1527 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1530 +#: builtin/merge.c:1529 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1538 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1551 +#: builtin/merge.c:1550 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" @@ -7059,85 +7254,90 @@ msgstr "允许创建一个以上的树" msgid "git mv [options] <source>... <destination>" msgstr "git mv [选项] <源>... <目标>" +#: builtin/mv.c:69 +#, c-format +msgid "Directory %s is in index and no submodule?" +msgstr "目录 %s 在索引中并且不是子模组？" + #: builtin/mv.c:71 +msgid "Please stage your changes to .gitmodules or stash them to proceed" +msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" + +#: builtin/mv.c:89 +#, c-format +msgid "%.*s is in index" +msgstr "%.*s 在索引中" + +#: builtin/mv.c:111 msgid "force move/rename even if target exists" msgstr "强制移动/重命令，即使目标存在" -#: builtin/mv.c:72 +#: builtin/mv.c:112 msgid "skip move/rename errors" msgstr "跳过移动/重命名错误" -#: builtin/mv.c:122 +#: builtin/mv.c:151 +#, c-format +msgid "destination '%s' is not a directory" +msgstr "目标 '%s' 不是一个目录" + +#: builtin/mv.c:162 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "检查 '%s' 到 '%s' 的重命名\n" -#: builtin/mv.c:126 +#: builtin/mv.c:166 msgid "bad source" msgstr "坏的源" -#: builtin/mv.c:129 +#: builtin/mv.c:169 msgid "can not move directory into itself" msgstr "不能将目录移动到自身" -#: builtin/mv.c:132 +#: builtin/mv.c:172 msgid "cannot move directory over file" msgstr "不能将目录移动到文件" -#: builtin/mv.c:138 -#, c-format -msgid "Huh? Directory %s is in index and no submodule?" -msgstr "嗯？目录 %s 在索引中并且不是子模组？" - -#: builtin/mv.c:140 builtin/rm.c:318 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" - -#: builtin/mv.c:156 -#, c-format -msgid "Huh? %.*s is in index?" -msgstr "嗯？%.*s 在索引中？" - -#: builtin/mv.c:169 +#: builtin/mv.c:181 msgid "source directory is empty" msgstr "源目录为空" -#: builtin/mv.c:205 +#: builtin/mv.c:206 msgid "not under version control" msgstr "不在版本控制之下" -#: builtin/mv.c:208 +#: builtin/mv.c:209 msgid "destination exists" msgstr "目标已存在" -#: builtin/mv.c:216 +#: builtin/mv.c:217 #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" -#: builtin/mv.c:219 +#: builtin/mv.c:220 msgid "Cannot overwrite" msgstr "不能覆盖" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "multiple sources for the same target" msgstr "同一目标具有多个源" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "destination directory does not exist" msgstr "目标目录不存在" -#: builtin/mv.c:244 +#: builtin/mv.c:232 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，源=%s，目标=%s" -#: builtin/mv.c:254 +#: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" @@ -7291,154 +7491,154 @@ msgstr "git notes prune [<选项>]" msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:137 +#: builtin/notes.c:136 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "不能为对象 '%s' 开始 'show'" -#: builtin/notes.c:141 +#: builtin/notes.c:140 msgid "could not read 'show' output" msgstr "不能读取 'show' 的输出" -#: builtin/notes.c:149 +#: builtin/notes.c:148 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" -#: builtin/notes.c:167 builtin/tag.c:477 +#: builtin/notes.c:166 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: builtin/notes.c:186 +#: builtin/notes.c:185 msgid "Please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解提供内容" -#: builtin/notes.c:207 builtin/notes.c:848 +#: builtin/notes.c:206 builtin/notes.c:847 #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" -#: builtin/notes.c:212 +#: builtin/notes.c:211 msgid "unable to write note object" msgstr "不能写注解对象" -#: builtin/notes.c:214 +#: builtin/notes.c:213 #, c-format -msgid "The note contents has been left in %s" -msgstr "注解内容被留在文件 %s 中" +msgid "The note contents have been left in %s" +msgstr "注解内容被留在 %s 中" -#: builtin/notes.c:248 builtin/tag.c:692 +#: builtin/notes.c:247 builtin/tag.c:693 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: builtin/notes.c:250 builtin/tag.c:695 +#: builtin/notes.c:249 builtin/tag.c:696 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" -#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322 -#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519 -#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641 -#: builtin/notes.c:843 builtin/tag.c:708 +#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321 +#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518 +#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640 +#: builtin/notes.c:842 builtin/tag.c:709 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" -#: builtin/notes.c:272 +#: builtin/notes.c:271 #, c-format msgid "Failed to read object '%s'." msgstr "无法读取对象 '%s'。" -#: builtin/notes.c:276 +#: builtin/notes.c:275 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "不能从非数据对象 '%s' 中读取注解数据" -#: builtin/notes.c:316 +#: builtin/notes.c:315 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/notes.c:331 +#: builtin/notes.c:330 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "无法从 '%s' 到 '%s' 拷贝注解" -#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502 -#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634 -#: builtin/notes.c:908 +#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501 +#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633 +#: builtin/notes.c:907 msgid "too many parameters" msgstr "参数太多" -#: builtin/notes.c:388 builtin/notes.c:647 +#: builtin/notes.c:387 builtin/notes.c:646 #, c-format msgid "No note found for object %s." msgstr "未发现对象 %s 的注解。" -#: builtin/notes.c:410 builtin/notes.c:567 +#: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents as a string" msgstr "注解内容作为一个字符串" -#: builtin/notes.c:413 builtin/notes.c:570 +#: builtin/notes.c:412 builtin/notes.c:569 msgid "note contents in a file" msgstr "注解内容到一个文件中" -#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572 -#: builtin/notes.c:575 builtin/tag.c:627 +#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571 +#: builtin/notes.c:574 builtin/tag.c:628 msgid "object" msgstr "对象" -#: builtin/notes.c:416 builtin/notes.c:573 +#: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "重用和编辑指定的注解对象" -#: builtin/notes.c:419 builtin/notes.c:576 +#: builtin/notes.c:418 builtin/notes.c:575 msgid "reuse specified note object" msgstr "重用指定的注解对象" -#: builtin/notes.c:421 builtin/notes.c:489 +#: builtin/notes.c:420 builtin/notes.c:488 msgid "replace existing notes" msgstr "替换已存在的注解" -#: builtin/notes.c:455 +#: builtin/notes.c:454 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:460 builtin/notes.c:537 +#: builtin/notes.c:459 builtin/notes.c:536 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" -#: builtin/notes.c:490 +#: builtin/notes.c:489 msgid "read objects from stdin" msgstr "从标准输入读取对象" -#: builtin/notes.c:492 +#: builtin/notes.c:491 msgid "load rewriting config for <command> (implies --stdin)" msgstr "重新加载 <命令> 的配置（隐含 --stdin）" -#: builtin/notes.c:510 +#: builtin/notes.c:509 msgid "too few parameters" msgstr "参数太少" -#: builtin/notes.c:531 +#: builtin/notes.c:530 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:543 +#: builtin/notes.c:542 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "源对象 %s 缺少注解。不能拷贝。" -#: builtin/notes.c:592 +#: builtin/notes.c:591 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -7447,236 +7647,240 @@ msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" -#: builtin/notes.c:739 +#: builtin/notes.c:738 msgid "General options" msgstr "通用选项" -#: builtin/notes.c:741 +#: builtin/notes.c:740 msgid "Merge options" msgstr "合并选项" -#: builtin/notes.c:743 +#: builtin/notes.c:742 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:745 +#: builtin/notes.c:744 msgid "Committing unmerged notes" msgstr "提交未合并的注解" -#: builtin/notes.c:747 +#: builtin/notes.c:746 msgid "finalize notes merge by committing unmerged notes" msgstr "通过提交未合并的注解来完成注解合并" -#: builtin/notes.c:749 +#: builtin/notes.c:748 msgid "Aborting notes merge resolution" msgstr "中止注解合并的方案" -#: builtin/notes.c:751 +#: builtin/notes.c:750 msgid "abort notes merge" msgstr "中止注解合并" -#: builtin/notes.c:846 +#: builtin/notes.c:845 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c:858 +#: builtin/notes.c:857 msgid "attempt to remove non-existent note is not an error" msgstr "尝试删除不存在的注解不是一个错误" -#: builtin/notes.c:861 +#: builtin/notes.c:860 msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c:942 +#: builtin/notes.c:941 msgid "notes-ref" msgstr "注解引用" -#: builtin/notes.c:943 +#: builtin/notes.c:942 msgid "use notes from <notes_ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:978 builtin/remote.c:1616 +#: builtin/notes.c:977 builtin/remote.c:1624 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/pack-objects.c:25 +#: builtin/pack-objects.c:28 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]" -#: builtin/pack-objects.c:26 +#: builtin/pack-objects.c:29 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: builtin/pack-objects.c:771 +#: builtin/pack-objects.c:773 msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1015 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" -#: builtin/pack-objects.c:2174 +#: builtin/pack-objects.c:2175 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c:2526 +#: builtin/pack-objects.c:2572 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:2530 +#: builtin/pack-objects.c:2576 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:2553 +#: builtin/pack-objects.c:2599 #, c-format msgid "option %s does not accept negative form" msgstr "选项 %s 不接受否定格式" -#: builtin/pack-objects.c:2557 +#: builtin/pack-objects.c:2603 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "不能解析选项 %1$s 的值 '%2$s'" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2622 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/pack-objects.c:2578 +#: builtin/pack-objects.c:2624 msgid "show progress meter" msgstr "显示进度表" -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c:2626 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/pack-objects.c:2583 +#: builtin/pack-objects.c:2629 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" -#: builtin/pack-objects.c:2584 +#: builtin/pack-objects.c:2630 msgid "version[,offset]" msgstr "版本[,偏移]" -#: builtin/pack-objects.c:2585 +#: builtin/pack-objects.c:2631 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2634 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:2590 +#: builtin/pack-objects.c:2636 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从替代对象存储里借用对象" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2638 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2640 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2642 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:2598 +#: builtin/pack-objects.c:2644 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2646 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:2602 +#: builtin/pack-objects.c:2648 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2650 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2652 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2654 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2656 msgid "read revision arguments from standard input" msgstr "从标准输入读取修订号参数" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2658 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2661 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2664 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2667 +msgid "include objects referred to by the index" +msgstr "包括被索引引用到的对象" + +#: builtin/pack-objects.c:2670 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2672 msgid "include tag objects that refer to objects to be packed" msgstr "包括引用了打包对象的 tag" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2674 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:2626 parse-options.h:140 +#: builtin/pack-objects.c:2675 parse-options.h:140 msgid "time" msgstr "时间" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2676 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2679 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2681 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2683 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2685 msgid "do not hide commits by grafts" msgstr "显示被嫁接隐藏的提交" -#: builtin/pack-objects.c:2638 +#: builtin/pack-objects.c:2687 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2689 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同时创建 bitmap 索引" -#: builtin/pack-objects.c:2719 +#: builtin/pack-objects.c:2778 msgid "Counting objects" msgstr "对象计数中" @@ -7696,7 +7900,7 @@ msgstr "清除松散的引用（默认）" msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" -#: builtin/prune-packed.c:49 +#: builtin/prune-packed.c:40 msgid "Removing duplicate objects" msgstr "正在删除重复对象" @@ -7704,15 +7908,15 @@ msgstr "正在删除重复对象" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" -#: builtin/prune.c:142 +#: builtin/prune.c:106 msgid "do not remove, show only" msgstr "不删除，只显示" -#: builtin/prune.c:143 +#: builtin/prune.c:107 msgid "report pruned objects" msgstr "报告清除的对象" -#: builtin/prune.c:146 +#: builtin/prune.c:110 msgid "expire objects older than <time>" msgstr "使早于给定时间的对象过期" @@ -7955,79 +8159,79 @@ msgstr "--mirror 不能和引用规则同时使用" msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:482 +#: builtin/push.c:493 msgid "repository" msgstr "版本库" -#: builtin/push.c:483 +#: builtin/push.c:494 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:484 +#: builtin/push.c:495 msgid "mirror all refs" msgstr "镜像所有引用" -#: builtin/push.c:486 +#: builtin/push.c:497 msgid "delete refs" msgstr "删除引用" -#: builtin/push.c:487 +#: builtin/push.c:498 msgid "push tags (can't be used with --all or --mirror)" msgstr "推送 tags（不能使用 --all or --mirror）" -#: builtin/push.c:490 +#: builtin/push.c:501 msgid "force updates" msgstr "强制更新" -#: builtin/push.c:492 +#: builtin/push.c:503 msgid "refname>:<expect" msgstr "引用名>:<期望值" -#: builtin/push.c:493 +#: builtin/push.c:504 msgid "require old value of ref to be at this value" msgstr "要求引用旧的取值为设定值" -#: builtin/push.c:495 -msgid "check" -msgstr "检查" - -#: builtin/push.c:496 +#: builtin/push.c:507 msgid "control recursive pushing of submodules" msgstr "控制子模组的递归推送" -#: builtin/push.c:498 +#: builtin/push.c:509 msgid "use thin pack" msgstr "使用精简打包" -#: builtin/push.c:499 builtin/push.c:500 +#: builtin/push.c:510 builtin/push.c:511 msgid "receive pack program" msgstr "接收包程序" -#: builtin/push.c:501 +#: builtin/push.c:512 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" -#: builtin/push.c:504 +#: builtin/push.c:515 msgid "prune locally removed refs" msgstr "清除本地删除的引用" -#: builtin/push.c:506 +#: builtin/push.c:517 msgid "bypass pre-push hook" msgstr "绕过 pre-push 钩子" -#: builtin/push.c:507 +#: builtin/push.c:518 msgid "push missing but relevant tags" msgstr "推送缺失的有关的 tags" -#: builtin/push.c:517 +#: builtin/push.c:520 +msgid "GPG sign the push" +msgstr "用 GPG 为推送签名" + +#: builtin/push.c:529 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:519 +#: builtin/push.c:531 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" -#: builtin/read-tree.c:36 +#: builtin/read-tree.c:37 msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -8037,67 +8241,67 @@ msgstr "" "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])" -#: builtin/read-tree.c:109 +#: builtin/read-tree.c:110 msgid "write resulting index to <file>" msgstr "将索引结果写入 <file>" -#: builtin/read-tree.c:112 +#: builtin/read-tree.c:113 msgid "only empty the index" msgstr "只是清空索引" -#: builtin/read-tree.c:114 +#: builtin/read-tree.c:115 msgid "Merging" msgstr "合并" -#: builtin/read-tree.c:116 +#: builtin/read-tree.c:117 msgid "perform a merge in addition to a read" msgstr "读取之余再执行一个合并" -#: builtin/read-tree.c:118 +#: builtin/read-tree.c:119 msgid "3-way merge if no file level merging required" msgstr "如果没有文件级合并需要，执行三路合并" -#: builtin/read-tree.c:120 +#: builtin/read-tree.c:121 msgid "3-way merge in presence of adds and removes" msgstr "存在添加和删除时，也执行三路合并" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:123 msgid "same as -m, but discard unmerged entries" msgstr "类似于 -m，但丢弃未合并的条目" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "<subdirectory>/" msgstr "<子目录>/" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:125 msgid "read the tree into the index under <subdirectory>/" msgstr "读取树对象到索引的 <子目录>/ 下" -#: builtin/read-tree.c:127 +#: builtin/read-tree.c:128 msgid "update working tree with merge result" msgstr "用合并的结果更新工作区" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:131 msgid "allow explicitly ignored files to be overwritten" msgstr "允许忽略文件中设定的文件可以被覆盖" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't check the working tree after merging" msgstr "合并后不检查工作区" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:135 msgid "don't update the index or the work tree" msgstr "不更新索引区和工作区" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" msgstr "跳过应用稀疏检出过滤器" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "调试 unpack-trees" @@ -8246,12 +8450,12 @@ msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" -#: builtin/remote.c:185 builtin/remote.c:640 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "远程 %s 已经存在。" -#: builtin/remote.c:189 builtin/remote.c:644 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一个有效的远程名称" @@ -8261,11 +8465,6 @@ msgstr "'%s' 不是一个有效的远程名称" msgid "Could not setup master '%s'" msgstr "无法设置 master '%s'" -#: builtin/remote.c:288 -#, c-format -msgid "more than one %s" -msgstr "多于一个 %s" - #: builtin/remote.c:333 #, c-format msgid "Could not get fetch map for refspec %s" @@ -8279,27 +8478,27 @@ msgstr "（匹配）" msgid "(delete)" msgstr "（删除）" -#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "不能添加 '%s' 至 '%s'" -#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894 +#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898 #, c-format msgid "No such remote: %s" msgstr "没有这样的远程：%s" -#: builtin/remote.c:650 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "不能重命名配置小节 '%s' 到 '%s'" -#: builtin/remote.c:656 builtin/remote.c:846 +#: builtin/remote.c:657 builtin/remote.c:850 #, c-format msgid "Could not remove config section '%s'" msgstr "不能移除配置小节 '%s'" -#: builtin/remote.c:671 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8310,32 +8509,32 @@ msgstr "" "\t%s\n" "\t如果必要请手动更新配置。" -#: builtin/remote.c:677 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "不能追加 '%s'" -#: builtin/remote.c:688 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "不能设置 '%s'" -#: builtin/remote.c:710 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "删除 '%s' 失败" -#: builtin/remote.c:744 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "创建 '%s' 失败" -#: builtin/remote.c:765 +#: builtin/remote.c:769 #, c-format msgid "Could not remove branch %s" msgstr "无法移除分支 %s" -#: builtin/remote.c:832 +#: builtin/remote.c:836 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8345,126 +8544,126 @@ msgid_plural "" msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用：" msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用：" -#: builtin/remote.c:947 +#: builtin/remote.c:951 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的（下一次获取将存储于 remotes/%s）" -#: builtin/remote.c:950 +#: builtin/remote.c:954 msgid " tracked" msgstr " 已跟踪" -#: builtin/remote.c:952 +#: builtin/remote.c:956 msgid " stale (use 'git remote prune' to remove)" msgstr " 过时（使用 'git remote prune' 来移除）" -#: builtin/remote.c:954 +#: builtin/remote.c:958 msgid " ???" msgstr " ???" -#: builtin/remote.c:995 +#: builtin/remote.c:999 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支" -#: builtin/remote.c:1002 +#: builtin/remote.c:1006 #, c-format msgid "rebases onto remote %s" msgstr "变基到远程 %s" -#: builtin/remote.c:1005 +#: builtin/remote.c:1009 #, c-format msgid " merges with remote %s" msgstr " 与远程 %s 合并" -#: builtin/remote.c:1006 +#: builtin/remote.c:1010 msgid " and with remote" msgstr " 且有远程" -#: builtin/remote.c:1008 +#: builtin/remote.c:1012 #, c-format msgid "merges with remote %s" msgstr "与远程 %s 合并" -#: builtin/remote.c:1009 +#: builtin/remote.c:1013 msgid " and with remote" msgstr " 且有远程" -#: builtin/remote.c:1055 +#: builtin/remote.c:1059 msgid "create" msgstr "创建" -#: builtin/remote.c:1058 +#: builtin/remote.c:1062 msgid "delete" msgstr "删除" -#: builtin/remote.c:1062 +#: builtin/remote.c:1066 msgid "up to date" msgstr "最新" -#: builtin/remote.c:1065 +#: builtin/remote.c:1069 msgid "fast-forwardable" msgstr "可快进" -#: builtin/remote.c:1068 +#: builtin/remote.c:1072 msgid "local out of date" msgstr "本地已过时" -#: builtin/remote.c:1075 +#: builtin/remote.c:1079 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 强制推送至 %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1082 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推送至 %-*s (%s)" -#: builtin/remote.c:1082 +#: builtin/remote.c:1086 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 强制推送至 %s" -#: builtin/remote.c:1085 +#: builtin/remote.c:1089 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" -#: builtin/remote.c:1153 +#: builtin/remote.c:1157 msgid "do not query remotes" msgstr "不查询远程" -#: builtin/remote.c:1180 +#: builtin/remote.c:1184 #, c-format msgid "* remote %s" msgstr "* 远程 %s" -#: builtin/remote.c:1181 +#: builtin/remote.c:1185 #, c-format msgid " Fetch URL: %s" msgstr " 获取地址：%s" -#: builtin/remote.c:1182 builtin/remote.c:1329 +#: builtin/remote.c:1186 builtin/remote.c:1333 msgid "(no URL)" msgstr "(无 URL)" -#: builtin/remote.c:1191 builtin/remote.c:1193 +#: builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " Push URL: %s" msgstr " 推送地址：%s" -#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199 +#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203 #, c-format msgid " HEAD branch: %s" msgstr " HEAD分支：%s" -#: builtin/remote.c:1201 +#: builtin/remote.c:1205 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n" -#: builtin/remote.c:1213 +#: builtin/remote.c:1217 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -8472,138 +8671,138 @@ msgstr[0] " 远程分支：%s" msgstr[1] " 远程分支：%s" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/remote.c:1216 builtin/remote.c:1243 +#: builtin/remote.c:1220 builtin/remote.c:1247 msgid " (status not queried)" msgstr "（状态未查询）" -#: builtin/remote.c:1225 +#: builtin/remote.c:1229 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:1233 +#: builtin/remote.c:1237 msgid " Local refs will be mirrored by 'git push'" msgstr " 本地引用将在 'git push' 时被镜像" -#: builtin/remote.c:1240 +#: builtin/remote.c:1244 #, 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:1261 +#: builtin/remote.c:1265 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "根据远程设置 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1263 +#: builtin/remote.c:1267 msgid "delete refs/remotes/<name>/HEAD" msgstr "删除 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1278 +#: builtin/remote.c:1282 msgid "Cannot determine remote HEAD" msgstr "无法确定远程 HEAD" -#: builtin/remote.c:1280 +#: builtin/remote.c:1284 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多个远程 HEAD 分支。请明确地选择一个用命令：" -#: builtin/remote.c:1290 +#: builtin/remote.c:1294 #, c-format msgid "Could not delete %s" msgstr "无法删除 %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1302 #, c-format msgid "Not a valid ref: %s" msgstr "不是一个有效引用：%s" -#: builtin/remote.c:1300 +#: builtin/remote.c:1304 #, c-format msgid "Could not setup %s" msgstr "不能设置 %s" # 译者：注意保持前导空格 -#: builtin/remote.c:1318 +#: builtin/remote.c:1322 #, c-format msgid " %s will become dangling!" msgstr " %s 将成为摇摆状态！" # 译者：注意保持前导空格 -#: builtin/remote.c:1319 +#: builtin/remote.c:1323 #, c-format msgid " %s has become dangling!" msgstr " %s 已成为摇摆状态！" -#: builtin/remote.c:1325 +#: builtin/remote.c:1329 #, c-format msgid "Pruning %s" msgstr "修剪 %s" -#: builtin/remote.c:1326 +#: builtin/remote.c:1330 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: builtin/remote.c:1349 +#: builtin/remote.c:1357 #, c-format msgid " * [would prune] %s" msgstr " * [将删除] %s" -#: builtin/remote.c:1352 +#: builtin/remote.c:1360 #, c-format msgid " * [pruned] %s" msgstr " * [已删除] %s" -#: builtin/remote.c:1397 +#: builtin/remote.c:1405 msgid "prune remotes after fetching" msgstr "抓取后清除远程" -#: builtin/remote.c:1463 builtin/remote.c:1537 +#: builtin/remote.c:1471 builtin/remote.c:1545 #, c-format msgid "No such remote '%s'" msgstr "没有此远程 '%s'" -#: builtin/remote.c:1483 +#: builtin/remote.c:1491 msgid "add branch" msgstr "添加分支" -#: builtin/remote.c:1490 +#: builtin/remote.c:1498 msgid "no remote specified" msgstr "未指定远程" -#: builtin/remote.c:1512 +#: builtin/remote.c:1520 msgid "manipulate push URLs" msgstr "操作推送 URLS" -#: builtin/remote.c:1514 +#: builtin/remote.c:1522 msgid "add URL" msgstr "添加 URL" -#: builtin/remote.c:1516 +#: builtin/remote.c:1524 msgid "delete URLs" msgstr "删除 URLS" -#: builtin/remote.c:1523 +#: builtin/remote.c:1531 msgid "--add --delete doesn't make sense" msgstr "--add --delete 无意义" -#: builtin/remote.c:1563 +#: builtin/remote.c:1571 #, c-format msgid "Invalid old URL pattern: %s" msgstr "无效的旧URL匹配模版：%s" -#: builtin/remote.c:1571 +#: builtin/remote.c:1579 #, c-format msgid "No such URL found: %s" msgstr "未找到此URL：%s" -#: builtin/remote.c:1573 +#: builtin/remote.c:1581 msgid "Will not delete all non-push URLs" msgstr "将不会删除所有非推送URL地址" -#: builtin/remote.c:1587 +#: builtin/remote.c:1595 msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于子命令之前" @@ -8700,67 +8899,67 @@ msgstr "git replace -d <对象>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<格式>] [-l [<模式>]]" -#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388 +#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 #, c-format msgid "Not a valid object name: '%s'" msgstr "不是一个有效的对象名：'%s'" -#: builtin/replace.c:352 +#: builtin/replace.c:355 #, c-format msgid "bad mergetag in commit '%s'" msgstr "提交 '%s' 中损坏的 mergetag" -#: builtin/replace.c:354 +#: builtin/replace.c:357 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "提交 '%s' 中非法的 mergetag" -#: builtin/replace.c:365 +#: builtin/replace.c:368 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s'，使用 --edit 代替 --graft" -#: builtin/replace.c:398 +#: builtin/replace.c:401 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "原始提交 '%s' 中包含一个 GPG 签名" -#: builtin/replace.c:399 +#: builtin/replace.c:402 msgid "the signature will be removed in the replacement commit!" msgstr "在替换的提交中签名将被移除！" -#: builtin/replace.c:405 +#: builtin/replace.c:408 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "不能为 '%s' 写替换提交" -#: builtin/replace.c:429 +#: builtin/replace.c:432 msgid "list replace refs" msgstr "列出替换的引用" -#: builtin/replace.c:430 +#: builtin/replace.c:433 msgid "delete replace refs" msgstr "删除替换的引用" -#: builtin/replace.c:431 +#: builtin/replace.c:434 msgid "edit existing object" msgstr "编辑现存的对象" -#: builtin/replace.c:432 +#: builtin/replace.c:435 msgid "change a commit's parents" msgstr "修改一个提交的父提交" -#: builtin/replace.c:433 +#: builtin/replace.c:436 msgid "replace the ref if it exists" msgstr "如果存在则替换引用" -#: builtin/replace.c:434 +#: builtin/replace.c:437 msgid "do not pretty-print contents for --edit" msgstr "不要为 --edit 操作美观显示内容" -#: builtin/replace.c:435 +#: builtin/replace.c:438 msgid "use this format" msgstr "使用此格式" @@ -8772,156 +8971,156 @@ msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" msgid "register clean resolutions in index" msgstr "在索引中注册干净的解决方案" -#: builtin/reset.c:25 +#: builtin/reset.c:26 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" -#: builtin/reset.c:26 +#: builtin/reset.c:27 msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "git reset [-q] <树或提交> [--] <路径>..." -#: builtin/reset.c:27 +#: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "mixed" msgstr "混杂" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "soft" msgstr "软性" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "hard" msgstr "硬性" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "merge" msgstr "合并" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "keep" msgstr "保持" -#: builtin/reset.c:73 +#: builtin/reset.c:74 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" -#: builtin/reset.c:75 +#: builtin/reset.c:76 msgid "Failed to find tree of HEAD." msgstr "无法找到 HEAD 指向的树。" -#: builtin/reset.c:81 +#: builtin/reset.c:82 #, c-format msgid "Failed to find tree of %s." msgstr "无法找到 %s 指向的树。" -#: builtin/reset.c:99 +#: builtin/reset.c:100 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在位于 %s" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:182 +#: builtin/reset.c:183 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:275 +#: builtin/reset.c:276 msgid "be quiet, only report errors" msgstr "安静模式，只报告错误" -#: builtin/reset.c:277 +#: builtin/reset.c:278 msgid "reset HEAD and index" msgstr "重置 HEAD 和索引" -#: builtin/reset.c:278 +#: builtin/reset.c:279 msgid "reset only HEAD" msgstr "只重置 HEAD" -#: builtin/reset.c:280 builtin/reset.c:282 +#: builtin/reset.c:281 builtin/reset.c:283 msgid "reset HEAD, index and working tree" msgstr "重置 HEAD、索引和工作区" -#: builtin/reset.c:284 +#: builtin/reset.c:285 msgid "reset HEAD but keep local changes" msgstr "重置 HEAD 但保存本地变更" -#: builtin/reset.c:287 +#: builtin/reset.c:288 msgid "record only the fact that removed paths will be added later" msgstr "将删除的路径标记为稍后添加" -#: builtin/reset.c:304 +#: builtin/reset.c:305 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "无法将 '%s' 解析为一个有效的版本。" -#: builtin/reset.c:307 builtin/reset.c:315 +#: builtin/reset.c:308 builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/reset.c:312 +#: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "无法将 '%s' 解析为一个有效的树对象。" -#: builtin/reset.c:321 +#: builtin/reset.c:322 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" -#: builtin/reset.c:330 +#: builtin/reset.c:331 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用，而是用 'git reset -- <paths>'。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:332 +#: builtin/reset.c:333 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:342 +#: builtin/reset.c:343 #, c-format msgid "%s reset is not allowed in a bare repository" -msgstr "不能对裸版本库进行%s重置" +msgstr "不能对纯版本库进行%s重置" -#: builtin/reset.c:346 +#: builtin/reset.c:347 msgid "-N can only be used with --mixed" msgstr "-N 只能和 --mixed 同时使用" -#: builtin/reset.c:363 +#: builtin/reset.c:364 msgid "Unstaged changes after reset:" msgstr "重置后撤出暂存区的变更：" -#: builtin/reset.c:369 +#: builtin/reset.c:370 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" -#: builtin/reset.c:373 +#: builtin/reset.c:374 msgid "Could not write new index file." msgstr "不能写入新的索引文件。" -#: builtin/rev-parse.c:360 +#: builtin/rev-parse.c:361 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [选项] -- [<参数>...]" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" msgstr "保持 `--` 作为一个参数传递" -#: builtin/rev-parse.c:367 +#: builtin/rev-parse.c:368 msgid "stop parsing after the first non-option argument" msgstr "遇到第一个非选项参数后停止解析" -#: builtin/rev-parse.c:370 +#: builtin/rev-parse.c:371 msgid "output in stuck long form" msgstr "以固定长格式输出" -#: builtin/rev-parse.c:498 +#: builtin/rev-parse.c:499 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -9033,10 +9232,10 @@ msgid "" "the following submodule (or one of its nested submodules)\n" "uses a .git directory:" msgid_plural "" -"the following submodules (or one of its nested submodules)\n" +"the following submodules (or one of their nested submodules)\n" "use a .git directory:" -msgstr[0] "如下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" -msgstr[1] "如下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" +msgstr[0] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" +msgstr[1] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" #: builtin/rm.c:71 msgid "" @@ -9104,6 +9303,10 @@ msgstr "允许递归删除" msgid "exit with a zero status even if nothing matched" msgstr "即使没有匹配，也以零状态退出" +#: builtin/rm.c:318 +msgid "Please, stage your changes to .gitmodules or stash them to proceed" +msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" + #: builtin/rm.c:336 #, c-format msgid "not removing '%s' recursively without -r" @@ -9287,11 +9490,11 @@ msgstr "删除符号引用" msgid "shorten ref output" msgstr "简短的引用输出" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "原因" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "更新的原因" @@ -9412,236 +9615,226 @@ msgstr "开关 'points-at' 需要一个对象" msgid "malformed object name '%s'" msgstr "非法的对象名 '%s'" -#: builtin/tag.c:588 +#: builtin/tag.c:589 msgid "list tag names" msgstr "列出tag名称" -#: builtin/tag.c:590 +#: builtin/tag.c:591 msgid "print <n> lines of each tag message" msgstr "每个 tag 信息打印 <n> 行" -#: builtin/tag.c:592 +#: builtin/tag.c:593 msgid "delete tags" msgstr "删除 tags" -#: builtin/tag.c:593 +#: builtin/tag.c:594 msgid "verify tags" msgstr "验证 tags" -#: builtin/tag.c:595 +#: builtin/tag.c:596 msgid "Tag creation options" msgstr "Tag 创建选项" -#: builtin/tag.c:597 +#: builtin/tag.c:598 msgid "annotated tag, needs a message" msgstr "注解 tag，需要一个说明" -#: builtin/tag.c:599 +#: builtin/tag.c:600 msgid "tag message" msgstr "tag 说明" -#: builtin/tag.c:601 +#: builtin/tag.c:602 msgid "annotated and GPG-signed tag" msgstr "注解并 GPG 签名的 tag" -#: builtin/tag.c:605 +#: builtin/tag.c:606 msgid "use another key to sign the tag" msgstr "使用另外的私钥签名 tag" -#: builtin/tag.c:606 +#: builtin/tag.c:607 msgid "replace the tag if exists" msgstr "如果存在，替换现有的 tag" -#: builtin/tag.c:607 +#: builtin/tag.c:608 msgid "show tag list in columns" msgstr "以列的方式显示 tag" -#: builtin/tag.c:609 +#: builtin/tag.c:610 msgid "sort tags" msgstr "排序 tags" -#: builtin/tag.c:613 +#: builtin/tag.c:614 msgid "Tag listing options" msgstr "Tag 列表选项" -#: builtin/tag.c:616 builtin/tag.c:622 +#: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "只打印包含提交的tags" -#: builtin/tag.c:628 +#: builtin/tag.c:629 msgid "print only tags of the object" msgstr "只打印tags对象" -#: builtin/tag.c:654 +#: builtin/tag.c:655 msgid "--column and -n are incompatible" msgstr "--column 和 -n 不兼容" -#: builtin/tag.c:666 +#: builtin/tag.c:667 msgid "--sort and -n are incompatible" msgstr "--sort 和 -n 不兼容" -#: builtin/tag.c:673 +#: builtin/tag.c:674 msgid "-n option is only allowed with -l." msgstr "-n 选项只允许和 -l 同时使用。" -#: builtin/tag.c:675 +#: builtin/tag.c:676 msgid "--contains option is only allowed with -l." msgstr "--contains 选项只允许和 -l 同时使用。" -#: builtin/tag.c:677 +#: builtin/tag.c:678 msgid "--points-at option is only allowed with -l." msgstr "--points-at 选项只允许和 -l 同时使用。" -#: builtin/tag.c:685 +#: builtin/tag.c:686 msgid "only one -F or -m option is allowed." msgstr "只允许一个 -F 或 -m 选项。" -#: builtin/tag.c:705 +#: builtin/tag.c:706 msgid "too many params" msgstr "太多参数" -#: builtin/tag.c:711 +#: builtin/tag.c:712 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一个有效的tag名称。" -#: builtin/tag.c:716 +#: builtin/tag.c:717 #, c-format msgid "tag '%s' already exists" msgstr "tag '%s' 已存在" -#: builtin/tag.c:734 -#, c-format -msgid "%s: cannot lock the ref" -msgstr "%s：不能锁定引用" - -#: builtin/tag.c:736 -#, c-format -msgid "%s: cannot update the ref" -msgstr "%s：不能更新引用" - -#: builtin/tag.c:738 +#: builtin/tag.c:741 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新tag '%s'（曾为 %s）\n" -#: builtin/unpack-objects.c:483 +#: builtin/unpack-objects.c:489 msgid "Unpacking objects" msgstr "展开对象中" -#: builtin/update-index.c:402 +#: builtin/update-index.c:403 msgid "git update-index [options] [--] [<file>...]" msgstr "git update-index [选项] [--] [<文件>...]" -#: builtin/update-index.c:755 +#: builtin/update-index.c:756 msgid "continue refresh even when index needs update" msgstr "当索引需要更新时继续刷新" -#: builtin/update-index.c:758 +#: builtin/update-index.c:759 msgid "refresh: ignore submodules" msgstr "刷新：忽略子模组" -#: builtin/update-index.c:761 +#: builtin/update-index.c:762 msgid "do not ignore new files" msgstr "不忽略新的文件" -#: builtin/update-index.c:763 +#: builtin/update-index.c:764 msgid "let files replace directories and vice-versa" msgstr "让文件替换目录（反之亦然）" -#: builtin/update-index.c:765 +#: builtin/update-index.c:766 msgid "notice files missing from worktree" msgstr "通知文件从工作区丢失" -#: builtin/update-index.c:767 +#: builtin/update-index.c:768 msgid "refresh even if index contains unmerged entries" msgstr "即使索引区包含未合并的条目也执行刷新" -#: builtin/update-index.c:770 +#: builtin/update-index.c:771 msgid "refresh stat information" msgstr "刷新统计信息" -#: builtin/update-index.c:774 +#: builtin/update-index.c:775 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置" -#: builtin/update-index.c:778 +#: builtin/update-index.c:779 msgid "<mode>,<object>,<path>" msgstr "<mode>,<object>,<path>" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "add the specified entry to the index" msgstr "添加指定的条目到索引区" -#: builtin/update-index.c:783 +#: builtin/update-index.c:784 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的可执行位" -#: builtin/update-index.c:788 +#: builtin/update-index.c:789 msgid "mark files as \"not changing\"" msgstr "把文件标记为 \"没有变更\"" -#: builtin/update-index.c:791 +#: builtin/update-index.c:792 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged 位" -#: builtin/update-index.c:794 +#: builtin/update-index.c:795 msgid "mark files as \"index-only\"" msgstr "把文件标记为 \"仅索引\"" -#: builtin/update-index.c:797 +#: builtin/update-index.c:798 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree 位" -#: builtin/update-index.c:800 +#: builtin/update-index.c:801 msgid "add to index only; do not add content to object database" msgstr "只添加到索引区；不添加对象到对象库" -#: builtin/update-index.c:802 +#: builtin/update-index.c:803 msgid "remove named paths even if present in worktree" msgstr "即使存在工作区里，也删除路径" -#: builtin/update-index.c:804 +#: builtin/update-index.c:805 msgid "with --stdin: input lines are terminated by null bytes" msgstr "携带 --stdin：输入的行以 null 字符终止" -#: builtin/update-index.c:806 +#: builtin/update-index.c:807 msgid "read list of paths to be updated from standard input" msgstr "从标准输入中读取需要更新的路径列表" -#: builtin/update-index.c:810 +#: builtin/update-index.c:811 msgid "add entries from standard input to the index" msgstr "从标准输入添加条目到索引区" -#: builtin/update-index.c:814 +#: builtin/update-index.c:815 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "为指定文件重新生成第2和第3暂存区" -#: builtin/update-index.c:818 +#: builtin/update-index.c:819 msgid "only update entries that differ from HEAD" msgstr "只更新与 HEAD 不同的条目" -#: builtin/update-index.c:822 +#: builtin/update-index.c:823 msgid "ignore files missing from worktree" msgstr "忽略工作区丢失的文件" -#: builtin/update-index.c:825 +#: builtin/update-index.c:826 msgid "report actions to standard output" msgstr "在标准输出显示操作" -#: builtin/update-index.c:827 +#: builtin/update-index.c:828 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘记保存的未解决的冲突" -#: builtin/update-index.c:831 +#: builtin/update-index.c:832 msgid "write index in this format" msgstr "以这种格式写入索引区" -#: builtin/update-index.c:833 +#: builtin/update-index.c:834 msgid "enable or disable split index" msgstr "启用或禁用索引拆分" @@ -9657,19 +9850,19 @@ msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]" msgid "git update-ref [options] --stdin [-z]" msgstr "git update-ref [选项] --stdin [-z]" -#: builtin/update-ref.c:350 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "删除引用" -#: builtin/update-ref.c:352 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "更新 <引用名> 本身而不是它指向的引用" -#: builtin/update-ref.c:353 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "标准输入有以 NUL 字符终止的参数" -#: builtin/update-ref.c:354 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "从标准输入读取更新" @@ -9689,15 +9882,15 @@ msgstr "git verify-commit [-v|--verbose] <提交>..." msgid "print commit contents" msgstr "打印提交内容" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:54 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:64 msgid "verbose" msgstr "冗长输出" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:66 msgid "show statistics only" msgstr "只显示统计" @@ -9725,34 +9918,19 @@ msgstr "将 <前缀> 子目录内容写到一个树对象" msgid "only useful for debugging" msgstr "只对调试有用" +#: credential-cache--daemon.c:267 +msgid "print debugging messages to stderr" +msgstr "调试信息输出到标准错误" + #: git.c:17 msgid "" -"'git help -a' and 'git help -g' lists available subcommands and some\n" +"'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" -"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n" -"'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。" - -#: parse-options.h:143 -msgid "expiry-date" -msgstr "逾期日期" - -#: parse-options.h:158 -msgid "no-op (backward compatibility)" -msgstr "空操作（向后兼容）" - -#: parse-options.h:232 -msgid "be more verbose" -msgstr "更加详细" - -#: parse-options.h:234 -msgid "be more quiet" -msgstr "更加安静" - -#: parse-options.h:240 -msgid "use <n> digits to display SHA-1s" -msgstr "用 <n> 位数字显示 SHA-1 哈希值" +"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" +"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" +"帮助。" #: common-cmds.h:8 msgid "Add file contents to the index" @@ -9838,6 +10016,30 @@ msgstr "显示工作区状态" msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象" +#: parse-options.h:143 +msgid "expiry-date" +msgstr "到期时间" + +#: parse-options.h:158 +msgid "no-op (backward compatibility)" +msgstr "空操作（向后兼容）" + +#: parse-options.h:232 +msgid "be more verbose" +msgstr "更加详细" + +#: parse-options.h:234 +msgid "be more quiet" +msgstr "更加安静" + +#: parse-options.h:240 +msgid "use <n> digits to display SHA-1s" +msgstr "用 <n> 位数字显示 SHA-1 哈希值" + +#: rerere.h:27 +msgid "update the index with reused conflict resolution if possible" +msgstr "如果可能，重用冲突解决更新索引" + #: git-am.sh:52 msgid "You need to set your committer info first" msgstr "您需要先设置你的提交者信息" @@ -10086,21 +10288,21 @@ msgstr "您确认么[Y/n]？ " #: git-bisect.sh:289 msgid "" -"You need to give me at least one good and one bad revisions.\n" +"You need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "您需要给我至少一个好版本和一个坏版本。\n" -"（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）" +"（为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。）" #: git-bisect.sh:292 msgid "" "You need to start by \"git bisect start\".\n" -"You then need to give me at least one good and one bad revisions.\n" +"You then need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "您需要执行 \"git bisect start\" 来开始。\n" "然后需要提供我至少一个好版本和一个坏版本。\n" -"（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）" +"（为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。）" #: git-bisect.sh:363 git-bisect.sh:490 msgid "We are not bisecting." @@ -10168,16 +10370,23 @@ msgstr "二分查找运行成功" 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, or use 'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" "Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件，\n" -"然后酌情使用 'git add/rm <file>' 标记解决方案，\n" -"或者使用 'git commit -a'。" +"然后酌情使用 'git add/rm <file>' 标记解决方案，再做提交。" #: git-pull.sh:25 msgid "Pull is not possible because you have unmerged files." msgstr "Pull 不可用，因为您尚有未合并的文件。" +#: git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"您尚未结束您的合并（存在 MERGE_HEAD）。\n" +"请在合并前先提交您的修改。" + #: git-pull.sh:245 msgid "updating an unborn branch with changes added to the index" msgstr "更新尚未诞生的分支，变更添加至索引" @@ -10427,8 +10636,8 @@ msgstr "指定了太多的版本：$REV" #: git-stash.sh:397 #, sh-format -msgid "$reference is not valid reference" -msgstr "$reference 不是有效的引用" +msgid "$reference is not a valid reference" +msgstr "$reference 不是一个有效的引用" #: git-stash.sh:425 #, sh-format @@ -10474,11 +10683,11 @@ msgstr "丢弃了 ${REV} ($s)" msgid "${REV}: Could not drop stash entry" msgstr "${REV}：不能丢弃进度条目" -#: git-stash.sh:538 +#: git-stash.sh:539 msgid "No branch name specified" msgstr "未指定分支名" -#: git-stash.sh:610 +#: git-stash.sh:611 msgid "(To restore them type \"git stash apply\")" msgstr "（为恢复数据输入 \"git stash apply\"）" @@ -10765,6 +10974,36 @@ msgstr "无法递归进子模组路径 '$sm_path'" msgid "Synchronizing submodule url for '$displaypath'" msgstr "为 '$displaypath' 同步子模组 url" +#~ msgid "Failed to lock ref for update" +#~ msgstr "无法为更新锁定引用" + +#~ msgid "Failed to write ref" +#~ msgstr "不能写引用" + +#~ msgid "Failed to lock HEAD during fast_forward_to" +#~ msgstr "在快进时无法为 HEAD 加锁" + +#~ msgid "invalid commit: %s" +#~ msgstr "无效的提交：%s" + +#~ msgid "cannot lock HEAD ref" +#~ msgstr "无法锁定 HEAD 引用" + +#~ msgid "cannot update HEAD ref" +#~ msgstr "无法更新 HEAD 引用" + +#~ msgid "Invalid %s: '%s'" +#~ msgstr "无效的 %s：'%s'" + +#~ msgid "cannot tell cwd" +#~ msgstr "无法获知当前路径" + +#~ msgid "%s: cannot lock the ref" +#~ msgstr "%s：不能锁定引用" + +#~ msgid "%s: cannot update the ref" +#~ msgstr "%s：不能更新引用" + #~ msgid "commit has empty message" #~ msgstr "提交说明为空" |