diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 7157 |
1 files changed, 3840 insertions, 3317 deletions
diff --git a/po/git.pot b/po/git.pot index cc0b9c3150..d4e46e5e74 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-02-18 01:00+0800\n" +"POT-Creation-Date: 2017-10-17 09:44+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" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:55 +#: advice.c:58 #, c-format msgid "hint: %.*s\n" msgstr "" -#: advice.c:83 +#: advice.c:86 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:85 +#: advice.c:88 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:87 +#: advice.c:90 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:89 +#: advice.c:92 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:91 +#: advice.c:94 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:93 +#: advice.c:96 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:101 +#: advice.c:104 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "" -#: advice.c:109 +#: advice.c:112 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:114 builtin/merge.c:1206 +#: advice.c:117 builtin/merge.c:1211 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:116 +#: advice.c:119 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:117 +#: advice.c:120 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:123 +#: advice.c:126 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -86,12 +86,12 @@ msgid "" "\n" msgstr "" -#: apply.c:57 +#: apply.c:58 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: apply.c:73 +#: apply.c:74 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" @@ -126,42 +126,52 @@ msgstr "" msgid "regexec returned %d for input: %s" msgstr "" -#: apply.c:938 +#: apply.c:928 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: apply.c:977 +#: apply.c:966 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: apply.c:983 +#: apply.c:972 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: apply.c:984 +#: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: apply.c:990 +#: apply.c:978 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: apply.c:1488 +#: apply.c:1007 +#, c-format +msgid "invalid mode on line %d: %s" +msgstr "" + +#: apply.c:1325 +#, c-format +msgid "inconsistent header lines %d and %d" +msgstr "" + +#: apply.c:1497 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: apply.c:1557 +#: apply.c:1566 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: apply.c:1577 +#: apply.c:1586 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -172,648 +182,649 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apply.c:1589 +#: apply.c:1599 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1759 +#: apply.c:1787 msgid "new file depends on old contents" msgstr "" -#: apply.c:1761 +#: apply.c:1789 msgid "deleted file still has contents" msgstr "" -#: apply.c:1795 +#: apply.c:1823 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1832 +#: apply.c:1860 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1834 +#: apply.c:1862 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1837 +#: apply.c:1865 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:1984 +#: apply.c:2012 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2021 +#: apply.c:2049 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2182 +#: apply.c:2209 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2265 +#: apply.c:2295 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2269 +#: apply.c:2299 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2922 +#: apply.c:2958 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3041 +#: apply.c:3077 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: apply.c:3053 +#: apply.c:3089 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3059 +#: apply.c:3095 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3081 +#: apply.c:3117 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3089 +#: apply.c:3125 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3135 +#: apply.c:3171 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3145 +#: apply.c:3181 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3153 +#: apply.c:3189 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3171 +#: apply.c:3207 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3184 +#: apply.c:3220 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3190 +#: apply.c:3226 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3211 +#: apply.c:3247 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3333 +#: apply.c:3369 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248 +#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3389 +#: apply.c:3426 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3418 apply.c:3658 +#: apply.c:3455 apply.c:3695 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3501 apply.c:3672 +#: apply.c:3538 apply.c:3709 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3510 apply.c:3680 +#: apply.c:3547 apply.c:3717 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3545 +#: apply.c:3582 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3548 +#: apply.c:3585 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3564 apply.c:3568 +#: apply.c:3601 apply.c:3605 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3580 +#: apply.c:3617 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3594 +#: apply.c:3631 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3599 +#: apply.c:3636 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3625 +#: apply.c:3662 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3697 +#: apply.c:3734 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3699 +#: apply.c:3736 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3850 apply.c:3852 +#: apply.c:3886 apply.c:3888 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3908 +#: apply.c:3944 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3911 +#: apply.c:3947 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3931 +#: apply.c:3967 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3936 +#: apply.c:3972 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3956 +#: apply.c:3992 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3960 +#: apply.c:3996 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:3975 +#: apply.c:4011 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4066 +#: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4073 +#: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4076 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135 +#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: apply.c:4085 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4095 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4233 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4268 +#: apply.c:4304 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4274 +#: apply.c:4310 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4282 +#: apply.c:4318 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4288 apply.c:4432 +#: apply.c:4324 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4329 +#: apply.c:4365 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4333 +#: apply.c:4369 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4403 +#: apply.c:4439 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4501 +#: apply.c:4537 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4509 +#: apply.c:4545 msgid "internal error" msgstr "" -#: apply.c:4512 +#: apply.c:4548 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4523 +#: apply.c:4559 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986 +#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4545 +#: apply.c:4581 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4549 +#: apply.c:4585 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4659 +#: apply.c:4695 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4667 +#: apply.c:4703 msgid "unrecognized input" msgstr "" -#: apply.c:4686 +#: apply.c:4722 msgid "unable to read index file" msgstr "" -#: apply.c:4824 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4849 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4855 apply.c:4870 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4863 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 +#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "" -#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591 -#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960 -#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104 -#: git-add--interactive.perl:239 +#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 +#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 +#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 +#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 +#: git-add--interactive.perl:197 msgid "path" msgstr "" -#: apply.c:4911 +#: apply.c:4948 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4914 +#: apply.c:4951 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4916 builtin/am.c:2286 +#: apply.c:4953 builtin/am.c:2265 msgid "num" msgstr "" -#: apply.c:4917 +#: apply.c:4954 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4920 +#: apply.c:4957 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4922 +#: apply.c:4959 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4926 +#: apply.c:4963 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4928 +#: apply.c:4965 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4930 +#: apply.c:4967 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4932 +#: apply.c:4969 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4934 +#: apply.c:4971 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4936 +#: apply.c:4973 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4938 +#: apply.c:4975 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4940 +#: apply.c:4977 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4942 +#: apply.c:4979 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507 +#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4947 +#: apply.c:4984 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:4948 builtin/am.c:2265 +#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 msgid "action" msgstr "" -#: apply.c:4949 +#: apply.c:4986 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:4952 apply.c:4955 +#: apply.c:4989 apply.c:4992 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:4958 +#: apply.c:4995 msgid "apply the patch in reverse" msgstr "" -#: apply.c:4960 +#: apply.c:4997 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:4962 +#: apply.c:4999 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:4964 +#: apply.c:5001 msgid "allow overlapping hunks" msgstr "" -#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 -#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114 +#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 +#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "" -#: apply.c:4967 +#: apply.c:5004 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:4970 +#: apply.c:5007 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:4972 builtin/am.c:2274 +#: apply.c:5009 builtin/am.c:2253 msgid "root" msgstr "" -#: apply.c:4973 +#: apply.c:5010 msgid "prepend <root> to all filenames" msgstr "" -#: archive.c:12 +#: archive.c:13 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "" -#: archive.c:13 +#: archive.c:14 msgid "git archive --list" msgstr "" -#: archive.c:14 +#: archive.c:15 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -#: archive.c:15 +#: archive.c:16 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 +#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:429 +#: archive.c:436 msgid "fmt" msgstr "" -#: archive.c:429 +#: archive.c:436 msgid "archive format" msgstr "" -#: archive.c:430 builtin/log.c:1429 +#: archive.c:437 builtin/log.c:1452 msgid "prefix" msgstr "" -#: archive.c:431 +#: archive.c:438 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054 -#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 +#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" msgstr "" -#: archive.c:433 builtin/archive.c:89 +#: archive.c:440 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:435 +#: archive.c:442 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:436 +#: archive.c:443 msgid "report archived files on stderr" msgstr "" -#: archive.c:437 +#: archive.c:444 msgid "store only" msgstr "" -#: archive.c:438 +#: archive.c:445 msgid "compress faster" msgstr "" -#: archive.c:446 +#: archive.c:453 msgid "compress better" msgstr "" -#: archive.c:449 +#: archive.c:456 msgid "list supported archive formats" msgstr "" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 -#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 +#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 msgid "repo" msgstr "" -#: archive.c:452 builtin/archive.c:91 +#: archive.c:459 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485 +#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 msgid "command" msgstr "" -#: archive.c:454 builtin/archive.c:93 +#: archive.c:461 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:461 +#: archive.c:468 msgid "Unexpected option --remote" msgstr "" -#: archive.c:463 +#: archive.c:470 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:465 +#: archive.c:472 msgid "Unexpected option --output" msgstr "" -#: archive.c:487 +#: archive.c:494 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:494 +#: archive.c:501 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" -#: attr.c:263 +#: attr.c:218 +#, c-format +msgid "%.*s is not a valid attribute name" +msgstr "" + +#: attr.c:415 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -#: bisect.c:441 -#, c-format -msgid "Could not open file '%s'" -msgstr "" - -#: bisect.c:446 +#: bisect.c:447 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" @@ -870,53 +881,88 @@ msgstr "" msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:849 +#: bisect.c:850 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262 +#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:917 +#: bisect.c:918 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:947 +#: bisect.c:948 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:967 +#: bisect.c:968 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:975 +#: bisect.c:976 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:994 +#: bisect.c:995 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" msgstr[0] "" msgstr[1] "" -#. TRANSLATORS: the last %s will be replaced with -#. "(roughly %d steps)" translation -#: bisect.c:998 +#. TRANSLATORS: the last %s will be replaced with "(roughly %d +#. steps)" translation. +#. +#: bisect.c:1001 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "" msgstr[1] "" +#: blame.c:1757 +msgid "--contents and --reverse do not blend well." +msgstr "" + +#: blame.c:1768 +msgid "cannot use --contents with final commit object name" +msgstr "" + +#: blame.c:1788 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" + +#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168 +#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 +#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: builtin/shortlog.c:191 +msgid "revision walk setup failed" +msgstr "" + +#: blame.c:1815 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" + +#: blame.c:1826 +#, c-format +msgid "no such path %s in %s" +msgstr "" + +#: blame.c:1837 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "" + #: branch.c:53 #, c-format msgid "" @@ -933,42 +979,42 @@ msgstr "" #: branch.c:93 #, c-format -msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" #: branch.c:94 #, c-format -msgid "Branch %s set up to track remote branch %s from %s." +msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "" #: branch.c:98 #, c-format -msgid "Branch %s set up to track local branch %s by rebasing." +msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "" #: branch.c:99 #, c-format -msgid "Branch %s set up to track local branch %s." +msgid "Branch '%s' set up to track local branch '%s'." msgstr "" #: branch.c:104 #, c-format -msgid "Branch %s set up to track remote ref %s by rebasing." +msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "" #: branch.c:105 #, c-format -msgid "Branch %s set up to track remote ref %s." +msgid "Branch '%s' set up to track remote ref '%s'." msgstr "" #: branch.c:109 #, c-format -msgid "Branch %s set up to track local ref %s by rebasing." +msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" #: branch.c:110 #, c-format -msgid "Branch %s set up to track local ref %s." +msgid "Branch '%s' set up to track local ref '%s'." msgstr "" #: branch.c:119 @@ -990,21 +1036,21 @@ msgstr "" msgid "A branch named '%s' already exists." msgstr "" -#: branch.c:198 +#: branch.c:197 msgid "Cannot force update the current branch." msgstr "" -#: branch.c:218 +#: branch.c:217 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -#: branch.c:220 +#: branch.c:219 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" -#: branch.c:222 +#: branch.c:221 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1016,27 +1062,27 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:265 +#: branch.c:264 #, c-format msgid "Not a valid object name: '%s'." msgstr "" -#: branch.c:285 +#: branch.c:284 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" -#: branch.c:290 +#: branch.c:289 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:344 +#: branch.c:343 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" -#: branch.c:363 +#: branch.c:366 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" @@ -1046,97 +1092,92 @@ msgstr "" msgid "'%s' does not look like a v2 bundle file" msgstr "" -#: bundle.c:61 +#: bundle.c:62 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777 +#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 +#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 +#: sequencer.c:2949 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "" -#: bundle.c:139 +#: bundle.c:140 msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290 -#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348 -#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 -#: builtin/merge.c:360 builtin/shortlog.c:177 -msgid "revision walk setup failed" -msgstr "" - -#: bundle.c:185 +#: bundle.c:193 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:192 +#: bundle.c:200 msgid "The bundle records a complete history." msgstr "" -#: bundle.c:194 +#: bundle.c:202 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:253 +#: bundle.c:261 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:264 +#: bundle.c:272 msgid "pack-objects died" msgstr "" -#: bundle.c:304 +#: bundle.c:314 msgid "rev-list died" msgstr "" -#: bundle.c:353 +#: bundle.c:363 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282 +#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:451 +#: bundle.c:461 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:463 +#: bundle.c:473 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:491 +#: bundle.c:501 msgid "index-pack died" msgstr "" -#: color.c:300 +#: color.c:301 #, c-format msgid "invalid color value: %.*s" msgstr "" -#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457 -#: builtin/am.c:1493 builtin/am.c:2127 +#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1467 builtin/am.c:2105 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:42 +#: commit.c:43 #, c-format msgid "%s %s is not a commit!" msgstr "" -#: commit.c:1514 +#: commit.c:1517 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1147,142 +1188,161 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: config.c:518 +#: config.c:187 +msgid "relative config include conditionals must come from files" +msgstr "" + +#: config.c:721 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:522 +#: config.c:725 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:526 +#: config.c:729 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:530 +#: config.c:733 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:534 +#: config.c:737 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:538 +#: config.c:741 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:657 +#: config.c:869 msgid "out of range" msgstr "" -#: config.c:657 +#: config.c:869 msgid "invalid unit" msgstr "" -#: config.c:663 +#: config.c:875 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:668 +#: config.c:880 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:671 +#: config.c:883 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:674 +#: config.c:886 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:677 +#: config.c:889 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:680 +#: config.c:892 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:683 +#: config.c:895 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:770 +#: config.c:990 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:865 config.c:876 +#: config.c:1085 config.c:1096 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:993 +#: config.c:1213 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1149 +#: config.c:1372 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1339 +#: config.c:1568 msgid "unable to parse command-line config" msgstr "" -#: config.c:1389 +#: config.c:1900 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:1743 +#: config.c:2087 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "" + +#: config.c:2130 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "" + +#: config.c:2156 +#, c-format +msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" +msgstr "" + +#: config.c:2167 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:1745 +#: config.c:2169 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:1804 +#: config.c:2228 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2225 config.c:2450 +#: config.c:2571 config.c:2789 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2343 +#: config.c:2678 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2345 +#: config.c:2680 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "" -#: connect.c:49 +#: connect.c:50 msgid "The remote end hung up upon initial contact" msgstr "" -#: connect.c:51 +#: connect.c:52 msgid "" "Could not read from remote repository.\n" "\n" @@ -1290,111 +1350,111 @@ msgid "" "and the repository exists." msgstr "" -#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 +#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141 msgid "Checking connectivity" msgstr "" -#: connected.c:75 +#: connected.c:76 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:95 +#: connected.c:96 msgid "failed write to rev-list" msgstr "" -#: connected.c:102 +#: connected.c:103 msgid "failed to close rev-list's stdin" msgstr "" -#: convert.c:201 +#: convert.c:205 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory." msgstr "" -#: convert.c:205 +#: convert.c:209 #, c-format msgid "CRLF would be replaced by LF in %s." msgstr "" -#: convert.c:211 +#: convert.c:215 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory." msgstr "" -#: convert.c:215 +#: convert.c:219 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" -#: date.c:97 +#: date.c:116 msgid "in the future" msgstr "" -#: date.c:103 +#: date.c:122 #, c-format -msgid "%lu second ago" -msgid_plural "%lu seconds ago" +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "" msgstr[1] "" -#: date.c:110 +#: date.c:129 #, c-format -msgid "%lu minute ago" -msgid_plural "%lu minutes ago" +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "" msgstr[1] "" -#: date.c:117 +#: date.c:136 #, c-format -msgid "%lu hour ago" -msgid_plural "%lu hours ago" +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "" msgstr[1] "" -#: date.c:124 +#: date.c:143 #, c-format -msgid "%lu day ago" -msgid_plural "%lu days ago" +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" msgstr[0] "" msgstr[1] "" -#: date.c:130 +#: date.c:149 #, c-format -msgid "%lu week ago" -msgid_plural "%lu weeks ago" +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "" msgstr[1] "" -#: date.c:137 +#: date.c:156 #, c-format -msgid "%lu month ago" -msgid_plural "%lu months ago" +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" msgstr[0] "" msgstr[1] "" -#: date.c:148 +#: date.c:167 #, c-format -msgid "%lu year" -msgid_plural "%lu years" +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" msgstr[0] "" msgstr[1] "" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:151 +#: date.c:170 #, c-format -msgid "%s, %lu month ago" -msgid_plural "%s, %lu months ago" +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "" msgstr[1] "" -#: date.c:156 date.c:161 +#: date.c:175 date.c:180 #, c-format -msgid "%lu year ago" -msgid_plural "%lu years ago" +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" msgstr[0] "" msgstr[1] "" @@ -1407,342 +1467,394 @@ msgstr "" msgid "Performing inexact rename detection" msgstr "" -#: diff.c:62 +#: diff.c:74 #, c-format msgid "option '%s' requires a value" msgstr "" -#: diff.c:124 +#: diff.c:152 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:129 +#: diff.c:157 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" #: diff.c:281 +msgid "" +"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " +"'plain'" +msgstr "" + +#: diff.c:341 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:344 +#: diff.c:398 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:3085 +#: diff.c:3861 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:3411 +#: diff.c:4189 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:3501 +#: diff.c:4279 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:3664 +#: diff.c:4445 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3678 +#: diff.c:4459 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:4696 +#: diff.c:5505 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:4699 +#: diff.c:5508 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:4702 +#: diff.c:5511 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:1862 +#: dir.c:1983 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:1981 +#: dir.c:2102 msgid "Untracked cache is disabled on this system or location." msgstr "" -#: dir.c:2759 +#: dir.c:2885 dir.c:2890 +#, c-format +msgid "could not create directories for %s" +msgstr "" + +#: dir.c:2915 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: fetch-pack.c:213 +#: entry.c:176 +msgid "Filtering content" +msgstr "" + +#: entry.c:433 +#, c-format +msgid "could not stat file '%s'" +msgstr "" + +#: fetch-pack.c:252 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:225 +#: fetch-pack.c:264 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "" -#: fetch-pack.c:243 +#: fetch-pack.c:283 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "" + +#: fetch-pack.c:284 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:295 +#: fetch-pack.c:336 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:381 +#: fetch-pack.c:422 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:387 +#: fetch-pack.c:428 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:389 +#: fetch-pack.c:430 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:392 +#: fetch-pack.c:433 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:394 +#: fetch-pack.c:435 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:397 +#: fetch-pack.c:438 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:436 +#: fetch-pack.c:477 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:450 +#: fetch-pack.c:491 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:483 +#: fetch-pack.c:524 msgid "giving up" msgstr "" -#: fetch-pack.c:493 progress.c:235 +#: fetch-pack.c:534 progress.c:242 msgid "done" msgstr "" -#: fetch-pack.c:505 +#: fetch-pack.c:546 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:551 +#: fetch-pack.c:592 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:697 +#: fetch-pack.c:776 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:735 +#: fetch-pack.c:814 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:743 +#: fetch-pack.c:822 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:799 +#: fetch-pack.c:878 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:815 +#: fetch-pack.c:894 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:817 +#: fetch-pack.c:896 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:844 +#: fetch-pack.c:923 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:848 +#: fetch-pack.c:927 msgid "Server supports multi_ack_detailed" msgstr "" -#: fetch-pack.c:851 +#: fetch-pack.c:930 msgid "Server supports no-done" msgstr "" -#: fetch-pack.c:857 +#: fetch-pack.c:936 msgid "Server supports multi_ack" msgstr "" -#: fetch-pack.c:861 +#: fetch-pack.c:940 msgid "Server supports side-band-64k" msgstr "" -#: fetch-pack.c:865 +#: fetch-pack.c:944 msgid "Server supports side-band" msgstr "" -#: fetch-pack.c:869 +#: fetch-pack.c:948 msgid "Server supports allow-tip-sha1-in-want" msgstr "" -#: fetch-pack.c:873 +#: fetch-pack.c:952 msgid "Server supports allow-reachable-sha1-in-want" msgstr "" -#: fetch-pack.c:883 +#: fetch-pack.c:962 msgid "Server supports ofs-delta" msgstr "" -#: fetch-pack.c:890 +#: fetch-pack.c:969 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:896 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:900 +#: fetch-pack.c:979 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:902 +#: fetch-pack.c:981 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:913 +#: fetch-pack.c:992 msgid "no common commits" msgstr "" -#: fetch-pack.c:925 +#: fetch-pack.c:1004 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1087 +#: fetch-pack.c:1166 msgid "no matching remote head" msgstr "" -#: gpg-interface.c:185 +#: fetch-pack.c:1188 +#, c-format +msgid "no such remote ref %s" +msgstr "" + +#: fetch-pack.c:1191 +#, c-format +msgid "Server does not allow request for unadvertised object %s" +msgstr "" + +#: gpg-interface.c:181 msgid "gpg failed to sign the data" msgstr "" -#: gpg-interface.c:215 +#: gpg-interface.c:211 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:217 +#: gpg-interface.c:214 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" -#: graph.c:96 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:1794 +#: grep.c:1970 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133 +#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:1822 +#: grep.c:1998 #, c-format msgid "'%s': short read" msgstr "" -#: help.c:218 +#: help.c:179 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:225 +#: help.c:186 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:256 +#: help.c:217 msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:321 +#: help.c:281 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" -#: help.c:376 +#: help.c:336 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:398 +#: help.c:358 #, c-format -msgid "" -"WARNING: You called a Git command named '%s', which does not exist.\n" -"Continuing under the assumption that you meant '%s'" +msgid "WARNING: You called a Git command named '%s', which does not exist." +msgstr "" + +#: help.c:363 +#, c-format +msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:403 +#: help.c:368 #, c-format -msgid "in %0.1f seconds automatically..." +msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:410 +#: help.c:376 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:414 help.c:480 +#: help.c:380 msgid "" "\n" -"Did you mean this?" +"The most similar command is" msgid_plural "" "\n" -"Did you mean one of these?" +"The most similar commands are" msgstr[0] "" msgstr[1] "" -#: help.c:476 +#: help.c:395 +msgid "git version [<options>]" +msgstr "" + +#: help.c:456 #, c-format msgid "%s: %s - %s" msgstr "" -#: ident.c:334 +#: help.c:460 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +msgstr[1] "" + +#: ident.c:342 msgid "" "\n" "*** Please tell me who you are.\n" @@ -1757,7 +1869,40 @@ msgid "" "\n" msgstr "" -#: lockfile.c:152 +#: ident.c:366 +msgid "no email was given and auto-detection is disabled" +msgstr "" + +#: ident.c:371 +#, c-format +msgid "unable to auto-detect email address (got '%s')" +msgstr "" + +#: ident.c:381 +msgid "no name was given and auto-detection is disabled" +msgstr "" + +#: ident.c:387 +#, c-format +msgid "unable to auto-detect name (got '%s')" +msgstr "" + +#: ident.c:395 +#, c-format +msgid "empty ident name (for <%s>) not allowed" +msgstr "" + +#: ident.c:401 +#, c-format +msgid "name consists only of disallowed characters: %s" +msgstr "" + +#: ident.c:416 builtin/commit.c:616 +#, c-format +msgid "invalid date format: %s" +msgstr "" + +#: lockfile.c:151 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -1769,7 +1914,7 @@ msgid "" "remove the file manually to continue." msgstr "" -#: lockfile.c:160 +#: lockfile.c:159 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "" @@ -1778,242 +1923,256 @@ msgstr "" msgid "failed to read the cache" msgstr "" -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374 -#: builtin/checkout.c:588 builtin/clone.c:731 +#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 +#: builtin/checkout.c:595 builtin/clone.c:754 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:209 +#: merge-recursive.c:235 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:231 merge-recursive.c:239 +#: merge-recursive.c:257 merge-recursive.c:265 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "" -#: merge-recursive.c:303 +#: merge-recursive.c:329 msgid "error building trees" msgstr "" -#: merge-recursive.c:727 +#: merge-recursive.c:752 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:738 +#: merge-recursive.c:763 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:752 merge-recursive.c:771 +#: merge-recursive.c:777 merge-recursive.c:796 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:761 +#: merge-recursive.c:786 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:803 builtin/cat-file.c:34 +#: merge-recursive.c:828 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:805 +#: merge-recursive.c:830 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:829 +#: merge-recursive.c:854 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:840 +#: merge-recursive.c:865 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:845 +#: merge-recursive.c:870 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:985 +#: merge-recursive.c:1010 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:989 +#: merge-recursive.c:1014 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:1088 merge-recursive.c:1102 +#: merge-recursive.c:1117 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1094 merge-recursive.c:1107 +#: merge-recursive.c:1122 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree." +msgstr "" + +#: merge-recursive.c:1129 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1150 +#: merge-recursive.c:1134 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree at %s." +msgstr "" + +#: merge-recursive.c:1168 msgid "rename" msgstr "" -#: merge-recursive.c:1150 +#: merge-recursive.c:1168 msgid "renamed" msgstr "" -#: merge-recursive.c:1207 +#: merge-recursive.c:1225 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1232 +#: merge-recursive.c:1250 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1237 +#: merge-recursive.c:1255 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1299 +#: merge-recursive.c:1317 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1332 +#: merge-recursive.c:1350 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1535 +#: merge-recursive.c:1553 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1550 +#: merge-recursive.c:1568 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1557 merge-recursive.c:1771 +#: merge-recursive.c:1575 merge-recursive.c:1805 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1614 +#: merge-recursive.c:1632 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1617 +#: merge-recursive.c:1635 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1670 +#: merge-recursive.c:1704 msgid "modify" msgstr "" -#: merge-recursive.c:1670 +#: merge-recursive.c:1704 msgid "modified" msgstr "" -#: merge-recursive.c:1680 +#: merge-recursive.c:1714 msgid "content" msgstr "" -#: merge-recursive.c:1687 +#: merge-recursive.c:1721 msgid "add/add" msgstr "" -#: merge-recursive.c:1723 +#: merge-recursive.c:1757 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1737 +#: merge-recursive.c:1771 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1741 git-submodule.sh:930 +#: merge-recursive.c:1775 git-submodule.sh:944 msgid "submodule" msgstr "" -#: merge-recursive.c:1742 +#: merge-recursive.c:1776 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1836 +#: merge-recursive.c:1870 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1862 +#: merge-recursive.c:1896 msgid "file/directory" msgstr "" -#: merge-recursive.c:1868 +#: merge-recursive.c:1902 msgid "directory/file" msgstr "" -#: merge-recursive.c:1874 +#: merge-recursive.c:1908 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1883 +#: merge-recursive.c:1917 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1920 -msgid "Already up-to-date!" +#: merge-recursive.c:1954 +msgid "Already up to date!" msgstr "" -#: merge-recursive.c:1929 +#: merge-recursive.c:1963 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:2012 +#: merge-recursive.c:2060 msgid "Merging:" msgstr "" -#: merge-recursive.c:2025 +#: merge-recursive.c:2073 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:2064 +#: merge-recursive.c:2112 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2127 +#: merge-recursive.c:2175 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792 +#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 msgid "Unable to write index." msgstr "" -#: notes-merge.c:273 +#: notes-merge.c:272 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -2021,59 +2180,76 @@ msgid "" "commit/abort the previous merge before you start a new notes merge." msgstr "" -#: notes-merge.c:280 +#: notes-merge.c:279 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "" -#: notes-utils.c:41 +#: notes-utils.c:42 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -#: notes-utils.c:100 +#: notes-utils.c:101 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: notes-utils.c:110 +#: notes-utils.c:111 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: notes-utils.c:137 +#. TRANSLATORS: The first %s is the name of +#. the environment variable, the second %s is +#. its value. +#. +#: notes-utils.c:141 #, c-format msgid "Bad %s value: '%s'" msgstr "" -#: object.c:240 +#: object.c:239 #, c-format msgid "unable to parse object: %s" msgstr "" -#: parse-options.c:572 +#: packfile.c:556 +msgid "offset before end of packfile (broken .idx?)" +msgstr "" + +#: packfile.c:1683 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "" + +#: packfile.c:1687 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "" + +#: parse-options.c:573 msgid "..." msgstr "" -#: parse-options.c:590 +#: parse-options.c:592 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation -#: parse-options.c:594 +#. one in "usage: %s" translation. +#. +#: parse-options.c:598 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:597 +#: parse-options.c:601 #, c-format msgid " %s" msgstr "" -#: parse-options.c:631 +#: parse-options.c:640 msgid "-NUM" msgstr "" @@ -2082,346 +2258,467 @@ msgstr "" msgid "malformed object name '%s'" msgstr "" -#: path.c:826 +#: path.c:891 #, c-format msgid "Could not make %s writable by group" msgstr "" -#: pathspec.c:142 +#: pathspec.c:129 +msgid "Escape character '\\' not allowed as last character in attr value" +msgstr "" + +#: pathspec.c:147 +msgid "Only one 'attr:' specification is allowed." +msgstr "" + +#: pathspec.c:150 +msgid "attr spec must not be empty" +msgstr "" + +#: pathspec.c:193 +#, c-format +msgid "invalid attribute name %s" +msgstr "" + +#: pathspec.c:258 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -#: pathspec.c:149 +#: pathspec.c:265 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" -#: pathspec.c:188 +#: pathspec.c:305 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" -#: pathspec.c:201 +#: pathspec.c:326 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" -#: pathspec.c:206 +#: pathspec.c:331 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" -#: pathspec.c:238 +#: pathspec.c:369 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: pathspec.c:293 pathspec.c:315 -#, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "" - -#: pathspec.c:350 +#: pathspec.c:428 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: pathspec.c:363 +#: pathspec.c:441 #, c-format msgid "%s: '%s' is outside repository" msgstr "" -#: pathspec.c:451 +#: pathspec.c:515 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "" -#: pathspec.c:461 +#: pathspec.c:525 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:511 +#: pathspec.c:571 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" msgstr "" -#: pathspec.c:535 +#: pathspec.c:595 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: pathspec.c:544 -msgid "" -"There is nothing to exclude from by :(exclude) patterns.\n" -"Perhaps you forgot to add either ':/' or '.' ?" -msgstr "" - -#: pretty.c:982 +#: pretty.c:962 msgid "unable to parse --pretty format" msgstr "" -#: read-cache.c:1307 +#: read-cache.c:1443 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1317 +#: read-cache.c:1453 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: refs.c:576 builtin/merge.c:844 +#: read-cache.c:2316 builtin/merge.c:1046 +#, c-format +msgid "could not close '%s'" +msgstr "" + +#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 +#, c-format +msgid "could not stat '%s'" +msgstr "" + +#: read-cache.c:2407 +#, c-format +msgid "unable to open git dir: %s" +msgstr "" + +#: read-cache.c:2419 +#, c-format +msgid "unable to unlink: %s" +msgstr "" + +#: refs.c:638 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: refs/files-backend.c:2481 +#: refs.c:1792 +msgid "ref updates forbidden inside quarantine environment" +msgstr "" + +#: refs/files-backend.c:1136 +#, c-format +msgid "could not remove reference %s" +msgstr "" + +#: refs/files-backend.c:1150 refs/packed-backend.c:1430 +#: refs/packed-backend.c:1440 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:2484 +#: refs/files-backend.c:1153 refs/packed-backend.c:1443 #, c-format msgid "could not delete references: %s" msgstr "" -#: refs/files-backend.c:2493 +#: ref-filter.c:35 wt-status.c:1811 +msgid "gone" +msgstr "" + +#: ref-filter.c:36 #, c-format -msgid "could not remove reference %s" +msgid "ahead %d" +msgstr "" + +#: ref-filter.c:37 +#, c-format +msgid "behind %d" +msgstr "" + +#: ref-filter.c:38 +#, c-format +msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:56 +#: ref-filter.c:105 #, c-format msgid "expected format: %%(color:<color>)" msgstr "" -#: ref-filter.c:58 +#: ref-filter.c:107 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:72 +#: ref-filter.c:127 +#, c-format +msgid "Integer value expected refname:lstrip=%s" +msgstr "" + +#: ref-filter.c:131 #, c-format -msgid "unrecognized format: %%(%s)" +msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:78 +#: ref-filter.c:133 +#, c-format +msgid "unrecognized %%(%s) argument: %s" +msgstr "" + +#: ref-filter.c:173 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:85 +#: ref-filter.c:180 #, c-format msgid "%%(subject) does not take arguments" msgstr "" -#: ref-filter.c:92 +#: ref-filter.c:198 #, c-format -msgid "%%(trailers) does not take arguments" +msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:111 +#: ref-filter.c:221 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:113 +#: ref-filter.c:223 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:123 +#: ref-filter.c:236 +#, c-format +msgid "positive value expected objectname:short=%s" +msgstr "" + +#: ref-filter.c:240 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "" -#: ref-filter.c:145 +#: ref-filter.c:267 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:157 +#: ref-filter.c:279 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:161 +#: ref-filter.c:283 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:167 +#: ref-filter.c:289 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:171 +#: ref-filter.c:293 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:255 +#: ref-filter.c:308 +#, c-format +msgid "unrecognized %%(if) argument: %s" +msgstr "" + +#: ref-filter.c:398 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:281 +#: ref-filter.c:424 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:383 +#: ref-filter.c:536 +#, c-format +msgid "format: %%(if) atom used without a %%(then) atom" +msgstr "" + +#: ref-filter.c:596 +#, c-format +msgid "format: %%(then) atom used without an %%(if) atom" +msgstr "" + +#: ref-filter.c:598 +#, c-format +msgid "format: %%(then) atom used more than once" +msgstr "" + +#: ref-filter.c:600 +#, c-format +msgid "format: %%(then) atom used after %%(else)" +msgstr "" + +#: ref-filter.c:626 +#, c-format +msgid "format: %%(else) atom used without an %%(if) atom" +msgstr "" + +#: ref-filter.c:628 +#, c-format +msgid "format: %%(else) atom used without a %%(then) atom" +msgstr "" + +#: ref-filter.c:630 +#, c-format +msgid "format: %%(else) atom used more than once" +msgstr "" + +#: ref-filter.c:643 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:435 +#: ref-filter.c:698 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:898 -msgid ":strip= requires a positive integer argument" +#: ref-filter.c:1283 +#, c-format +msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:903 +#: ref-filter.c:1286 #, c-format -msgid "ref '%s' does not have %ld components to :strip" +msgid "(no branch, bisect started on %s)" msgstr "" -#: ref-filter.c:1066 +#. TRANSLATORS: make sure this matches "HEAD +#. detached at " in wt-status.c +#. +#: ref-filter.c:1294 #, c-format -msgid "unknown %.*s format %s" +msgid "(HEAD detached at %s)" msgstr "" -#: ref-filter.c:1086 ref-filter.c:1117 +#. TRANSLATORS: make sure this matches "HEAD +#. detached from " in wt-status.c +#. +#: ref-filter.c:1301 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "" + +#: ref-filter.c:1305 +msgid "(no branch)" +msgstr "" + +#: ref-filter.c:1454 ref-filter.c:1485 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1089 ref-filter.c:1120 +#: ref-filter.c:1457 ref-filter.c:1488 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:1343 +#: ref-filter.c:1788 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:1410 +#: ref-filter.c:1855 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:1415 +#: ref-filter.c:1860 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:1670 +#: ref-filter.c:2122 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:1734 +#: ref-filter.c:2216 #, c-format msgid "malformed object name %s" msgstr "" -#: remote.c:754 +#: remote.c:750 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:758 +#: remote.c:754 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:762 +#: remote.c:758 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:770 +#: remote.c:766 msgid "Internal error" msgstr "" -#: remote.c:1685 remote.c:1787 +#: remote.c:1681 remote.c:1783 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1694 +#: remote.c:1690 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1697 +#: remote.c:1693 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1703 +#: remote.c:1699 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1718 +#: remote.c:1714 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1730 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1741 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1754 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1776 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:2081 +#: remote.c:2076 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2085 +#: remote.c:2080 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2088 +#: remote.c:2083 #, c-format -msgid "Your branch is up-to-date with '%s'.\n" +msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2092 +#: remote.c:2087 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:2098 +#: remote.c:2093 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2101 +#: remote.c:2096 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2429,11 +2726,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2109 +#: remote.c:2104 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2112 +#: remote.c:2107 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2444,141 +2741,147 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2122 +#: remote.c:2117 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2158 +#: revision.c:2256 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2161 +#: revision.c:2259 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2355 +#: revision.c:2453 msgid "--first-parent is incompatible with --bisect" msgstr "" -#: run-command.c:125 +#: run-command.c:644 msgid "open /dev/null failed" msgstr "" -#: run-command.c:127 +#: send-pack.c:151 #, c-format -msgid "dup2(%d,%d) failed" +msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:297 +#: send-pack.c:153 +#, c-format +msgid "remote unpack failed: %s" +msgstr "" + +#: send-pack.c:316 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:410 +#: send-pack.c:429 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:412 +#: send-pack.c:431 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:424 +#: send-pack.c:443 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:429 +#: send-pack.c:448 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:215 +#: sequencer.c:218 msgid "revert" msgstr "" -#: sequencer.c:217 +#: sequencer.c:220 msgid "cherry-pick" msgstr "" -#: sequencer.c:219 +#: sequencer.c:222 msgid "rebase -i" msgstr "" -#: sequencer.c:221 +#: sequencer.c:224 #, c-format msgid "Unknown action: %d" msgstr "" -#: sequencer.c:278 +#: sequencer.c:281 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:281 +#: sequencer.c:284 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:294 sequencer.c:1667 +#: sequencer.c:297 sequencer.c:1704 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686 +#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 +#: sequencer.c:2733 sequencer.c:2749 #, c-format msgid "could not write to '%s'" msgstr "" -#: sequencer.c:301 +#: sequencer.c:304 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674 +#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 #, c-format msgid "failed to finalize '%s'." msgstr "" -#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259 -#: builtin/commit.c:749 builtin/merge.c:1036 +#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1044 #, c-format msgid "could not read '%s'" msgstr "" -#: sequencer.c:355 +#: sequencer.c:358 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:359 +#: sequencer.c:362 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:388 +#: sequencer.c:391 #, c-format msgid "%s: fast-forward" msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. * "rebase -i". +#. "rebase -i". #. -#: sequencer.c:470 +#: sequencer.c:474 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:489 +#: sequencer.c:493 msgid "could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:509 +#: sequencer.c:513 msgid "unable to update cache tree\n" msgstr "" -#: sequencer.c:592 +#: sequencer.c:597 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2595,17 +2898,17 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:688 +#: sequencer.c:699 #, c-format msgid "could not parse commit %s\n" msgstr "" -#: sequencer.c:693 +#: sequencer.c:704 #, c-format msgid "could not parse parent commit %s\n" msgstr "" -#: sequencer.c:815 +#: sequencer.c:826 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -2613,7 +2916,7 @@ msgid "" "\t%.*s" msgstr "" -#: sequencer.c:821 +#: sequencer.c:832 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -2621,229 +2924,230 @@ msgid "" "\t%.*s" msgstr "" -#: sequencer.c:827 sequencer.c:852 +#: sequencer.c:838 sequencer.c:863 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:836 +#: sequencer.c:847 sequencer.c:2681 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:838 +#: sequencer.c:849 msgid "could not read HEAD" msgstr "" -#: sequencer.c:840 +#: sequencer.c:851 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:846 +#: sequencer.c:857 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:855 git-rebase--interactive.sh:445 +#: sequencer.c:866 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:863 +#: sequencer.c:874 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:870 +#: sequencer.c:881 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:875 +#: sequencer.c:886 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:880 +#: sequencer.c:891 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:946 +#: sequencer.c:957 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:964 +#: sequencer.c:975 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:972 +#: sequencer.c:983 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:976 +#: sequencer.c:987 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" -#: sequencer.c:982 +#: sequencer.c:993 #, c-format msgid "cannot get commit message for %s" msgstr "" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1001 +#: sequencer.c:1014 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1063 sequencer.c:1812 +#: sequencer.c:1077 sequencer.c:1853 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1114 +#: sequencer.c:1128 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1115 +#: sequencer.c:1129 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:1157 +#: sequencer.c:1171 msgid "empty commit set passed" msgstr "" -#: sequencer.c:1167 +#: sequencer.c:1181 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:1174 +#: sequencer.c:1188 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:1294 +#: sequencer.c:1308 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:1302 +#: sequencer.c:1316 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:1334 +#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 +#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:1341 +#: sequencer.c:1361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:1343 +#: sequencer.c:1363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:1348 +#: sequencer.c:1368 msgid "no commits parsed." msgstr "" -#: sequencer.c:1359 +#: sequencer.c:1379 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:1361 +#: sequencer.c:1381 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:1424 +#: sequencer.c:1448 #, c-format msgid "invalid key: %s" msgstr "" -#: sequencer.c:1427 +#: sequencer.c:1451 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:1484 +#: sequencer.c:1517 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:1522 +#: sequencer.c:1555 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:1523 +#: sequencer.c:1556 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:1526 +#: sequencer.c:1559 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:1540 +#: sequencer.c:1574 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:1596 sequencer.c:2150 +#: sequencer.c:1632 sequencer.c:2211 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:1598 +#: sequencer.c:1634 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:1600 sequencer.c:1634 +#: sequencer.c:1636 sequencer.c:1671 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:1620 builtin/grep.c:904 +#: sequencer.c:1657 builtin/grep.c:711 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:1622 +#: sequencer.c:1659 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:1623 +#: sequencer.c:1660 msgid "unexpected end of file" msgstr "" -#: sequencer.c:1629 +#: sequencer.c:1666 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:1640 +#: sequencer.c:1677 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:1777 sequencer.c:2049 +#: sequencer.c:1818 sequencer.c:2109 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:1817 builtin/difftool.c:574 +#: sequencer.c:1858 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:1833 +#: sequencer.c:1874 msgid "could not read index" msgstr "" -#: sequencer.c:1838 +#: sequencer.c:1879 #, c-format msgid "" "execution failed: %s\n" @@ -2853,11 +3157,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:1844 +#: sequencer.c:1885 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:1850 +#: sequencer.c:1891 #, c-format msgid "" "execution succeeded: %s\n" @@ -2868,17 +3172,17 @@ msgid "" "\n" msgstr "" -#: sequencer.c:1905 git-rebase.sh:168 +#: sequencer.c:1948 #, c-format -msgid "Applied autostash." +msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:1917 +#: sequencer.c:1960 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:1919 git-rebase.sh:172 +#: sequencer.c:1963 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -2886,89 +3190,164 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:2000 +#: sequencer.c:2045 #, c-format -msgid "stopped at %s... %.*s" +msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:2027 +#: sequencer.c:2087 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:2057 +#: sequencer.c:2117 msgid "could not read orig-head" msgstr "" -#: sequencer.c:2061 +#: sequencer.c:2122 sequencer.c:2678 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:2068 +#: sequencer.c:2129 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:2075 +#: sequencer.c:2136 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:2159 +#: sequencer.c:2220 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:2164 +#: sequencer.c:2225 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:2173 +#: sequencer.c:2234 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:2175 +#: sequencer.c:2236 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:2177 +#: sequencer.c:2238 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:2180 +#: sequencer.c:2241 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: sequencer.c:2190 +#: sequencer.c:2251 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:2270 +#: sequencer.c:2331 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:2274 +#: sequencer.c:2335 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:2307 +#: sequencer.c:2368 msgid "can't revert as initial commit" msgstr "" -#: setup.c:160 +#: sequencer.c:2471 +msgid "make_script: unhandled options" +msgstr "" + +#: sequencer.c:2474 +msgid "make_script: error preparing revisions" +msgstr "" + +#: sequencer.c:2510 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "" + +#: sequencer.c:2516 +#, c-format +msgid "unable to open '%s' for writing" +msgstr "" + +#: sequencer.c:2561 +#, c-format +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "" + +#: sequencer.c:2641 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" + +#: sequencer.c:2648 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" + +#: sequencer.c:2660 +#, c-format +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" + +#: sequencer.c:2708 +#, c-format +msgid "could not parse commit '%s'" +msgstr "" + +#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:775 +#, c-format +msgid "could not open '%s' for writing" +msgstr "" + +#: sequencer.c:2756 +#, c-format +msgid "could not truncate '%s'" +msgstr "" + +#: sequencer.c:2848 +msgid "the script was already rearranged." +msgstr "" + +#: sequencer.c:2953 +#, c-format +msgid "could not finish '%s'" +msgstr "" + +#: setup.c:171 #, c-format msgid "" "%s: no such path in the working tree.\n" "Use 'git <command> -- <path>...' to specify paths that do not exist locally." msgstr "" -#: setup.c:173 +#: setup.c:184 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -2976,7 +3355,7 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:223 +#: setup.c:252 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -2984,96 +3363,82 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:470 +#: setup.c:499 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:478 +#: setup.c:507 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:768 +#: setup.c:806 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:770 setup.c:922 builtin/index-pack.c:1643 +#: setup.c:808 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "" -#: setup.c:852 +#: setup.c:1046 msgid "Unable to read current working directory" msgstr "" -#: setup.c:927 +#: setup.c:1058 setup.c:1064 #, c-format -msgid "" -"Not a git repository (or any parent up to mount point %s)\n" -"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." +msgid "Cannot change to '%s'" msgstr "" -#: setup.c:934 +#: setup.c:1077 #, c-format -msgid "Cannot change to '%s/..'" +msgid "" +"Not a git repository (or any parent up to mount point %s)\n" +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -#: setup.c:996 +#: setup.c:1159 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: sha1_file.c:490 +#: sha1_file.c:528 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1_file.c:516 +#: sha1_file.c:554 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1_file.c:522 +#: sha1_file.c:560 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1_file.c:528 +#: sha1_file.c:566 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1_file.c:536 +#: sha1_file.c:574 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1_file.c:1176 -msgid "offset before end of packfile (broken .idx?)" -msgstr "" - -#: sha1_file.c:2637 -#, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "" - -#: sha1_file.c:2641 -#, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "" - -#: sha1_name.c:407 +#: sha1_name.c:420 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: sha1_name.c:418 +#: sha1_name.c:431 msgid "The candidates are:" msgstr "" -#: sha1_name.c:578 +#: sha1_name.c:590 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3086,61 +3451,86 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: submodule.c:65 submodule.c:99 +#: submodule.c:93 submodule.c:127 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:69 submodule.c:103 +#: submodule.c:97 submodule.c:131 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:77 +#: submodule.c:105 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:110 +#: submodule.c:138 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:121 +#: submodule.c:149 msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:159 -msgid "negative values not allowed for submodule.fetchJobs" +#: submodule.c:309 +#, c-format +msgid "in unpopulated submodule '%s'" +msgstr "" + +#: submodule.c:340 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "" + +#: submodule.c:799 +#, c-format +msgid "submodule entry '%s' (%s) is a %s, not a commit" +msgstr "" + +#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:1184 +#: submodule.c:1304 #, c-format -msgid "could not start 'git status in submodule '%s'" +msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1197 +#: submodule.c:1442 #, c-format -msgid "could not run 'git status in submodule '%s'" +msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1398 +#: submodule.c:1455 +#, c-format +msgid "could not run 'git status' in submodule '%s'" +msgstr "" + +#: submodule.c:1548 +#, c-format +msgid "submodule '%s' has dirty index" +msgstr "" + +#: submodule.c:1809 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:1410 submodule.c:1471 +#: submodule.c:1821 submodule.c:1877 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640 -#: builtin/submodule--helper.c:650 +#: submodule.c:1825 builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:681 #, c-format msgid "could not create directory '%s'" msgstr "" -#: submodule.c:1420 +#: submodule.c:1828 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3148,66 +3538,83 @@ msgid "" "'%s'\n" msgstr "" -#: submodule.c:1512 +#: submodule.c:1912 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule-config.c:360 +#: submodule.c:1956 +msgid "could not start ls-files in .." +msgstr "" + +#: submodule.c:1976 +msgid "BUG: returned path string doesn't match cwd?" +msgstr "" + +#: submodule.c:1995 +#, c-format +msgid "ls-tree returned unexpected return code %d" +msgstr "" + +#: submodule-config.c:263 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "" + +#: submodule-config.c:436 #, c-format msgid "invalid value for %s" msgstr "" -#: trailer.c:240 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "" -#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 -#: trailer.c:543 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 +#: trailer.c:557 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:525 trailer.c:530 builtin/remote.c:289 +#: trailer.c:539 trailer.c:544 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "" -#: trailer.c:702 +#: trailer.c:730 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: trailer.c:722 +#: trailer.c:750 #, c-format msgid "could not read input file '%s'" msgstr "" -#: trailer.c:725 +#: trailer.c:753 msgid "could not read from stdin" msgstr "" -#: trailer.c:949 builtin/am.c:44 +#: trailer.c:1008 builtin/am.c:46 #, c-format msgid "could not stat %s" msgstr "" -#: trailer.c:951 +#: trailer.c:1010 #, c-format msgid "file %s is not a regular file" msgstr "" -#: trailer.c:953 +#: trailer.c:1012 #, c-format msgid "file %s is not writable by user" msgstr "" -#: trailer.c:965 +#: trailer.c:1024 msgid "could not open temporary file" msgstr "" -#: trailer.c:1001 +#: trailer.c:1064 #, c-format msgid "could not rename temporary file to %s" msgstr "" @@ -3222,14 +3629,14 @@ msgstr "" msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:885 +#: transport.c:888 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:889 +#: transport.c:892 #, c-format msgid "" "\n" @@ -3245,11 +3652,11 @@ msgid "" "\n" msgstr "" -#: transport.c:897 +#: transport.c:900 msgid "Aborting." msgstr "" -#: transport-helper.c:1082 +#: transport-helper.c:1071 #, c-format msgid "Could not read ref %s" msgstr "" @@ -3266,102 +3673,102 @@ msgstr "" msgid "empty filename in tree entry" msgstr "" -#: tree-walk.c:113 +#: tree-walk.c:114 msgid "too-short tree file" msgstr "" -#: unpack-trees.c:99 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -#: unpack-trees.c:101 +#: unpack-trees.c:108 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:104 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -#: unpack-trees.c:106 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:109 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -#: unpack-trees.c:111 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:116 +#: unpack-trees.c:123 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:120 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:122 +#: unpack-trees.c:129 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:125 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:127 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:130 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:132 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:137 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3369,7 +3776,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:139 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3377,47 +3784,47 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:142 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:144 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:147 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:149 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:156 +#: unpack-trees.c:163 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:159 +#: unpack-trees.c:166 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -#: unpack-trees.c:161 +#: unpack-trees.c:168 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3425,7 +3832,7 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:163 +#: unpack-trees.c:170 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3433,442 +3840,454 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:240 +#: unpack-trees.c:172 +#, c-format +msgid "" +"Cannot update submodule:\n" +"%s" +msgstr "" + +#: unpack-trees.c:249 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:270 +#: unpack-trees.c:331 msgid "Checking out files" msgstr "" -#: urlmatch.c:120 +#: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "" -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 #, c-format msgid "invalid %XX escape sequence" msgstr "" -#: urlmatch.c:172 +#: urlmatch.c:215 msgid "missing host and scheme is not 'file:'" msgstr "" -#: urlmatch.c:189 +#: urlmatch.c:232 msgid "a 'file:' URL may not have a port number" msgstr "" -#: urlmatch.c:199 +#: urlmatch.c:247 msgid "invalid characters in host name" msgstr "" -#: urlmatch.c:244 urlmatch.c:255 +#: urlmatch.c:292 urlmatch.c:303 msgid "invalid port number" msgstr "" -#: urlmatch.c:322 +#: urlmatch.c:371 msgid "invalid '..' path segment" msgstr "" -#: worktree.c:282 +#: worktree.c:245 #, c-format msgid "failed to read '%s'" msgstr "" -#: wrapper.c:222 wrapper.c:392 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 -#, c-format -msgid "could not open '%s' for writing" -msgstr "" - -#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033 -#: builtin/pull.c:341 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 +#: builtin/am.c:858 builtin/merge.c:1041 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: wrapper.c:605 wrapper.c:626 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:634 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "" -#: wrapper.c:658 +#: wrapper.c:656 #, c-format msgid "could not write to %s" msgstr "" -#: wrapper.c:660 +#: wrapper.c:658 #, c-format msgid "could not close %s" msgstr "" -#: wt-status.c:151 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -#: wt-status.c:180 wt-status.c:207 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" -#: wt-status.c:184 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:186 wt-status.c:190 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:188 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:199 wt-status.c:945 +#: wt-status.c:198 wt-status.c:979 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:217 wt-status.c:954 +#: wt-status.c:216 wt-status.c:988 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:221 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:223 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:224 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:226 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:238 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:253 +#: wt-status.c:252 msgid "both deleted:" msgstr "" -#: wt-status.c:255 +#: wt-status.c:254 msgid "added by us:" msgstr "" -#: wt-status.c:257 +#: wt-status.c:256 msgid "deleted by them:" msgstr "" -#: wt-status.c:259 +#: wt-status.c:258 msgid "added by them:" msgstr "" -#: wt-status.c:261 +#: wt-status.c:260 msgid "deleted by us:" msgstr "" -#: wt-status.c:263 +#: wt-status.c:262 msgid "both added:" msgstr "" -#: wt-status.c:265 +#: wt-status.c:264 msgid "both modified:" msgstr "" -#: wt-status.c:275 +#: wt-status.c:274 msgid "new file:" msgstr "" -#: wt-status.c:277 +#: wt-status.c:276 msgid "copied:" msgstr "" -#: wt-status.c:279 +#: wt-status.c:278 msgid "deleted:" msgstr "" -#: wt-status.c:281 +#: wt-status.c:280 msgid "modified:" msgstr "" -#: wt-status.c:283 +#: wt-status.c:282 msgid "renamed:" msgstr "" -#: wt-status.c:285 +#: wt-status.c:284 msgid "typechange:" msgstr "" -#: wt-status.c:287 +#: wt-status.c:286 msgid "unknown:" msgstr "" -#: wt-status.c:289 +#: wt-status.c:288 msgid "unmerged:" msgstr "" -#: wt-status.c:371 +#: wt-status.c:370 msgid "new commits, " msgstr "" -#: wt-status.c:373 +#: wt-status.c:372 msgid "modified content, " msgstr "" -#: wt-status.c:375 +#: wt-status.c:374 msgid "untracked content, " msgstr "" -#: wt-status.c:818 +#: wt-status.c:819 +#, c-format +msgid "Your stash currently has %d entry" +msgid_plural "Your stash currently has %d entries" +msgstr[0] "" +msgstr[1] "" + +#: wt-status.c:851 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:820 +#: wt-status.c:853 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:901 +#: wt-status.c:935 msgid "" -"Do not touch the line above.\n" -"Everything below will be removed." +"Do not modify or remove the line above.\n" +"Everything below it will be ignored." msgstr "" -#: wt-status.c:1013 +#: wt-status.c:1048 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1016 +#: wt-status.c:1051 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1018 +#: wt-status.c:1053 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1023 +#: wt-status.c:1058 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1026 +#: wt-status.c:1061 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1036 +#: wt-status.c:1071 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1039 +#: wt-status.c:1074 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1043 +#: wt-status.c:1078 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1045 +#: wt-status.c:1080 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1047 +#: wt-status.c:1082 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1176 +#: wt-status.c:1214 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1178 +#: wt-status.c:1216 msgid "No commands done." msgstr "" -#: wt-status.c:1181 +#: wt-status.c:1219 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1192 +#: wt-status.c:1230 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1197 +#: wt-status.c:1235 msgid "No commands remaining." msgstr "" -#: wt-status.c:1200 +#: wt-status.c:1238 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1208 +#: wt-status.c:1246 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1221 +#: wt-status.c:1259 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1226 +#: wt-status.c:1264 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1240 +#: wt-status.c:1278 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1242 +#: wt-status.c:1280 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1244 +#: wt-status.c:1282 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1250 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1254 +#: wt-status.c:1292 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1259 +#: wt-status.c:1297 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1262 +#: wt-status.c:1300 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1266 +#: wt-status.c:1304 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1271 +#: wt-status.c:1309 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1274 +#: wt-status.c:1312 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1276 +#: wt-status.c:1314 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1286 +#: wt-status.c:1324 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1291 +#: wt-status.c:1329 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1294 +#: wt-status.c:1332 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1296 +#: wt-status.c:1334 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1305 +#: wt-status.c:1343 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1310 +#: wt-status.c:1348 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1313 +#: wt-status.c:1351 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1315 +#: wt-status.c:1353 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1326 +#: wt-status.c:1364 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1330 +#: wt-status.c:1368 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1333 +#: wt-status.c:1371 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1530 +#: wt-status.c:1568 msgid "On branch " msgstr "" -#: wt-status.c:1536 +#: wt-status.c:1574 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1538 +#: wt-status.c:1576 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1543 +#: wt-status.c:1581 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1545 +#: wt-status.c:1583 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1548 +#: wt-status.c:1586 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1566 +#: wt-status.c:1606 msgid "Initial commit" msgstr "" -#: wt-status.c:1580 +#: wt-status.c:1607 +msgid "No commits yet" +msgstr "" + +#: wt-status.c:1621 msgid "Untracked files" msgstr "" -#: wt-status.c:1582 +#: wt-status.c:1623 msgid "Ignored files" msgstr "" -#: wt-status.c:1586 +#: wt-status.c:1627 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -3876,252 +4295,275 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1592 +#: wt-status.c:1633 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1594 +#: wt-status.c:1635 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1600 +#: wt-status.c:1641 msgid "No changes" msgstr "" -#: wt-status.c:1605 +#: wt-status.c:1646 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1608 +#: wt-status.c:1649 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1611 +#: wt-status.c:1652 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1614 +#: wt-status.c:1655 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1617 +#: wt-status.c:1658 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1620 wt-status.c:1625 +#: wt-status.c:1661 wt-status.c:1666 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1623 +#: wt-status.c:1664 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1627 +#: wt-status.c:1668 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1734 -msgid "Initial commit on " +#: wt-status.c:1780 +msgid "No commits yet on " msgstr "" -#: wt-status.c:1738 +#: wt-status.c:1784 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1767 -msgid "gone" -msgstr "" - -#: wt-status.c:1769 wt-status.c:1777 +#: wt-status.c:1813 wt-status.c:1821 msgid "behind " msgstr "" -#: wt-status.c:1772 wt-status.c:1775 +#: wt-status.c:1816 wt-status.c:1819 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2277 +#: wt-status.c:2311 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2283 +#: wt-status.c:2317 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2285 +#: wt-status.c:2319 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/precompose_utf8.c:57 builtin/clone.c:414 +#: compat/precompose_utf8.c:58 builtin/clone.c:437 #, c-format msgid "failed to unlink '%s'" msgstr "" -#: builtin/add.c:22 +#: builtin/add.c:24 msgid "git add [<options>] [--] <pathspec>..." msgstr "" -#: builtin/add.c:80 +#: builtin/add.c:82 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:85 builtin/commit.c:291 +#: builtin/add.c:87 builtin/commit.c:291 msgid "updating files failed" msgstr "" -#: builtin/add.c:95 +#: builtin/add.c:97 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:149 +#: builtin/add.c:153 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:209 builtin/rev-parse.c:845 +#: builtin/add.c:213 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "" -#: builtin/add.c:220 +#: builtin/add.c:224 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:224 +#: builtin/add.c:228 msgid "Could not write patch" msgstr "" -#: builtin/add.c:227 +#: builtin/add.c:231 msgid "editing patch failed" msgstr "" -#: builtin/add.c:230 +#: builtin/add.c:234 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:232 +#: builtin/add.c:236 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:237 +#: builtin/add.c:241 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:247 +#: builtin/add.c:251 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 -#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162 +#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "" -#: builtin/add.c:269 +#: builtin/add.c:274 msgid "interactive picking" msgstr "" -#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286 +#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:271 +#: builtin/add.c:276 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:272 +#: builtin/add.c:277 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:273 +#: builtin/add.c:278 msgid "update tracked files" msgstr "" -#: builtin/add.c:274 +#: builtin/add.c:279 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:275 +#: builtin/add.c:280 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:278 +#: builtin/add.c:283 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:280 +#: builtin/add.c:285 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:281 +#: builtin/add.c:286 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:282 +#: builtin/add.c:287 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:283 builtin/update-index.c:947 +#: builtin/add.c:288 builtin/update-index.c:954 msgid "(+/-)x" msgstr "" -#: builtin/add.c:283 builtin/update-index.c:948 +#: builtin/add.c:288 builtin/update-index.c:955 msgid "override the executable bit of the listed files" msgstr "" +#: builtin/add.c:290 +msgid "warn when adding an embedded repository" +msgstr "" + #: builtin/add.c:305 #, c-format +msgid "" +"You've added another git repository inside your current repository.\n" +"Clones of the outer repository will not contain the contents of\n" +"the embedded repository and will not know how to obtain it.\n" +"If you meant to add a submodule, use:\n" +"\n" +"\tgit submodule add <url> %s\n" +"\n" +"If you added this path by mistake, you can remove it from the\n" +"index with:\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"See \"git help submodule\" for more information." +msgstr "" + +#: builtin/add.c:333 +#, c-format +msgid "adding embedded git repository: %s" +msgstr "" + +#: builtin/add.c:351 +#, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:312 +#: builtin/add.c:359 msgid "adding files failed" msgstr "" -#: builtin/add.c:348 +#: builtin/add.c:396 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:355 +#: builtin/add.c:403 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:359 +#: builtin/add.c:407 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:374 +#: builtin/add.c:422 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:375 +#: builtin/add.c:423 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 -#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 -#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 -#: builtin/submodule--helper.c:244 +#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 +#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 +#: builtin/submodule--helper.c:243 msgid "index file corrupt" msgstr "" @@ -4129,137 +4571,137 @@ msgstr "" msgid "could not parse author script" msgstr "" -#: builtin/am.c:491 +#: builtin/am.c:498 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:532 +#: builtin/am.c:539 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:569 +#: builtin/am.c:576 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:595 +#: builtin/am.c:602 msgid "fseek failed" msgstr "" -#: builtin/am.c:775 +#: builtin/am.c:786 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:840 +#: builtin/am.c:851 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:887 +#: builtin/am.c:899 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:890 builtin/am.c:898 +#: builtin/am.c:904 builtin/am.c:916 msgid "invalid Date line" msgstr "" -#: builtin/am.c:895 +#: builtin/am.c:911 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:984 +#: builtin/am.c:1004 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:989 builtin/clone.c:379 +#: builtin/am.c:1009 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:993 +#: builtin/am.c:1013 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1125 builtin/commit.c:376 +#: builtin/am.c:1142 builtin/commit.c:376 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1176 +#: builtin/am.c:1193 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1177 +#: builtin/am.c:1194 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1178 +#: builtin/am.c:1195 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1316 -msgid "Patch is empty. Was it split wrong?" +#: builtin/am.c:1302 +msgid "Patch is empty." msgstr "" -#: builtin/am.c:1390 builtin/log.c:1550 +#: builtin/am.c:1368 #, c-format -msgid "invalid ident line: %s" +msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1417 +#: builtin/am.c:1390 #, c-format msgid "unable to parse commit %s" msgstr "" -#: builtin/am.c:1610 +#: builtin/am.c:1584 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1612 +#: builtin/am.c:1586 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1631 +#: builtin/am.c:1605 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1637 +#: builtin/am.c:1611 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1662 +#: builtin/am.c:1636 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1686 builtin/merge.c:632 +#: builtin/am.c:1660 builtin/merge.c:641 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/am.c:1693 +#: builtin/am.c:1667 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 -#: builtin/merge.c:827 +#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 +#: builtin/merge.c:849 msgid "failed to write commit object" msgstr "" -#: builtin/am.c:1739 builtin/am.c:1743 +#: builtin/am.c:1713 builtin/am.c:1717 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1759 +#: builtin/am.c:1733 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: builtin/am.c:1764 +#: builtin/am.c:1738 msgid "Commit Body is:" msgstr "" @@ -4267,212 +4709,214 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1774 +#: builtin/am.c:1748 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1824 +#: builtin/am.c:1798 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1861 builtin/am.c:1933 +#: builtin/am.c:1838 builtin/am.c:1910 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1877 +#: builtin/am.c:1854 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1885 +#: builtin/am.c:1862 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1891 +#: builtin/am.c:1868 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "" -#: builtin/am.c:1936 +#: builtin/am.c:1913 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: builtin/am.c:1943 +#: builtin/am.c:1920 msgid "" "You still have unmerged paths in your index.\n" -"Did you forget to use 'git add'?" +"You should 'git add' each file with resolved conflicts to mark them as " +"such.\n" +"You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 -#: builtin/reset.c:316 +#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:2103 +#: builtin/am.c:2081 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2137 +#: builtin/am.c:2116 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2200 +#: builtin/am.c:2179 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2233 +#: builtin/am.c:2212 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2234 +#: builtin/am.c:2213 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2240 +#: builtin/am.c:2219 msgid "run interactively" msgstr "" -#: builtin/am.c:2242 +#: builtin/am.c:2221 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2244 +#: builtin/am.c:2223 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 -#: builtin/repack.c:178 +#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/repack.c:180 msgid "be quiet" msgstr "" -#: builtin/am.c:2247 +#: builtin/am.c:2226 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2250 +#: builtin/am.c:2229 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2252 +#: builtin/am.c:2231 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2254 +#: builtin/am.c:2233 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2256 +#: builtin/am.c:2235 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2258 +#: builtin/am.c:2237 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2261 +#: builtin/am.c:2240 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2264 +#: builtin/am.c:2243 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 -#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 -#: builtin/am.c:2293 +#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 +#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 +#: builtin/am.c:2272 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135 -#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 -#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355 +#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 +#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "" -#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:387 builtin/verify-tag.c:38 +#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "" -#: builtin/am.c:2290 +#: builtin/am.c:2269 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2296 +#: builtin/am.c:2275 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2298 +#: builtin/am.c:2277 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2301 +#: builtin/am.c:2280 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2304 +#: builtin/am.c:2283 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2307 +#: builtin/am.c:2286 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2311 +#: builtin/am.c:2290 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2313 +#: builtin/am.c:2292 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370 +#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "" -#: builtin/am.c:2316 +#: builtin/am.c:2295 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2319 +#: builtin/am.c:2298 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2334 +#: builtin/am.c:2316 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: builtin/am.c:2341 +#: builtin/am.c:2323 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2356 +#: builtin/am.c:2338 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2380 +#: builtin/am.c:2362 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2386 +#: builtin/am.c:2368 msgid "Resolve operation not in progress, we are not resuming." msgstr "" @@ -4502,11 +4946,6 @@ msgstr "" msgid "git archive: NACK %s" msgstr "" -#: builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "" - #: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "" @@ -4527,369 +4966,301 @@ msgstr "" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/blame.c:33 +#: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "" -#: builtin/blame.c:38 +#: builtin/blame.c:32 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:1786 -msgid "Blaming lines" -msgstr "" - -#: builtin/blame.c:2582 +#: builtin/blame.c:668 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2583 +#: builtin/blame.c:669 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2584 +#: builtin/blame.c:670 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2585 +#: builtin/blame.c:671 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2586 +#: builtin/blame.c:672 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:2587 +#: builtin/blame.c:673 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2588 +#: builtin/blame.c:674 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2589 +#: builtin/blame.c:675 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2590 +#: builtin/blame.c:676 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2591 +#: builtin/blame.c:677 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2592 +#: builtin/blame.c:678 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2593 +#: builtin/blame.c:679 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2594 +#: builtin/blame.c:680 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2595 +#: builtin/blame.c:681 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2596 +#: builtin/blame.c:682 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2597 +#: builtin/blame.c:683 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2604 +#: builtin/blame.c:690 msgid "Use an experimental heuristic to improve diffs" msgstr "" -#: builtin/blame.c:2606 +#: builtin/blame.c:692 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2607 +#: builtin/blame.c:693 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2608 +#: builtin/blame.c:694 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2609 builtin/blame.c:2610 +#: builtin/blame.c:695 builtin/blame.c:696 msgid "score" msgstr "" -#: builtin/blame.c:2609 +#: builtin/blame.c:695 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2610 +#: builtin/blame.c:696 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2611 +#: builtin/blame.c:697 msgid "n,m" msgstr "" -#: builtin/blame.c:2611 +#: builtin/blame.c:697 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/blame.c:2658 +#: builtin/blame.c:744 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" -#. TRANSLATORS: This string is used to tell us the maximum -#. display width for a relative timestamp in "git blame" -#. output. For C locale, "4 years, 11 months ago", which -#. takes 22 places, is the longest among various forms of -#. relative timestamps, but your language may need more or -#. fewer display columns. -#: builtin/blame.c:2706 +#. TRANSLATORS: This string is used to tell us the +#. maximum display width for a relative timestamp in +#. "git blame" output. For C locale, "4 years, 11 +#. months ago", which takes 22 places, is the longest +#. among various forms of relative timestamps, but +#. your language may need more or fewer display +#. columns. +#. +#: builtin/blame.c:795 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:2786 -msgid "--contents and --reverse do not blend well." -msgstr "" - -#: builtin/blame.c:2806 -msgid "cannot use --contents with final commit object name" -msgstr "" - -#: builtin/blame.c:2811 -msgid "--reverse and --first-parent together require specified latest commit" -msgstr "" - -#: builtin/blame.c:2838 -msgid "" -"--reverse --first-parent together require range along first-parent chain" -msgstr "" - -#: builtin/blame.c:2849 -#, c-format -msgid "no such path %s in %s" -msgstr "" - -#: builtin/blame.c:2860 -#, c-format -msgid "cannot read blob %s for path %s" -msgstr "" - -#: builtin/blame.c:2879 +#: builtin/blame.c:882 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "" msgstr[1] "" -#: builtin/branch.c:26 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +#: builtin/blame.c:928 +msgid "Blaming lines" msgstr "" #: builtin/branch.c:27 -msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "" #: builtin/branch.c:28 -msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "" #: builtin/branch.c:29 -msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "" #: builtin/branch.c:30 +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "" + +#: builtin/branch.c:31 +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" +msgstr "" + +#: builtin/branch.c:32 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "" -#: builtin/branch.c:143 +#: builtin/branch.c:33 +msgid "git branch [<options>] [-r | -a] [--format]" +msgstr "" + +#: builtin/branch.c:146 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:147 +#: builtin/branch.c:150 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -#: builtin/branch.c:161 +#: builtin/branch.c:164 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:165 +#: builtin/branch.c:168 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -#: builtin/branch.c:178 +#: builtin/branch.c:181 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:206 +#: builtin/branch.c:212 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:212 +#: builtin/branch.c:218 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:226 +#: builtin/branch.c:232 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "" -#: builtin/branch.c:241 +#: builtin/branch.c:247 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "" -#: builtin/branch.c:242 +#: builtin/branch.c:248 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:257 +#: builtin/branch.c:263 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "" -#: builtin/branch.c:258 +#: builtin/branch.c:264 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:265 +#: builtin/branch.c:271 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:266 +#: builtin/branch.c:272 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:312 -#, c-format -msgid "[%s: gone]" -msgstr "" - -#: builtin/branch.c:317 -#, c-format -msgid "[%s]" +#: builtin/branch.c:417 builtin/tag.c:58 +msgid "unable to parse format string" msgstr "" -#: builtin/branch.c:322 +#: builtin/branch.c:450 #, c-format -msgid "[%s: behind %d]" -msgstr "" - -#: builtin/branch.c:324 -#, c-format -msgid "[behind %d]" -msgstr "" - -#: builtin/branch.c:328 -#, c-format -msgid "[%s: ahead %d]" -msgstr "" - -#: builtin/branch.c:330 -#, c-format -msgid "[ahead %d]" -msgstr "" - -#: builtin/branch.c:333 -#, c-format -msgid "[%s: ahead %d, behind %d]" -msgstr "" - -#: builtin/branch.c:336 -#, c-format -msgid "[ahead %d, behind %d]" -msgstr "" - -#: builtin/branch.c:349 -msgid " **** invalid ref ****" -msgstr "" - -#: builtin/branch.c:375 -#, c-format -msgid "(no branch, rebasing %s)" -msgstr "" - -#: builtin/branch.c:378 -#, c-format -msgid "(no branch, bisect started on %s)" +msgid "Branch %s is being rebased at %s" msgstr "" -#. TRANSLATORS: make sure this matches -#. "HEAD detached at " in wt-status.c -#: builtin/branch.c:384 +#: builtin/branch.c:454 #, c-format -msgid "(HEAD detached at %s)" +msgid "Branch %s is being bisected at %s" msgstr "" -#. TRANSLATORS: make sure this matches -#. "HEAD detached from " in wt-status.c -#: builtin/branch.c:389 -#, c-format -msgid "(HEAD detached from %s)" +#: builtin/branch.c:470 +msgid "cannot copy the current branch while not on any." msgstr "" -#: builtin/branch.c:393 -msgid "(no branch)" +#: builtin/branch.c:472 +msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:535 +#: builtin/branch.c:483 #, c-format -msgid "Branch %s is being rebased at %s" +msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:539 -#, c-format -msgid "Branch %s is being bisected at %s" +#: builtin/branch.c:504 +msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:554 -msgid "cannot rename the current branch while not on any." +#: builtin/branch.c:506 +msgid "Branch copy failed" msgstr "" -#: builtin/branch.c:564 +#: builtin/branch.c:510 #, c-format -msgid "Invalid branch name: '%s'" -msgstr "" - -#: builtin/branch.c:581 -msgid "Branch rename failed" +msgid "Copied a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:585 +#: builtin/branch.c:513 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:588 +#: builtin/branch.c:519 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:595 +#: builtin/branch.c:528 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:611 +#: builtin/branch.c:530 +msgid "Branch is copied, but update of config-file failed" +msgstr "" + +#: builtin/branch.c:546 #, c-format msgid "" "Please edit the description for the branch\n" @@ -4897,538 +5268,546 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "" -#: builtin/branch.c:643 +#: builtin/branch.c:579 msgid "Generic options" msgstr "" -#: builtin/branch.c:645 +#: builtin/branch.c:581 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:646 +#: builtin/branch.c:582 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:647 +#: builtin/branch.c:583 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:649 -msgid "change upstream info" +#: builtin/branch.c:585 +msgid "do not use" msgstr "" -#: builtin/branch.c:651 +#: builtin/branch.c:587 msgid "upstream" msgstr "" -#: builtin/branch.c:651 +#: builtin/branch.c:587 msgid "change the upstream info" msgstr "" -#: builtin/branch.c:652 +#: builtin/branch.c:588 msgid "Unset the upstream info" msgstr "" -#: builtin/branch.c:653 +#: builtin/branch.c:589 msgid "use colored output" msgstr "" -#: builtin/branch.c:654 +#: builtin/branch.c:590 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:656 builtin/branch.c:657 +#: builtin/branch.c:592 builtin/branch.c:594 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:660 +#: builtin/branch.c:593 builtin/branch.c:595 +msgid "print only branches that don't contain the commit" +msgstr "" + +#: builtin/branch.c:598 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:661 +#: builtin/branch.c:599 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:663 +#: builtin/branch.c:601 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:664 +#: builtin/branch.c:602 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:665 +#: builtin/branch.c:603 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:666 +#: builtin/branch.c:604 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:667 +#: builtin/branch.c:605 +msgid "copy a branch and its reflog" +msgstr "" + +#: builtin/branch.c:606 +msgid "copy a branch, even if target exists" +msgstr "" + +#: builtin/branch.c:607 msgid "list branch names" msgstr "" -#: builtin/branch.c:668 +#: builtin/branch.c:608 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:670 +#: builtin/branch.c:610 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:671 +#: builtin/branch.c:611 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:672 +#: builtin/branch.c:612 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:673 +#: builtin/branch.c:613 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:674 +#: builtin/branch.c:614 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381 +#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "" -#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382 +#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "" -#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404 -#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:384 +#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 +#: builtin/tag.c:408 msgid "object" msgstr "" -#: builtin/branch.c:679 +#: builtin/branch.c:619 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388 +#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:698 -msgid "Failed to resolve HEAD as a valid ref." +#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 +#: builtin/verify-tag.c:39 +msgid "format to use for the output" msgstr "" -#: builtin/branch.c:702 builtin/clone.c:706 +#: builtin/branch.c:645 builtin/clone.c:729 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:724 +#: builtin/branch.c:668 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:735 builtin/branch.c:787 +#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 msgid "branch name required" msgstr "" -#: builtin/branch.c:763 +#: builtin/branch.c:708 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:768 +#: builtin/branch.c:713 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:775 +#: builtin/branch.c:720 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:778 +#: builtin/branch.c:723 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:793 -msgid "too many branches for a rename operation" +#: builtin/branch.c:738 +msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:798 -msgid "too many branches to set new upstream" +#: builtin/branch.c:747 +msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:802 +#: builtin/branch.c:752 +msgid "too many arguments to set new upstream" +msgstr "" + +#: builtin/branch.c:756 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848 +#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:809 +#: builtin/branch.c:763 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:821 -msgid "too many branches to unset upstream" +#: builtin/branch.c:775 +msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:825 +#: builtin/branch.c:779 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:831 +#: builtin/branch.c:785 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:845 +#: builtin/branch.c:797 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:851 +#: builtin/branch.c:803 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:854 -#, c-format +#: builtin/branch.c:806 msgid "" -"The --set-upstream flag is deprecated and will be removed. Consider using --" -"track or --set-upstream-to\n" +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." msgstr "" -#: builtin/branch.c:871 -#, c-format -msgid "" -"\n" -"If you wanted to make '%s' track '%s', do this:\n" -"\n" -msgstr "" - -#: builtin/bundle.c:51 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "" -#: builtin/bundle.c:64 +#: builtin/bundle.c:58 msgid "Need a repository to create a bundle." msgstr "" -#: builtin/bundle.c:68 +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:513 +#: builtin/cat-file.c:521 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "" -#: builtin/cat-file.c:514 +#: builtin/cat-file.c:522 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" msgstr "" -#: builtin/cat-file.c:551 +#: builtin/cat-file.c:559 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:552 +#: builtin/cat-file.c:560 msgid "show object type" msgstr "" -#: builtin/cat-file.c:553 +#: builtin/cat-file.c:561 msgid "show object size" msgstr "" -#: builtin/cat-file.c:555 +#: builtin/cat-file.c:563 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:556 +#: builtin/cat-file.c:564 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:566 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:560 +#: builtin/cat-file.c:568 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:561 git-submodule.sh:929 +#: builtin/cat-file.c:569 git-submodule.sh:943 msgid "blob" msgstr "" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:570 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:572 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:573 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:567 +#: builtin/cat-file.c:575 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:578 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:581 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:583 msgid "show all objects with --batch or --batch-check" msgstr "" -#: builtin/check-attr.c:11 +#: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "" -#: builtin/check-attr.c:12 +#: builtin/check-attr.c:13 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "" -#: builtin/check-attr.c:19 +#: builtin/check-attr.c:20 msgid "report all attributes set on file" msgstr "" -#: builtin/check-attr.c:20 +#: builtin/check-attr.c:21 msgid "use .gitattributes only from the index" msgstr "" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99 msgid "read file names from stdin" msgstr "" -#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +#: builtin/check-attr.c:24 builtin/check-ignore.c:26 msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332 +#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "" -#: builtin/check-ignore.c:26 +#: builtin/check-ignore.c:28 msgid "show non-matching input paths" msgstr "" -#: builtin/check-ignore.c:28 +#: builtin/check-ignore.c:30 msgid "ignore index when checking" msgstr "" -#: builtin/check-ignore.c:154 +#: builtin/check-ignore.c:158 msgid "cannot specify pathnames with --stdin" msgstr "" -#: builtin/check-ignore.c:157 +#: builtin/check-ignore.c:161 msgid "-z only makes sense with --stdin" msgstr "" -#: builtin/check-ignore.c:159 +#: builtin/check-ignore.c:163 msgid "no path specified" msgstr "" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:167 msgid "--quiet is only valid with a single pathname" msgstr "" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:169 msgid "cannot have both --quiet and --verbose" msgstr "" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:172 msgid "--non-matching is only valid with --verbose" msgstr "" -#: builtin/check-mailmap.c:8 +#: builtin/check-mailmap.c:9 msgid "git check-mailmap [<options>] <contact>..." msgstr "" -#: builtin/check-mailmap.c:13 +#: builtin/check-mailmap.c:14 msgid "also read contacts from stdin" msgstr "" -#: builtin/check-mailmap.c:24 +#: builtin/check-mailmap.c:25 #, c-format msgid "unable to parse contact: %s" msgstr "" -#: builtin/check-mailmap.c:47 +#: builtin/check-mailmap.c:48 msgid "no contacts specified" msgstr "" -#: builtin/checkout-index.c:127 +#: builtin/checkout-index.c:128 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/checkout-index.c:144 +#: builtin/checkout-index.c:145 msgid "stage should be between 1 and 3 or all" msgstr "" -#: builtin/checkout-index.c:160 +#: builtin/checkout-index.c:161 msgid "check out all files in the index" msgstr "" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:162 msgid "force overwrite of existing files" msgstr "" -#: builtin/checkout-index.c:163 +#: builtin/checkout-index.c:164 msgid "no warning for existing files and files not in index" msgstr "" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:166 msgid "don't checkout new files" msgstr "" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:168 msgid "update stat information in the index file" msgstr "" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:172 msgid "read list of paths from the standard input" msgstr "" -#: builtin/checkout-index.c:173 +#: builtin/checkout-index.c:174 msgid "write the content to temporary files" msgstr "" -#: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600 -#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967 -#: builtin/worktree.c:471 +#: builtin/checkout-index.c:175 builtin/column.c:31 +#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 +#: builtin/worktree.c:498 msgid "string" msgstr "" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:176 msgid "when creating files, prepend <string>" msgstr "" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:178 msgid "copy out the files from named stage" msgstr "" -#: builtin/checkout.c:25 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "" -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:135 builtin/checkout.c:168 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:136 builtin/checkout.c:169 +#: builtin/checkout.c:137 builtin/checkout.c:170 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:152 +#: builtin/checkout.c:153 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:196 +#: builtin/checkout.c:197 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:213 +#: builtin/checkout.c:214 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:230 +#: builtin/checkout.c:231 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 -#: builtin/checkout.c:259 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 +#: builtin/checkout.c:262 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:262 builtin/checkout.c:265 +#: builtin/checkout.c:265 builtin/checkout.c:268 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:268 +#: builtin/checkout.c:271 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:339 builtin/checkout.c:346 +#: builtin/checkout.c:342 builtin/checkout.c:349 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:494 +#: builtin/checkout.c:501 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:625 +#: builtin/checkout.c:632 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:666 +#: builtin/checkout.c:673 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:670 builtin/clone.c:660 +#: builtin/checkout.c:677 builtin/clone.c:683 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:674 +#: builtin/checkout.c:681 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:677 +#: builtin/checkout.c:684 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:681 +#: builtin/checkout.c:688 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:683 builtin/checkout.c:1072 +#: builtin/checkout.c:690 builtin/checkout.c:1086 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:685 +#: builtin/checkout.c:692 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:736 +#: builtin/checkout.c:743 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:742 +#: builtin/checkout.c:749 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5443,7 +5822,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:761 +#: builtin/checkout.c:768 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5460,198 +5839,196 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:797 +#: builtin/checkout.c:809 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:801 +#: builtin/checkout.c:813 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:828 builtin/checkout.c:1067 +#: builtin/checkout.c:843 builtin/checkout.c:1081 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:973 +#: builtin/checkout.c:987 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1013 builtin/worktree.c:214 +#: builtin/checkout.c:1027 builtin/worktree.c:233 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1042 +#: builtin/checkout.c:1056 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1095 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1084 builtin/checkout.c:1088 +#: builtin/checkout.c:1098 builtin/checkout.c:1102 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100 -#: builtin/checkout.c:1103 +#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 +#: builtin/checkout.c:1117 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1122 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 -#: builtin/worktree.c:326 +#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 +#: builtin/worktree.c:348 msgid "branch" msgstr "" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1155 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1157 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1158 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1146 builtin/worktree.c:328 +#: builtin/checkout.c:1159 builtin/worktree.c:350 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1160 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1162 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1162 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1163 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1165 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1167 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1168 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1156 builtin/merge.c:235 +#: builtin/checkout.c:1169 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251 +#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 msgid "style" msgstr "" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1171 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1174 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1176 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1178 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119 -#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539 -#: builtin/send-pack.c:168 +#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 +#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1212 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1214 +#: builtin/checkout.c:1229 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1219 +#: builtin/checkout.c:1234 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1255 +#: builtin/checkout.c:1270 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1262 +#: builtin/checkout.c:1277 #, 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?" +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1281 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1271 +#: builtin/checkout.c:1285 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/clean.c:25 +#: builtin/clean.c:26 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" -#: builtin/clean.c:29 +#: builtin/clean.c:30 #, c-format msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:291 git-add--interactive.perl:623 +#: builtin/clean.c:301 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -5660,7 +6037,7 @@ msgid "" " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:295 git-add--interactive.perl:632 +#: builtin/clean.c:305 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -5673,38 +6050,38 @@ msgid "" " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:511 git-add--interactive.perl:598 -#: git-add--interactive.perl:603 +#: builtin/clean.c:521 git-add--interactive.perl:547 +#: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:653 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:690 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:711 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:752 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:777 git-add--interactive.perl:1669 +#: builtin/clean.c:787 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "" -#: builtin/clean.c:785 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -5715,422 +6092,430 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:812 git-add--interactive.perl:1745 +#: builtin/clean.c:822 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:813 git-add--interactive.perl:1742 +#: builtin/clean.c:823 git-add--interactive.perl:1689 msgid "What now" msgstr "" -#: builtin/clean.c:821 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:838 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:869 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:871 +#: builtin/clean.c:911 msgid "force" msgstr "" -#: builtin/clean.c:872 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:874 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056 -#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176 +#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 +#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 +#: builtin/name-rev.c:399 builtin/show-ref.c:176 msgid "pattern" msgstr "" -#: builtin/clean.c:876 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:877 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:879 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:897 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:901 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:904 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" -#: builtin/clone.c:37 +#: builtin/clone.c:39 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:65 +#: builtin/clone.c:83 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478 +#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:70 +#: builtin/clone.c:88 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:72 +#: builtin/clone.c:90 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:74 +#: builtin/clone.c:92 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:76 +#: builtin/clone.c:94 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:78 builtin/clone.c:80 +#: builtin/clone.c:96 builtin/clone.c:100 +msgid "pathspec" +msgstr "" + +#: builtin/clone.c:96 builtin/clone.c:100 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:82 +#: builtin/clone.c:103 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:83 builtin/init-db.c:475 +#: builtin/clone.c:104 builtin/init-db.c:476 msgid "template-directory" msgstr "" -#: builtin/clone.c:84 builtin/init-db.c:476 +#: builtin/clone.c:105 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604 -#: builtin/submodule--helper.c:970 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 +#: builtin/submodule--helper.c:1002 msgid "reference repository" msgstr "" -#: builtin/clone.c:90 +#: builtin/clone.c:111 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "" -#: builtin/clone.c:92 +#: builtin/clone.c:113 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:94 +#: builtin/clone.c:115 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:96 +#: builtin/clone.c:117 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 -#: builtin/pull.c:202 +#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 +#: builtin/pull.c:205 msgid "depth" msgstr "" -#: builtin/clone.c:98 +#: builtin/clone.c:119 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836 +#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 #: parse-options.h:142 msgid "time" msgstr "" -#: builtin/clone.c:100 +#: builtin/clone.c:121 msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:101 builtin/fetch.c:124 +#: builtin/clone.c:122 builtin/fetch.c:141 msgid "revision" msgstr "" -#: builtin/clone.c:102 builtin/fetch.c:125 +#: builtin/clone.c:123 builtin/fetch.c:142 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:104 +#: builtin/clone.c:125 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:106 +#: builtin/clone.c:127 +msgid "don't clone any tags, and make later fetches not to follow them" +msgstr "" + +#: builtin/clone.c:129 msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:107 builtin/init-db.c:484 +#: builtin/clone.c:130 builtin/init-db.c:485 msgid "gitdir" msgstr "" -#: builtin/clone.c:108 builtin/init-db.c:485 +#: builtin/clone.c:131 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:109 +#: builtin/clone.c:132 msgid "key=value" msgstr "" -#: builtin/clone.c:110 +#: builtin/clone.c:133 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550 +#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552 +#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:250 +#: builtin/clone.c:273 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:303 +#: builtin/clone.c:326 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:375 +#: builtin/clone.c:398 #, c-format msgid "failed to open '%s'" msgstr "" -#: builtin/clone.c:383 +#: builtin/clone.c:406 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:397 +#: builtin/clone.c:420 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:419 +#: builtin/clone.c:442 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:423 +#: builtin/clone.c:446 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:448 +#: builtin/clone.c:471 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:460 +#: builtin/clone.c:483 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:537 +#: builtin/clone.c:560 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:632 +#: builtin/clone.c:655 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:648 +#: builtin/clone.c:671 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:697 +#: builtin/clone.c:720 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:728 +#: builtin/clone.c:751 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:768 +#: builtin/clone.c:796 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:831 +#: builtin/clone.c:859 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:833 +#: builtin/clone.c:861 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:866 builtin/receive-pack.c:1895 +#: builtin/clone.c:894 builtin/receive-pack.c:1944 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:870 +#: builtin/clone.c:898 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:883 +#: builtin/clone.c:911 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:886 +#: builtin/clone.c:914 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:899 +#: builtin/clone.c:927 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:905 builtin/fetch.c:1335 +#: builtin/clone.c:933 builtin/fetch.c:1360 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:915 +#: builtin/clone.c:943 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:925 +#: builtin/clone.c:953 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252 -#: builtin/submodule--helper.c:659 builtin/worktree.c:222 -#: builtin/worktree.c:249 +#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 +#: builtin/worktree.c:240 builtin/worktree.c:270 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:943 +#: builtin/clone.c:971 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:955 +#: builtin/clone.c:983 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:957 +#: builtin/clone.c:985 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:963 +#: builtin/clone.c:1009 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1019 +#: builtin/clone.c:1071 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1021 +#: builtin/clone.c:1073 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1023 +#: builtin/clone.c:1075 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1026 +#: builtin/clone.c:1078 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1031 +#: builtin/clone.c:1083 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1035 +#: builtin/clone.c:1087 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:1090 builtin/clone.c:1098 +#: builtin/clone.c:1142 builtin/clone.c:1150 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1101 +#: builtin/clone.c:1153 msgid "You appear to have cloned an empty repository." msgstr "" -#: builtin/column.c:9 +#: builtin/column.c:10 msgid "git column [<options>]" msgstr "" -#: builtin/column.c:26 +#: builtin/column.c:27 msgid "lookup config vars" msgstr "" -#: builtin/column.c:27 builtin/column.c:28 +#: builtin/column.c:28 builtin/column.c:29 msgid "layout to use" msgstr "" -#: builtin/column.c:29 +#: builtin/column.c:30 msgid "Maximum width" msgstr "" -#: builtin/column.c:30 +#: builtin/column.c:31 msgid "Padding space on left border" msgstr "" -#: builtin/column.c:31 +#: builtin/column.c:32 msgid "Padding space on right border" msgstr "" -#: builtin/column.c:32 +#: builtin/column.c:33 msgid "Padding space between columns" msgstr "" -#: builtin/column.c:51 +#: builtin/column.c:52 msgid "--command must be the first argument" msgstr "" -#: builtin/commit.c:38 +#: builtin/commit.c:39 msgid "git commit [<options>] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:43 +#: builtin/commit.c:44 msgid "git status [<options>] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:48 +#: builtin/commit.c:49 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6145,7 +6530,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:61 +#: builtin/commit.c:62 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6159,14 +6544,14 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:73 +#: builtin/commit.c:74 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -#: builtin/commit.c:78 +#: builtin/commit.c:79 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -6175,11 +6560,11 @@ msgid "" "\n" msgstr "" -#: builtin/commit.c:85 +#: builtin/commit.c:86 msgid "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:88 +#: builtin/commit.c:89 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -6209,83 +6594,78 @@ msgstr "" msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 +#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:458 +#: builtin/commit.c:461 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:460 +#: builtin/commit.c:463 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:469 +#: builtin/commit.c:471 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:488 +#: builtin/commit.c:490 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:582 +#: builtin/commit.c:587 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:584 +#: builtin/commit.c:589 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:603 +#: builtin/commit.c:608 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:611 -#, c-format -msgid "invalid date format: %s" -msgstr "" - -#: builtin/commit.c:655 +#: builtin/commit.c:660 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:704 builtin/shortlog.c:295 +#: builtin/commit.c:709 builtin/shortlog.c:309 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:706 +#: builtin/commit.c:711 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:710 +#: builtin/commit.c:715 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:737 builtin/commit.c:745 +#: builtin/commit.c:742 builtin/commit.c:750 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:742 +#: builtin/commit.c:747 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:796 +#: builtin/commit.c:801 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:814 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -6295,7 +6675,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:819 +#: builtin/commit.c:824 #, c-format msgid "" "\n" @@ -6305,14 +6685,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:832 +#: builtin/commit.c:837 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:839 +#: builtin/commit.c:844 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6320,476 +6700,477 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:859 +#: builtin/commit.c:861 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:867 +#: builtin/commit.c:869 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:874 +#: builtin/commit.c:876 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:892 +#: builtin/commit.c:893 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:954 +#: builtin/commit.c:958 msgid "Error building trees" msgstr "" -#: builtin/commit.c:968 builtin/tag.c:280 +#: builtin/commit.c:972 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1071 +#: builtin/commit.c:1075 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1086 builtin/commit.c:1325 +#: builtin/commit.c:1090 builtin/commit.c:1335 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1124 +#: builtin/commit.c:1128 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1154 +#: builtin/commit.c:1158 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1163 +#: builtin/commit.c:1167 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1166 +#: builtin/commit.c:1170 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1168 +#: builtin/commit.c:1172 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1171 +#: builtin/commit.c:1175 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1181 +#: builtin/commit.c:1185 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1183 +#: builtin/commit.c:1187 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1191 +#: builtin/commit.c:1195 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1208 +#: builtin/commit.c:1212 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1210 +#: builtin/commit.c:1214 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1212 -msgid "Explicit paths specified without -i or -o; assuming --only paths..." -msgstr "" - -#: builtin/commit.c:1224 builtin/tag.c:495 +#: builtin/commit.c:1226 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1229 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1339 builtin/commit.c:1612 +#: builtin/commit.c:1349 builtin/commit.c:1626 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1341 builtin/commit.c:1614 +#: builtin/commit.c:1351 builtin/commit.c:1628 msgid "show branch information" msgstr "" -#: builtin/commit.c:1343 +#: builtin/commit.c:1353 +msgid "show stash information" +msgstr "" + +#: builtin/commit.c:1355 msgid "version" msgstr "" -#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 -#: builtin/worktree.c:442 +#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 +#: builtin/worktree.c:469 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1346 builtin/commit.c:1618 +#: builtin/commit.c:1358 builtin/commit.c:1632 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1349 builtin/commit.c:1621 +#: builtin/commit.c:1361 builtin/commit.c:1635 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:368 +#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 +#: builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "" -#: builtin/commit.c:1352 builtin/commit.c:1624 +#: builtin/commit.c:1364 builtin/commit.c:1638 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1355 +#: builtin/commit.c:1367 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1356 parse-options.h:155 +#: builtin/commit.c:1368 parse-options.h:155 msgid "when" msgstr "" -#: builtin/commit.c:1357 +#: builtin/commit.c:1369 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1359 +#: builtin/commit.c:1371 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1435 +#: builtin/commit.c:1449 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1437 +#: builtin/commit.c:1451 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1482 +#: builtin/commit.c:1496 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1485 +#: builtin/commit.c:1499 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1582 +#: builtin/commit.c:1596 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1583 +#: builtin/commit.c:1597 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1585 +#: builtin/commit.c:1599 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1586 builtin/tag.c:366 +#: builtin/commit.c:1600 builtin/tag.c:388 msgid "read message from file" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1601 msgid "author" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1601 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1588 builtin/gc.c:333 +#: builtin/commit.c:1602 builtin/gc.c:359 msgid "date" msgstr "" -#: builtin/commit.c:1588 +#: builtin/commit.c:1602 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:364 +#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "" -#: builtin/commit.c:1589 +#: builtin/commit.c:1603 msgid "commit message" msgstr "" -#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 -#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81 +#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 +#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1604 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1591 +#: builtin/commit.c:1605 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1592 +#: builtin/commit.c:1606 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1593 +#: builtin/commit.c:1607 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1594 +#: builtin/commit.c:1608 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86 +#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 +#: builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1596 +#: builtin/commit.c:1610 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1611 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1598 +#: builtin/commit.c:1612 msgid "default" msgstr "" -#: builtin/commit.c:1598 builtin/tag.c:369 +#: builtin/commit.c:1612 builtin/tag.c:391 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1599 +#: builtin/commit.c:1613 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166 -#: builtin/revert.c:93 +#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 +#: builtin/revert.c:113 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1604 +#: builtin/commit.c:1618 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1605 +#: builtin/commit.c:1619 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1606 +#: builtin/commit.c:1620 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1607 +#: builtin/commit.c:1621 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1608 +#: builtin/commit.c:1622 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1609 +#: builtin/commit.c:1623 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1610 +#: builtin/commit.c:1624 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1611 +#: builtin/commit.c:1625 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1622 +#: builtin/commit.c:1636 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1623 +#: builtin/commit.c:1637 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1628 +#: builtin/commit.c:1642 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1630 +#: builtin/commit.c:1644 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1659 +#: builtin/commit.c:1674 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1707 +#: builtin/commit.c:1719 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1714 +#: builtin/commit.c:1726 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1733 +#: builtin/commit.c:1745 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1744 +#: builtin/commit.c:1756 #, c-format -msgid "Aborting commit; you did not edit the message.\n" +msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1749 +#: builtin/commit.c:1761 #, c-format -msgid "Aborting commit due to empty commit message.\n" +msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1797 +#: builtin/commit.c:1809 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" -#: builtin/config.c:9 +#: builtin/config.c:10 msgid "git config [<options>]" msgstr "" -#: builtin/config.c:55 +#: builtin/config.c:57 msgid "Config file location" msgstr "" -#: builtin/config.c:56 +#: builtin/config.c:58 msgid "use global config file" msgstr "" -#: builtin/config.c:57 +#: builtin/config.c:59 msgid "use system config file" msgstr "" -#: builtin/config.c:58 +#: builtin/config.c:60 msgid "use repository config file" msgstr "" -#: builtin/config.c:59 +#: builtin/config.c:61 msgid "use given config file" msgstr "" -#: builtin/config.c:60 +#: builtin/config.c:62 msgid "blob-id" msgstr "" -#: builtin/config.c:60 +#: builtin/config.c:62 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:61 +#: builtin/config.c:63 msgid "Action" msgstr "" -#: builtin/config.c:62 +#: builtin/config.c:64 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:63 +#: builtin/config.c:65 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:64 +#: builtin/config.c:66 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:65 +#: builtin/config.c:67 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:66 +#: builtin/config.c:68 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:67 +#: builtin/config.c:69 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:68 +#: builtin/config.c:70 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:69 +#: builtin/config.c:71 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:70 +#: builtin/config.c:72 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:71 +#: builtin/config.c:73 msgid "remove a section: name" msgstr "" -#: builtin/config.c:72 +#: builtin/config.c:74 msgid "list all" msgstr "" -#: builtin/config.c:73 +#: builtin/config.c:75 msgid "open an editor" msgstr "" -#: builtin/config.c:74 +#: builtin/config.c:76 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:75 +#: builtin/config.c:77 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:76 +#: builtin/config.c:78 msgid "Type" msgstr "" -#: builtin/config.c:77 +#: builtin/config.c:79 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:78 +#: builtin/config.c:80 msgid "value is decimal number" msgstr "" -#: builtin/config.c:79 +#: builtin/config.c:81 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:80 +#: builtin/config.c:82 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:81 +#: builtin/config.c:83 msgid "Other" msgstr "" -#: builtin/config.c:82 +#: builtin/config.c:84 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:83 +#: builtin/config.c:85 msgid "show variable names only" msgstr "" -#: builtin/config.c:84 +#: builtin/config.c:86 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:85 +#: builtin/config.c:87 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" @@ -6807,752 +7188,801 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:613 +#: builtin/config.c:499 +msgid "--local can only be used inside a git repository" +msgstr "" + +#: builtin/config.c:624 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:625 +#: builtin/config.c:637 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "" -#: builtin/count-objects.c:86 +#: builtin/count-objects.c:88 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "" -#: builtin/count-objects.c:96 +#: builtin/count-objects.c:98 msgid "print sizes in human readable format" msgstr "" -#: builtin/describe.c:17 +#: builtin/describe.c:19 msgid "git describe [<options>] [<commit-ish>...]" msgstr "" -#: builtin/describe.c:18 +#: builtin/describe.c:20 msgid "git describe [<options>] --dirty" msgstr "" -#: builtin/describe.c:217 +#: builtin/describe.c:54 +msgid "head" +msgstr "" + +#: builtin/describe.c:54 +msgid "lightweight" +msgstr "" + +#: builtin/describe.c:54 +msgid "annotated" +msgstr "" + +#: builtin/describe.c:264 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:221 +#: builtin/describe.c:268 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:223 +#: builtin/describe.c:270 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:250 builtin/log.c:480 +#: builtin/describe.c:297 builtin/log.c:493 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:253 +#: builtin/describe.c:300 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/describe.c:270 +#: builtin/describe.c:317 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:272 +#: builtin/describe.c:319 #, c-format msgid "searching to describe %s\n" msgstr "" -#: builtin/describe.c:319 +#: builtin/describe.c:366 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:346 +#: builtin/describe.c:393 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:350 +#: builtin/describe.c:397 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:371 +#: builtin/describe.c:427 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:374 +#: builtin/describe.c:430 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:396 +#: builtin/describe.c:452 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:397 +#: builtin/describe.c:453 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:398 +#: builtin/describe.c:454 msgid "use any ref" msgstr "" -#: builtin/describe.c:399 +#: builtin/describe.c:455 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:400 +#: builtin/describe.c:456 msgid "always use long format" msgstr "" -#: builtin/describe.c:401 +#: builtin/describe.c:457 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:404 +#: builtin/describe.c:460 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:406 +#: builtin/describe.c:462 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:408 +#: builtin/describe.c:464 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:410 builtin/name-rev.c:320 +#: builtin/describe.c:466 +msgid "do not consider tags matching <pattern>" +msgstr "" + +#: builtin/describe.c:468 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:411 +#: builtin/describe.c:469 builtin/describe.c:472 msgid "mark" msgstr "" -#: builtin/describe.c:412 +#: builtin/describe.c:470 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:430 +#: builtin/describe.c:473 +msgid "append <mark> on broken working tree (default: \"-broken\")" +msgstr "" + +#: builtin/describe.c:491 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:456 +#: builtin/describe.c:520 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:476 +#: builtin/describe.c:563 msgid "--dirty is incompatible with commit-ishes" msgstr "" +#: builtin/describe.c:565 +msgid "--broken is incompatible with commit-ishes" +msgstr "" + #: builtin/diff.c:83 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:234 +#: builtin/diff.c:235 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:358 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:401 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:410 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:417 +#: builtin/diff.c:414 #, c-format msgid "unhandled object '%s' given." msgstr "" -#: builtin/difftool.c:28 +#: builtin/difftool.c:29 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" -#: builtin/difftool.c:241 +#: builtin/difftool.c:259 #, c-format msgid "failed: %d" msgstr "" -#: builtin/difftool.c:342 +#: builtin/difftool.c:301 +#, c-format +msgid "could not read symlink %s" +msgstr "" + +#: builtin/difftool.c:303 +#, c-format +msgid "could not read symlink file %s" +msgstr "" + +#: builtin/difftool.c:311 +#, c-format +msgid "could not read object %s for symlink %s" +msgstr "" + +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:567 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "" -#: builtin/difftool.c:569 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "" -#: builtin/difftool.c:580 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "" -#: builtin/difftool.c:581 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "" -#: builtin/difftool.c:626 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "" -#: builtin/difftool.c:628 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "" -#: builtin/difftool.c:630 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "" -#: builtin/difftool.c:636 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "" -#: builtin/difftool.c:637 +#: builtin/difftool.c:707 msgid "<tool>" msgstr "" -#: builtin/difftool.c:638 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "" -#: builtin/difftool.c:640 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:643 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -#: builtin/difftool.c:645 +#: builtin/difftool.c:715 msgid "<command>" msgstr "" -#: builtin/difftool.c:646 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "" -#: builtin/difftool.c:670 +#: builtin/difftool.c:740 msgid "no <tool> given for --tool=<tool>" msgstr "" -#: builtin/difftool.c:677 +#: builtin/difftool.c:747 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "" -#: builtin/fast-export.c:25 +#: builtin/fast-export.c:26 msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:980 +#: builtin/fast-export.c:998 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:1000 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:985 +#: builtin/fast-export.c:1003 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:988 +#: builtin/fast-export.c:1006 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:1008 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:1010 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:1012 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:1014 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:997 +#: builtin/fast-export.c:1015 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1016 msgid "refspec" msgstr "" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1017 msgid "Apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1018 msgid "anonymize output" msgstr "" -#: builtin/fetch.c:21 +#: builtin/fetch.c:23 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:22 +#: builtin/fetch.c:24 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:23 +#: builtin/fetch.c:25 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:24 +#: builtin/fetch.c:26 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:95 builtin/pull.c:175 +#: builtin/fetch.c:112 builtin/pull.c:182 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:97 builtin/pull.c:178 +#: builtin/fetch.c:114 builtin/pull.c:185 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:99 builtin/pull.c:181 +#: builtin/fetch.c:116 builtin/pull.c:188 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:100 builtin/pull.c:183 +#: builtin/fetch.c:117 builtin/pull.c:190 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:102 +#: builtin/fetch.c:119 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:104 builtin/pull.c:185 +#: builtin/fetch.c:121 builtin/pull.c:192 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:106 +#: builtin/fetch.c:123 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:108 +#: builtin/fetch.c:125 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:110 builtin/pull.c:188 +#: builtin/fetch.c:127 builtin/pull.c:195 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:111 builtin/pull.c:191 +#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 msgid "on-demand" msgstr "" -#: builtin/fetch.c:112 builtin/pull.c:192 +#: builtin/fetch.c:129 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:116 builtin/pull.c:200 +#: builtin/fetch.c:133 builtin/pull.c:203 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:118 +#: builtin/fetch.c:135 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 +#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:123 +#: builtin/fetch.c:140 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:129 builtin/pull.c:206 +#: builtin/fetch.c:146 builtin/pull.c:209 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:131 builtin/log.c:1433 +#: builtin/fetch.c:148 builtin/log.c:1456 msgid "dir" msgstr "" -#: builtin/fetch.c:132 +#: builtin/fetch.c:149 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:135 -msgid "default mode for recursion" +#: builtin/fetch.c:152 +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" msgstr "" -#: builtin/fetch.c:137 builtin/pull.c:209 +#: builtin/fetch.c:156 builtin/pull.c:212 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:138 builtin/pull.c:211 +#: builtin/fetch.c:157 builtin/pull.c:214 msgid "refmap" msgstr "" -#: builtin/fetch.c:139 builtin/pull.c:212 +#: builtin/fetch.c:158 builtin/pull.c:215 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:395 +#: builtin/fetch.c:416 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:511 +#: builtin/fetch.c:534 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:604 +#: builtin/fetch.c:627 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:608 +#: builtin/fetch.c:631 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:621 builtin/fetch.c:701 +#: builtin/fetch.c:644 builtin/fetch.c:724 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:622 +#: builtin/fetch.c:645 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:631 +#: builtin/fetch.c:654 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681 -#: builtin/fetch.c:696 +#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 +#: builtin/fetch.c:719 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:651 +#: builtin/fetch.c:674 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:654 +#: builtin/fetch.c:677 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:657 +#: builtin/fetch.c:680 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:696 +#: builtin/fetch.c:719 msgid "forced update" msgstr "" -#: builtin/fetch.c:701 +#: builtin/fetch.c:724 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:746 +#: builtin/fetch.c:769 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:766 +#: builtin/fetch.c:789 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:853 builtin/fetch.c:949 +#: builtin/fetch.c:877 builtin/fetch.c:973 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:864 +#: builtin/fetch.c:888 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:919 +#: builtin/fetch.c:943 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:920 +#: builtin/fetch.c:944 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:952 +#: builtin/fetch.c:976 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:953 builtin/remote.c:1020 +#: builtin/fetch.c:977 builtin/remote.c:1024 msgid "(none)" msgstr "" -#: builtin/fetch.c:976 +#: builtin/fetch.c:1000 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:995 +#: builtin/fetch.c:1019 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:998 +#: builtin/fetch.c:1022 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1074 +#: builtin/fetch.c:1098 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:1234 +#: builtin/fetch.c:1258 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1236 builtin/remote.c:96 +#: builtin/fetch.c:1260 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1254 +#: builtin/fetch.c:1278 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1277 +#: builtin/fetch.c:1301 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1319 +#: builtin/fetch.c:1344 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1321 +#: builtin/fetch.c:1346 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1326 +#: builtin/fetch.c:1351 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1353 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1350 +#: builtin/fetch.c:1366 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1352 +#: builtin/fetch.c:1368 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1363 +#: builtin/fetch.c:1379 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1371 +#: builtin/fetch.c:1387 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fmt-merge-msg.c:14 +#: builtin/fmt-merge-msg.c:15 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:665 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:668 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:671 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:672 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:673 msgid "file to read from" msgstr "" -#: builtin/for-each-ref.c:9 +#: builtin/for-each-ref.c:10 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "" -#: builtin/for-each-ref.c:10 +#: builtin/for-each-ref.c:11 msgid "git for-each-ref [--points-at <object>]" msgstr "" -#: builtin/for-each-ref.c:11 -msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" +#: builtin/for-each-ref.c:12 +msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" msgstr "" -#: builtin/for-each-ref.c:12 -msgid "git for-each-ref [--contains [<object>]]" +#: builtin/for-each-ref.c:13 +msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "" -#: builtin/for-each-ref.c:27 +#: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:29 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:31 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:33 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for Tcl" msgstr "" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:37 msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38 -msgid "format to use for the output" +#: builtin/for-each-ref.c:39 builtin/tag.c:414 +msgid "respect format colors" msgstr "" -#: builtin/for-each-ref.c:41 +#: builtin/for-each-ref.c:43 msgid "print only refs which points at the given object" msgstr "" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:45 msgid "print only refs that are merged" msgstr "" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:46 msgid "print only refs that are not merged" msgstr "" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:47 msgid "print only refs which contain the commit" msgstr "" -#: builtin/fsck.c:554 +#: builtin/for-each-ref.c:48 +msgid "print only refs which don't contain the commit" +msgstr "" + +#: builtin/fsck.c:543 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:646 +#: builtin/fsck.c:635 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:652 +#: builtin/fsck.c:641 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:653 +#: builtin/fsck.c:642 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:654 +#: builtin/fsck.c:643 msgid "report tags" msgstr "" -#: builtin/fsck.c:655 +#: builtin/fsck.c:644 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:656 +#: builtin/fsck.c:645 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:657 +#: builtin/fsck.c:646 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:658 +#: builtin/fsck.c:647 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:659 +#: builtin/fsck.c:648 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:660 +#: builtin/fsck.c:649 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:662 +#: builtin/fsck.c:651 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:663 builtin/prune.c:107 +#: builtin/fsck.c:652 builtin/prune.c:107 msgid "show progress" msgstr "" -#: builtin/fsck.c:664 +#: builtin/fsck.c:653 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:725 +#: builtin/fsck.c:714 msgid "Checking objects" msgstr "" -#: builtin/gc.c:25 +#: builtin/gc.c:27 msgid "git gc [<options>]" msgstr "" -#: builtin/gc.c:72 +#: builtin/gc.c:80 #, c-format -msgid "Invalid %s: '%s'" +msgid "Failed to fstat %s: %s" msgstr "" -#: builtin/gc.c:139 +#: builtin/gc.c:312 #, c-format -msgid "insanely long object directory %.*s" +msgid "Can't stat %s" msgstr "" -#: builtin/gc.c:297 +#: builtin/gc.c:321 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -7562,858 +7992,873 @@ msgid "" "%s" msgstr "" -#: builtin/gc.c:334 +#: builtin/gc.c:360 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:336 +#: builtin/gc.c:362 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:337 +#: builtin/gc.c:363 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:338 +#: builtin/gc.c:364 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:380 +#: builtin/gc.c:381 +#, c-format +msgid "Failed to parse gc.logexpiry value %s" +msgstr "" + +#: builtin/gc.c:409 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:382 +#: builtin/gc.c:411 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:383 +#: builtin/gc.c:412 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:404 +#: builtin/gc.c:437 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:448 +#: builtin/gc.c:481 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:25 +#: builtin/grep.c:27 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" -#: builtin/grep.c:232 +#: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:290 +#: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "" -#: builtin/grep.c:763 builtin/grep.c:804 +#. TRANSLATORS: %s is the configuration +#. variable for tweaking threads, currently +#. grep.threads +#. +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "" + +#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:823 +#: builtin/grep.c:628 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:694 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:973 +#: builtin/grep.c:781 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:975 +#: builtin/grep.c:783 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:977 +#: builtin/grep.c:785 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:979 +#: builtin/grep.c:787 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:981 -msgid "recursivley search in each submodule" +#: builtin/grep.c:789 +msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:983 -msgid "basename" -msgstr "" - -#: builtin/grep.c:984 -msgid "prepend parent project's basename to output" -msgstr "" - -#: builtin/grep.c:987 +#: builtin/grep.c:792 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:989 +#: builtin/grep.c:794 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:991 +#: builtin/grep.c:796 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:993 +#: builtin/grep.c:798 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:995 +#: builtin/grep.c:800 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:998 +#: builtin/grep.c:803 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:1000 +#: builtin/grep.c:805 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:1004 +#: builtin/grep.c:809 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:1007 +#: builtin/grep.c:812 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:1010 +#: builtin/grep.c:815 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:1013 +#: builtin/grep.c:818 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:1016 +#: builtin/grep.c:821 msgid "show line numbers" msgstr "" -#: builtin/grep.c:1017 +#: builtin/grep.c:822 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:1018 +#: builtin/grep.c:823 msgid "show filenames" msgstr "" -#: builtin/grep.c:1020 +#: builtin/grep.c:825 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:1022 +#: builtin/grep.c:827 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:1024 +#: builtin/grep.c:829 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:1027 +#: builtin/grep.c:832 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:1029 +#: builtin/grep.c:834 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:1031 +#: builtin/grep.c:836 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:1032 +#: builtin/grep.c:837 msgid "highlight matches" msgstr "" -#: builtin/grep.c:1034 +#: builtin/grep.c:839 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:1036 +#: builtin/grep.c:841 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:1039 +#: builtin/grep.c:844 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:1042 +#: builtin/grep.c:847 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:1044 +#: builtin/grep.c:849 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:1046 +#: builtin/grep.c:851 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:1047 +#: builtin/grep.c:852 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:1050 +#: builtin/grep.c:855 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:1052 +#: builtin/grep.c:857 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:1055 +#: builtin/grep.c:860 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:1057 +#: builtin/grep.c:862 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:1059 +#: builtin/grep.c:864 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:1071 +#: builtin/grep.c:876 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:1073 +#: builtin/grep.c:878 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:1075 +#: builtin/grep.c:880 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:1079 +#: builtin/grep.c:884 msgid "pager" msgstr "" -#: builtin/grep.c:1079 +#: builtin/grep.c:884 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:1082 +#: builtin/grep.c:887 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:1146 +#: builtin/grep.c:950 msgid "no pattern given." msgstr "" -#: builtin/grep.c:1178 builtin/index-pack.c:1482 +#: builtin/grep.c:982 +msgid "--no-index or --untracked cannot be used with revs" +msgstr "" + +#: builtin/grep.c:989 +#, c-format +msgid "unable to resolve revision: %s" +msgstr "" + +#: builtin/grep.c:1023 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1215 +#: builtin/grep.c:1028 +msgid "no threads support, ignoring --threads" +msgstr "" + +#: builtin/grep.c:1052 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1238 +#: builtin/grep.c:1075 msgid "option not supported with --recurse-submodules." msgstr "" -#: builtin/grep.c:1244 +#: builtin/grep.c:1081 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:1249 -msgid "--no-index or --untracked cannot be used with revs." -msgstr "" - -#: builtin/grep.c:1252 +#: builtin/grep.c:1087 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:1260 +#: builtin/grep.c:1095 msgid "both --cached and trees are given." msgstr "" -#: builtin/hash-object.c:81 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." msgstr "" -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths" msgstr "" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "type" msgstr "" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "object type" msgstr "" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:96 msgid "write the object into the object database" msgstr "" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "read the object from stdin" msgstr "" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "store file as is without filters" msgstr "" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:102 msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:42 +#: builtin/help.c:43 msgid "print all available commands" msgstr "" -#: builtin/help.c:43 +#: builtin/help.c:44 msgid "exclude guides" msgstr "" -#: builtin/help.c:44 +#: builtin/help.c:45 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:45 +#: builtin/help.c:46 msgid "show man page" msgstr "" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "show info page" msgstr "" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "" -#: builtin/help.c:66 +#: builtin/help.c:67 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:93 +#: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:106 +#: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:114 +#: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 +#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 #, c-format msgid "failed to exec '%s'" msgstr "" -#: builtin/help.c:207 +#: builtin/help.c:211 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:219 +#: builtin/help.c:223 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:336 +#: builtin/help.c:340 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:353 +#: builtin/help.c:357 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:361 +#: builtin/help.c:365 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:403 +#: builtin/help.c:407 msgid "Defining attributes per path" msgstr "" -#: builtin/help.c:404 +#: builtin/help.c:408 msgid "Everyday Git With 20 Commands Or So" msgstr "" -#: builtin/help.c:405 +#: builtin/help.c:409 msgid "A Git glossary" msgstr "" -#: builtin/help.c:406 +#: builtin/help.c:410 msgid "Specifies intentionally untracked files to ignore" msgstr "" -#: builtin/help.c:407 +#: builtin/help.c:411 msgid "Defining submodule properties" msgstr "" -#: builtin/help.c:408 +#: builtin/help.c:412 msgid "Specifying revisions and ranges for Git" msgstr "" -#: builtin/help.c:409 +#: builtin/help.c:413 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" -#: builtin/help.c:410 +#: builtin/help.c:414 msgid "An overview of recommended workflows with Git" msgstr "" -#: builtin/help.c:422 +#: builtin/help.c:426 msgid "The common Git guides are:\n" msgstr "" -#: builtin/help.c:440 +#: builtin/help.c:444 #, c-format -msgid "`git %s' is aliased to `%s'" +msgid "'%s' is aliased to '%s'" msgstr "" -#: builtin/help.c:462 builtin/help.c:479 +#: builtin/help.c:466 builtin/help.c:483 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/index-pack.c:154 +#: builtin/index-pack.c:156 #, c-format msgid "unable to open %s" msgstr "" -#: builtin/index-pack.c:204 +#: builtin/index-pack.c:206 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:224 +#: builtin/index-pack.c:226 #, c-format msgid "did not receive expected object %s" msgstr "" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:229 #, c-format msgid "object %s: expected type %s, found %s" msgstr "" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:271 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:281 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:282 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:292 +#: builtin/index-pack.c:294 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:299 +#: builtin/index-pack.c:301 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +#: builtin/index-pack.c:304 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:319 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:322 +#: builtin/index-pack.c:325 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:336 +#: builtin/index-pack.c:339 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:338 +#: builtin/index-pack.c:341 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:356 +#: builtin/index-pack.c:359 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "" -#: builtin/index-pack.c:478 +#: builtin/index-pack.c:480 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:527 +#: builtin/index-pack.c:529 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:535 +#: builtin/index-pack.c:537 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:543 +#: builtin/index-pack.c:545 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:574 +#: builtin/index-pack.c:576 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:576 +#: builtin/index-pack.c:578 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:602 +#: builtin/index-pack.c:604 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:813 builtin/index-pack.c:822 +#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 +#: builtin/index-pack.c:817 builtin/index-pack.c:826 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:751 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:752 builtin/pack-objects.c:168 +#: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:819 +#: builtin/index-pack.c:815 +#, c-format +msgid "cannot read existing object info %s" +msgstr "" + +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:837 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:852 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:855 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:852 +#: builtin/index-pack.c:857 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:924 builtin/index-pack.c:955 +#: builtin/index-pack.c:929 builtin/index-pack.c:960 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1125 +#: builtin/index-pack.c:1131 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1125 +#: builtin/index-pack.c:1131 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1165 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1170 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1173 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1176 +#: builtin/index-pack.c:1185 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1199 +#: builtin/index-pack.c:1208 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1210 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1261 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1258 +#: builtin/index-pack.c:1267 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1270 +#: builtin/index-pack.c:1279 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1274 +#: builtin/index-pack.c:1283 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1307 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1374 +#: builtin/index-pack.c:1383 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1398 +#: builtin/index-pack.c:1409 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1411 +#: builtin/index-pack.c:1421 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1419 +#: builtin/index-pack.c:1429 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1432 +#: builtin/index-pack.c:1439 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1443 +#: builtin/index-pack.c:1447 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1485 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1486 builtin/index-pack.c:1683 -#, c-format -msgid "no threads support, ignoring %s" -msgstr "" - -#: builtin/index-pack.c:1544 +#: builtin/index-pack.c:1553 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1546 +#: builtin/index-pack.c:1555 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1603 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1600 +#: builtin/index-pack.c:1610 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1613 +#: builtin/index-pack.c:1623 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1695 builtin/index-pack.c:1698 -#: builtin/index-pack.c:1714 builtin/index-pack.c:1718 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 +#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1734 +#: builtin/index-pack.c:1744 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1736 +#: builtin/index-pack.c:1746 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1744 +#: builtin/index-pack.c:1754 msgid "--verify with no packfile name given" msgstr "" -#: builtin/init-db.c:54 +#: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/init-db.c:60 +#: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:65 +#: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:76 +#: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:78 +#: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:84 +#: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:88 +#: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:119 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "" -#: builtin/init-db.c:134 +#: builtin/init-db.c:135 #, c-format msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:327 +#: builtin/init-db.c:328 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:330 +#: builtin/init-db.c:331 #, c-format msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:347 builtin/init-db.c:350 +#: builtin/init-db.c:348 builtin/init-db.c:351 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:403 +#: builtin/init-db.c:404 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:404 +#: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:408 +#: builtin/init-db.c:409 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:409 +#: builtin/init-db.c:410 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:457 +#: builtin/init-db.c:458 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -#: builtin/init-db.c:480 +#: builtin/init-db.c:481 msgid "permissions" msgstr "" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:515 builtin/init-db.c:520 +#: builtin/init-db.c:516 builtin/init-db.c:521 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:524 +#: builtin/init-db.c:525 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:545 +#: builtin/init-db.c:546 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:573 +#: builtin/init-db.c:574 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -8424,447 +8869,492 @@ msgid "" "<token>[(=|:)<value>])...] [<file>...]" msgstr "" -#: builtin/interpret-trailers.c:26 +#: builtin/interpret-trailers.c:92 msgid "edit files in place" msgstr "" -#: builtin/interpret-trailers.c:27 +#: builtin/interpret-trailers.c:93 msgid "trim empty trailers" msgstr "" -#: builtin/interpret-trailers.c:28 +#: builtin/interpret-trailers.c:96 +msgid "where to place the new trailer" +msgstr "" + +#: builtin/interpret-trailers.c:98 +msgid "action if trailer already exists" +msgstr "" + +#: builtin/interpret-trailers.c:100 +msgid "action if trailer is missing" +msgstr "" + +#: builtin/interpret-trailers.c:102 +msgid "output only the trailers" +msgstr "" + +#: builtin/interpret-trailers.c:103 +msgid "do not apply config rules" +msgstr "" + +#: builtin/interpret-trailers.c:104 +msgid "join whitespace-continued values" +msgstr "" + +#: builtin/interpret-trailers.c:105 +msgid "set parsing options" +msgstr "" + +#: builtin/interpret-trailers.c:107 msgid "trailer" msgstr "" -#: builtin/interpret-trailers.c:29 +#: builtin/interpret-trailers.c:108 msgid "trailer(s) to add" msgstr "" -#: builtin/interpret-trailers.c:42 +#: builtin/interpret-trailers.c:117 +msgid "--trailer with --only-input does not make sense" +msgstr "" + +#: builtin/interpret-trailers.c:127 msgid "no input file given for in-place editing" msgstr "" -#: builtin/log.c:44 +#: builtin/log.c:46 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/log.c:45 +#: builtin/log.c:47 msgid "git show [<options>] <object>..." msgstr "" -#: builtin/log.c:84 +#: builtin/log.c:91 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:139 +#: builtin/log.c:148 msgid "suppress diff output" msgstr "" -#: builtin/log.c:140 +#: builtin/log.c:149 msgid "show source" msgstr "" -#: builtin/log.c:141 +#: builtin/log.c:150 msgid "Use mail map file" msgstr "" -#: builtin/log.c:142 +#: builtin/log.c:151 msgid "decorate options" msgstr "" -#: builtin/log.c:145 +#: builtin/log.c:154 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:241 +#: builtin/log.c:250 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:486 +#: builtin/log.c:501 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:500 builtin/log.c:594 +#: builtin/log.c:516 builtin/log.c:610 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:618 +#: builtin/log.c:634 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:739 +#: builtin/log.c:755 msgid "format.headers without value" msgstr "" -#: builtin/log.c:839 +#: builtin/log.c:856 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:854 +#: builtin/log.c:872 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:868 +#: builtin/log.c:889 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:878 +#: builtin/log.c:899 msgid "Not a range." msgstr "" -#: builtin/log.c:984 +#: builtin/log.c:1005 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:1063 +#: builtin/log.c:1085 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1091 +#: builtin/log.c:1112 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1141 +#: builtin/log.c:1162 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905 +#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476 +#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/log.c:1263 +#: builtin/log.c:1284 msgid "Could not find exact merge base." msgstr "" -#: builtin/log.c:1267 +#: builtin/log.c:1288 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually." msgstr "" -#: builtin/log.c:1287 +#: builtin/log.c:1308 msgid "Failed to find exact merge base" msgstr "" -#: builtin/log.c:1298 +#: builtin/log.c:1319 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1302 +#: builtin/log.c:1323 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1351 +#: builtin/log.c:1372 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1408 +#: builtin/log.c:1431 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1411 +#: builtin/log.c:1434 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1415 +#: builtin/log.c:1438 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1417 +#: builtin/log.c:1440 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1419 +#: builtin/log.c:1442 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1420 +#: builtin/log.c:1443 msgid "sfx" msgstr "" -#: builtin/log.c:1421 +#: builtin/log.c:1444 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1423 +#: builtin/log.c:1446 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1425 +#: builtin/log.c:1448 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1427 +#: builtin/log.c:1450 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1430 +#: builtin/log.c:1453 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1433 +#: builtin/log.c:1456 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1436 +#: builtin/log.c:1459 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1439 +#: builtin/log.c:1462 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1441 +#: builtin/log.c:1464 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1443 +#: builtin/log.c:1466 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1445 +#: builtin/log.c:1468 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1447 +#: builtin/log.c:1470 msgid "Messaging" msgstr "" -#: builtin/log.c:1448 +#: builtin/log.c:1471 msgid "header" msgstr "" -#: builtin/log.c:1449 +#: builtin/log.c:1472 msgid "add email header" msgstr "" -#: builtin/log.c:1450 builtin/log.c:1452 +#: builtin/log.c:1473 builtin/log.c:1475 msgid "email" msgstr "" -#: builtin/log.c:1450 +#: builtin/log.c:1473 msgid "add To: header" msgstr "" -#: builtin/log.c:1452 +#: builtin/log.c:1475 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1454 +#: builtin/log.c:1477 msgid "ident" msgstr "" -#: builtin/log.c:1455 +#: builtin/log.c:1478 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1457 +#: builtin/log.c:1480 msgid "message-id" msgstr "" -#: builtin/log.c:1458 +#: builtin/log.c:1481 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1459 builtin/log.c:1462 +#: builtin/log.c:1482 builtin/log.c:1485 msgid "boundary" msgstr "" -#: builtin/log.c:1460 +#: builtin/log.c:1483 msgid "attach the patch" msgstr "" -#: builtin/log.c:1463 +#: builtin/log.c:1486 msgid "inline the patch" msgstr "" -#: builtin/log.c:1467 +#: builtin/log.c:1490 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1469 +#: builtin/log.c:1492 msgid "signature" msgstr "" -#: builtin/log.c:1470 +#: builtin/log.c:1493 msgid "add a signature" msgstr "" -#: builtin/log.c:1471 +#: builtin/log.c:1494 msgid "base-commit" msgstr "" -#: builtin/log.c:1472 +#: builtin/log.c:1495 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1474 +#: builtin/log.c:1497 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1475 +#: builtin/log.c:1498 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1565 +#: builtin/log.c:1500 +msgid "show progress while generating patches" +msgstr "" + +#: builtin/log.c:1575 +#, c-format +msgid "invalid ident line: %s" +msgstr "" + +#: builtin/log.c:1590 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1567 +#: builtin/log.c:1592 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1575 +#: builtin/log.c:1600 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1577 +#: builtin/log.c:1602 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1579 +#: builtin/log.c:1604 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1609 +#: builtin/log.c:1634 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1611 +#: builtin/log.c:1636 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1705 +#: builtin/log.c:1729 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1777 +#: builtin/log.c:1761 +msgid "Generating patches" +msgstr "" + +#: builtin/log.c:1805 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1826 +#: builtin/log.c:1855 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1880 +#: builtin/log.c:1909 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:466 msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:509 +#: builtin/ls-files.c:515 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:511 +#: builtin/ls-files.c:517 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:513 +#: builtin/ls-files.c:519 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:521 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:523 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:525 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:527 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:524 +#: builtin/ls-files.c:530 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:532 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:534 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:536 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:538 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:541 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:543 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:539 +#: builtin/ls-files.c:545 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:548 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:551 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:553 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:556 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:559 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:561 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:562 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:563 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:565 msgid "show debugging data" msgstr "" @@ -8875,252 +9365,257 @@ msgid "" " [--symref] [<repository> [<refs>...]]" msgstr "" -#: builtin/ls-remote.c:50 +#: builtin/ls-remote.c:52 msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:51 builtin/ls-remote.c:53 +#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 msgid "exec" msgstr "" -#: builtin/ls-remote.c:52 builtin/ls-remote.c:54 +#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 msgid "path of git-upload-pack on the remote host" msgstr "" -#: builtin/ls-remote.c:56 +#: builtin/ls-remote.c:58 msgid "limit to tags" msgstr "" -#: builtin/ls-remote.c:57 +#: builtin/ls-remote.c:59 msgid "limit to heads" msgstr "" -#: builtin/ls-remote.c:58 +#: builtin/ls-remote.c:60 msgid "do not show peeled tags" msgstr "" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:62 msgid "take url.<base>.insteadOf into account" msgstr "" -#: builtin/ls-remote.c:62 +#: builtin/ls-remote.c:64 msgid "exit with exit code 2 if no matching refs are found" msgstr "" -#: builtin/ls-remote.c:64 +#: builtin/ls-remote.c:66 msgid "show underlying ref in addition to the object pointed by it" msgstr "" -#: builtin/ls-tree.c:28 +#: builtin/ls-tree.c:29 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "" -#: builtin/ls-tree.c:126 +#: builtin/ls-tree.c:127 msgid "only show trees" msgstr "" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:129 msgid "recurse into subtrees" msgstr "" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:131 msgid "show trees when recursing" msgstr "" -#: builtin/ls-tree.c:133 +#: builtin/ls-tree.c:134 msgid "terminate entries with NUL byte" msgstr "" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "include object size" msgstr "" -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 msgid "list only filenames" msgstr "" -#: builtin/ls-tree.c:141 +#: builtin/ls-tree.c:142 msgid "use full path names" msgstr "" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:144 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" -#: builtin/merge.c:46 -msgid "git merge [<options>] [<commit>...]" +#: builtin/mailsplit.c:241 +#, c-format +msgid "empty mbox: '%s'" msgstr "" -#: builtin/merge.c:47 -msgid "git merge [<options>] <msg> HEAD <commit>" +#: builtin/merge.c:48 +msgid "git merge [<options>] [<commit>...]" msgstr "" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge --abort" msgstr "" -#: builtin/merge.c:49 +#: builtin/merge.c:50 msgid "git merge --continue" msgstr "" -#: builtin/merge.c:104 +#: builtin/merge.c:107 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:141 +#: builtin/merge.c:144 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:142 +#: builtin/merge.c:145 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:147 +#: builtin/merge.c:150 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:197 builtin/pull.c:127 +#: builtin/merge.c:200 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:200 builtin/pull.c:130 +#: builtin/merge.c:203 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:201 builtin/pull.c:133 +#: builtin/merge.c:204 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:203 builtin/pull.c:136 +#: builtin/merge.c:206 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:206 builtin/pull.c:139 +#: builtin/merge.c:209 builtin/pull.c:146 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:208 builtin/pull.c:142 +#: builtin/merge.c:211 builtin/pull.c:149 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:210 builtin/pull.c:145 +#: builtin/merge.c:213 builtin/pull.c:152 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:211 +#: builtin/merge.c:214 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:213 builtin/pull.c:151 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:217 builtin/pull.c:154 +#: builtin/merge.c:220 builtin/pull.c:161 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158 -#: builtin/revert.c:89 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 +#: builtin/revert.c:109 msgid "strategy" msgstr "" -#: builtin/merge.c:219 builtin/pull.c:159 +#: builtin/merge.c:222 builtin/pull.c:166 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:220 builtin/pull.c:162 +#: builtin/merge.c:223 builtin/pull.c:169 msgid "option=value" msgstr "" -#: builtin/merge.c:221 builtin/pull.c:163 +#: builtin/merge.c:224 builtin/pull.c:170 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:223 +#: builtin/merge.c:226 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:227 +#: builtin/merge.c:230 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:229 +#: builtin/merge.c:232 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:231 builtin/pull.c:170 +#: builtin/merge.c:234 builtin/pull.c:177 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:259 +#: builtin/merge.c:240 +msgid "verify commit-msg hook" +msgstr "" + +#: builtin/merge.c:265 msgid "could not run stash." msgstr "" -#: builtin/merge.c:264 +#: builtin/merge.c:270 msgid "stash failed" msgstr "" -#: builtin/merge.c:269 +#: builtin/merge.c:275 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:288 builtin/merge.c:305 +#: builtin/merge.c:297 builtin/merge.c:314 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:335 +#: builtin/merge.c:344 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:346 +#: builtin/merge.c:355 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:396 +#: builtin/merge.c:405 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:447 +#: builtin/merge.c:456 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:537 +#: builtin/merge.c:546 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:656 +#: builtin/merge.c:666 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:670 +#: builtin/merge.c:680 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:685 +#: builtin/merge.c:695 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:737 +#: builtin/merge.c:747 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:746 +#: builtin/merge.c:756 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:752 +#: builtin/merge.c:762 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9130,240 +9625,230 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:776 +#: builtin/merge.c:798 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:796 +#: builtin/merge.c:818 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:851 +#: builtin/merge.c:871 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:867 -#, c-format -msgid "'%s' is not a commit" -msgstr "" - -#: builtin/merge.c:908 +#: builtin/merge.c:910 msgid "No current branch." msgstr "" -#: builtin/merge.c:910 +#: builtin/merge.c:912 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:912 +#: builtin/merge.c:914 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:917 +#: builtin/merge.c:919 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:964 +#: builtin/merge.c:972 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1038 -#, c-format -msgid "could not close '%s'" -msgstr "" - -#: builtin/merge.c:1065 +#: builtin/merge.c:1073 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1099 +#: builtin/merge.c:1107 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1167 +#: builtin/merge.c:1172 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1171 +#: builtin/merge.c:1176 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1183 +#: builtin/merge.c:1188 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1187 +#: builtin/merge.c:1192 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1203 +#: builtin/merge.c:1208 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1210 +#: builtin/merge.c:1215 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1213 +#: builtin/merge.c:1218 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1222 +#: builtin/merge.c:1227 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1230 +#: builtin/merge.c:1235 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1247 +#: builtin/merge.c:1252 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1249 +#: builtin/merge.c:1254 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1254 +#: builtin/merge.c:1259 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1256 +#: builtin/merge.c:1261 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1312 +#: builtin/merge.c:1295 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1315 +#: builtin/merge.c:1298 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1318 +#: builtin/merge.c:1301 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1321 +#: builtin/merge.c:1304 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1383 +#: builtin/merge.c:1366 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1392 -msgid "Already up-to-date." +#: builtin/merge.c:1375 +msgid "Already up to date." msgstr "" -#: builtin/merge.c:1402 +#: builtin/merge.c:1385 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1443 +#: builtin/merge.c:1426 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1450 +#: builtin/merge.c:1433 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1475 -msgid "Already up-to-date. Yeeah!" +#: builtin/merge.c:1458 +msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1481 +#: builtin/merge.c:1464 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1504 builtin/merge.c:1583 +#: builtin/merge.c:1487 builtin/merge.c:1566 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1508 +#: builtin/merge.c:1491 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1574 +#: builtin/merge.c:1557 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1576 +#: builtin/merge.c:1559 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1585 +#: builtin/merge.c:1568 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1597 +#: builtin/merge.c:1580 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:30 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "" -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "" -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:32 msgid "git merge-base --independent <commit>..." msgstr "" -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:33 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "" -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:34 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "" -#: builtin/merge-base.c:217 +#: builtin/merge-base.c:218 msgid "output all common ancestors" msgstr "" -#: builtin/merge-base.c:219 +#: builtin/merge-base.c:220 msgid "find ancestors for a single n-way merge" msgstr "" -#: builtin/merge-base.c:221 +#: builtin/merge-base.c:222 msgid "list revs not reachable from others" msgstr "" -#: builtin/merge-base.c:223 +#: builtin/merge-base.c:224 msgid "is the first one ancestor of the other?" msgstr "" -#: builtin/merge-base.c:225 +#: builtin/merge-base.c:226 msgid "find where <commit> forked from reflog of <ref>" msgstr "" -#: builtin/merge-file.c:8 +#: builtin/merge-file.c:9 msgid "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" @@ -9436,41 +9921,41 @@ msgstr "" msgid "git mktree [-z] [--missing] [--batch]" msgstr "" -#: builtin/mktree.c:152 +#: builtin/mktree.c:153 msgid "input is NUL terminated" msgstr "" -#: builtin/mktree.c:153 builtin/write-tree.c:24 +#: builtin/mktree.c:154 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "" -#: builtin/mktree.c:154 +#: builtin/mktree.c:155 msgid "allow creation of more than one tree" msgstr "" -#: builtin/mv.c:16 +#: builtin/mv.c:17 msgid "git mv [<options>] <source>... <destination>" msgstr "" -#: builtin/mv.c:82 +#: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "" -#: builtin/mv.c:84 builtin/rm.c:290 +#: builtin/mv.c:85 builtin/rm.c:289 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" -#: builtin/mv.c:102 +#: builtin/mv.c:103 #, c-format msgid "%.*s is in index" msgstr "" -#: builtin/mv.c:124 +#: builtin/mv.c:125 msgid "force move/rename even if target exists" msgstr "" -#: builtin/mv.c:125 +#: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "" @@ -9535,405 +10020,410 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 +#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:257 +#: builtin/name-rev.c:338 msgid "git name-rev [<options>] <commit>..." msgstr "" -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:339 msgid "git name-rev [<options>] --all" msgstr "" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:340 msgid "git name-rev [<options>] --stdin" msgstr "" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:395 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:396 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:398 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:400 +msgid "ignore refs matching <pattern>" +msgstr "" + +#: builtin/name-rev.c:402 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:403 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:404 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:324 +#: builtin/name-rev.c:410 msgid "dereference tags in the input (internal use)" msgstr "" -#: builtin/notes.c:25 +#: builtin/notes.c:26 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "" -#: builtin/notes.c:26 +#: builtin/notes.c:27 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" -#: builtin/notes.c:27 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" -#: builtin/notes.c:28 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" -#: builtin/notes.c:29 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "" -#: builtin/notes.c:30 +#: builtin/notes.c:31 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "" -#: builtin/notes.c:31 +#: builtin/notes.c:32 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -#: builtin/notes.c:32 +#: builtin/notes.c:33 msgid "git notes merge --commit [-v | -q]" msgstr "" -#: builtin/notes.c:33 +#: builtin/notes.c:34 msgid "git notes merge --abort [-v | -q]" msgstr "" -#: builtin/notes.c:34 +#: builtin/notes.c:35 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "" -#: builtin/notes.c:35 +#: builtin/notes.c:36 msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "" -#: builtin/notes.c:36 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "" -#: builtin/notes.c:41 +#: builtin/notes.c:42 msgid "git notes [list [<object>]]" msgstr "" -#: builtin/notes.c:46 +#: builtin/notes.c:47 msgid "git notes add [<options>] [<object>]" msgstr "" -#: builtin/notes.c:51 +#: builtin/notes.c:52 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "" -#: builtin/notes.c:52 +#: builtin/notes.c:53 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "" -#: builtin/notes.c:57 +#: builtin/notes.c:58 msgid "git notes append [<options>] [<object>]" msgstr "" -#: builtin/notes.c:62 +#: builtin/notes.c:63 msgid "git notes edit [<object>]" msgstr "" -#: builtin/notes.c:67 +#: builtin/notes.c:68 msgid "git notes show [<object>]" msgstr "" -#: builtin/notes.c:72 +#: builtin/notes.c:73 msgid "git notes merge [<options>] <notes-ref>" msgstr "" -#: builtin/notes.c:73 +#: builtin/notes.c:74 msgid "git notes merge --commit [<options>]" msgstr "" -#: builtin/notes.c:74 +#: builtin/notes.c:75 msgid "git notes merge --abort [<options>]" msgstr "" -#: builtin/notes.c:79 +#: builtin/notes.c:80 msgid "git notes remove [<object>]" msgstr "" -#: builtin/notes.c:84 +#: builtin/notes.c:85 msgid "git notes prune [<options>]" msgstr "" -#: builtin/notes.c:89 +#: builtin/notes.c:90 msgid "git notes get-ref" msgstr "" -#: builtin/notes.c:94 +#: builtin/notes.c:95 msgid "Write/edit the notes for the following object:" msgstr "" -#: builtin/notes.c:147 +#: builtin/notes.c:148 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:151 +#: builtin/notes.c:152 msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:159 +#: builtin/notes.c:160 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:194 +#: builtin/notes.c:195 msgid "please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:203 +#: builtin/notes.c:204 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:205 +#: builtin/notes.c:206 #, c-format msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:233 builtin/tag.c:460 +#: builtin/notes.c:234 builtin/tag.c:500 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:235 builtin/tag.c:463 +#: builtin/notes.c:236 builtin/tag.c:503 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 -#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 -#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 +#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 +#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:257 +#: builtin/notes.c:258 #, c-format msgid "failed to read object '%s'." msgstr "" -#: builtin/notes.c:261 +#: builtin/notes.c:262 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "" -#: builtin/notes.c:301 +#: builtin/notes.c:302 #, c-format msgid "malformed input line: '%s'." msgstr "" -#: builtin/notes.c:316 +#: builtin/notes.c:317 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "" -#. TRANSLATORS: the first %s will be replaced by a -#. git notes command: 'add', 'merge', 'remove', etc. -#: builtin/notes.c:345 +#. TRANSLATORS: the first %s will be replaced by a git +#. notes command: 'add', 'merge', 'remove', etc. +#. +#: builtin/notes.c:349 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "" -#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 -#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 -#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 +#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 +#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 +#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 msgid "too many parameters" msgstr "" -#: builtin/notes.c:378 builtin/notes.c:665 +#: builtin/notes.c:382 builtin/notes.c:668 #, c-format msgid "no note found for object %s." msgstr "" -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:403 builtin/notes.c:566 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:406 builtin/notes.c:569 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:409 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:412 builtin/notes.c:575 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:415 builtin/notes.c:578 msgid "allow storing empty note" msgstr "" -#: builtin/notes.c:412 builtin/notes.c:483 +#: builtin/notes.c:416 builtin/notes.c:487 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:437 +#: builtin/notes.c:441 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:452 builtin/notes.c:531 +#: builtin/notes.c:456 builtin/notes.c:535 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889 +#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:484 +#: builtin/notes.c:488 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:486 +#: builtin/notes.c:490 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" -#: builtin/notes.c:504 +#: builtin/notes.c:508 msgid "too few parameters" msgstr "" -#: builtin/notes.c:525 +#: builtin/notes.c:529 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:537 +#: builtin/notes.c:541 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:589 +#: builtin/notes.c:593 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:685 +#: builtin/notes.c:688 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "" -#: builtin/notes.c:687 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "" -#: builtin/notes.c:689 +#: builtin/notes.c:692 msgid "failed to remove 'git notes merge' worktree" msgstr "" -#: builtin/notes.c:709 +#: builtin/notes.c:712 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "" -#: builtin/notes.c:711 +#: builtin/notes.c:714 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "" -#: builtin/notes.c:713 +#: builtin/notes.c:716 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "" -#: builtin/notes.c:726 +#: builtin/notes.c:729 msgid "failed to resolve NOTES_MERGE_REF" msgstr "" -#: builtin/notes.c:729 +#: builtin/notes.c:732 msgid "failed to finalize notes merge" msgstr "" -#: builtin/notes.c:755 +#: builtin/notes.c:758 #, c-format msgid "unknown notes merge strategy %s" msgstr "" -#: builtin/notes.c:771 +#: builtin/notes.c:774 msgid "General options" msgstr "" -#: builtin/notes.c:773 +#: builtin/notes.c:776 msgid "Merge options" msgstr "" -#: builtin/notes.c:775 +#: builtin/notes.c:778 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:777 +#: builtin/notes.c:780 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:779 +#: builtin/notes.c:782 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:781 +#: builtin/notes.c:784 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:783 +#: builtin/notes.c:786 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:794 +#: builtin/notes.c:797 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "" -#: builtin/notes.c:799 +#: builtin/notes.c:802 msgid "must specify a notes ref to merge" msgstr "" -#: builtin/notes.c:823 +#: builtin/notes.c:826 #, c-format msgid "unknown -s/--strategy: %s" msgstr "" -#: builtin/notes.c:860 +#: builtin/notes.c:863 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "" -#: builtin/notes.c:863 +#: builtin/notes.c:866 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" -#: builtin/notes.c:865 +#: builtin/notes.c:868 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -9941,218 +10431,218 @@ msgid "" "abort'.\n" msgstr "" -#: builtin/notes.c:887 +#: builtin/notes.c:890 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:899 +#: builtin/notes.c:902 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:902 +#: builtin/notes.c:905 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "" -#: builtin/notes.c:941 +#: builtin/notes.c:944 msgid "report pruned notes" msgstr "" -#: builtin/notes.c:983 +#: builtin/notes.c:986 msgid "notes-ref" msgstr "" -#: builtin/notes.c:984 +#: builtin/notes.c:987 msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1019 +#: builtin/notes.c:1022 #, c-format msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:31 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:30 +#: builtin/pack-objects.c:32 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:766 +#: builtin/pack-objects.c:777 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:779 +#: builtin/pack-objects.c:790 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1068 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2344 +#: builtin/pack-objects.c:2440 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2747 +#: builtin/pack-objects.c:2849 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2751 +#: builtin/pack-objects.c:2853 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2781 +#: builtin/pack-objects.c:2883 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2885 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2785 +#: builtin/pack-objects.c:2887 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2788 +#: builtin/pack-objects.c:2890 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2789 +#: builtin/pack-objects.c:2891 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2790 +#: builtin/pack-objects.c:2892 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2793 +#: builtin/pack-objects.c:2895 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2897 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2797 +#: builtin/pack-objects.c:2899 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2799 +#: builtin/pack-objects.c:2901 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2903 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2803 +#: builtin/pack-objects.c:2905 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2907 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2909 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2809 +#: builtin/pack-objects.c:2911 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2811 +#: builtin/pack-objects.c:2913 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2813 +#: builtin/pack-objects.c:2915 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2815 +#: builtin/pack-objects.c:2917 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2817 +#: builtin/pack-objects.c:2919 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2820 +#: builtin/pack-objects.c:2922 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2823 +#: builtin/pack-objects.c:2925 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2826 +#: builtin/pack-objects.c:2928 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2931 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2831 +#: builtin/pack-objects.c:2933 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2833 +#: builtin/pack-objects.c:2935 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2835 +#: builtin/pack-objects.c:2937 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:2837 +#: builtin/pack-objects.c:2939 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2840 +#: builtin/pack-objects.c:2942 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2842 +#: builtin/pack-objects.c:2944 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2844 +#: builtin/pack-objects.c:2946 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2846 +#: builtin/pack-objects.c:2948 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2848 +#: builtin/pack-objects.c:2950 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2850 +#: builtin/pack-objects.c:2952 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2852 +#: builtin/pack-objects.c:2954 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:2979 +#: builtin/pack-objects.c:3081 msgid "Counting objects" msgstr "" @@ -10168,11 +10658,11 @@ msgstr "" msgid "prune loose refs (default)" msgstr "" -#: builtin/prune-packed.c:7 +#: builtin/prune-packed.c:8 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "" -#: builtin/prune-packed.c:40 +#: builtin/prune-packed.c:41 msgid "Removing duplicate objects" msgstr "" @@ -10192,62 +10682,66 @@ msgstr "" msgid "cannot prune in a precious-objects repo" msgstr "" -#: builtin/pull.c:51 builtin/pull.c:53 +#: builtin/pull.c:54 builtin/pull.c:56 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: builtin/pull.c:73 +#: builtin/pull.c:76 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/pull.c:121 +#: builtin/pull.c:124 +msgid "control for recursive fetching of submodules" +msgstr "" + +#: builtin/pull.c:128 msgid "Options related to merging" msgstr "" -#: builtin/pull.c:124 +#: builtin/pull.c:131 msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:148 builtin/revert.c:101 +#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 msgid "allow fast-forward" msgstr "" -#: builtin/pull.c:157 +#: builtin/pull.c:164 msgid "automatically stash/stash pop before and after rebase" msgstr "" -#: builtin/pull.c:173 +#: builtin/pull.c:180 msgid "Options related to fetching" msgstr "" -#: builtin/pull.c:195 +#: builtin/pull.c:198 msgid "number of submodules pulled in parallel" msgstr "" -#: builtin/pull.c:284 +#: builtin/pull.c:287 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:397 +#: builtin/pull.c:403 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:399 +#: builtin/pull.c:405 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:400 +#: builtin/pull.c:406 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:403 +#: builtin/pull.c:409 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -10255,69 +10749,69 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:408 git-parse-remote.sh:73 +#: builtin/pull.c:414 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 +#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 +#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:413 builtin/pull.c:428 +#: builtin/pull.c:419 builtin/pull.c:434 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 +#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 +#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "" -#: builtin/pull.c:423 git-parse-remote.sh:75 +#: builtin/pull.c:429 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:432 git-parse-remote.sh:95 +#: builtin/pull.c:438 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" -#: builtin/pull.c:437 +#: builtin/pull.c:443 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" -#: builtin/pull.c:754 +#: builtin/pull.c:796 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:801 +#: builtin/pull.c:844 msgid "--[no-]autostash option is only valid with --rebase." msgstr "" -#: builtin/pull.c:809 +#: builtin/pull.c:852 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:812 +#: builtin/pull.c:855 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:813 +#: builtin/pull.c:856 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:838 +#: builtin/pull.c:881 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -10325,7 +10819,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:843 +#: builtin/pull.c:886 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -10336,33 +10830,37 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:858 +#: builtin/pull.c:901 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:862 +#: builtin/pull.c:905 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/push.c:16 +#: builtin/pull.c:912 +msgid "cannot rebase with locally recorded submodule modifications" +msgstr "" + +#: builtin/push.c:17 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/push.c:89 +#: builtin/push.c:90 msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:99 +#: builtin/push.c:100 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:143 +#: builtin/push.c:144 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:146 +#: builtin/push.c:147 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -10377,7 +10875,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:161 +#: builtin/push.c:162 #, c-format msgid "" "You are not currently on a branch.\n" @@ -10387,7 +10885,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:175 +#: builtin/push.c:176 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -10396,12 +10894,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:183 +#: builtin/push.c:184 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:186 +#: builtin/push.c:187 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -10409,12 +10907,12 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:245 +#: builtin/push.c:246 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:252 +#: builtin/push.c:253 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -10422,7 +10920,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:258 +#: builtin/push.c:259 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -10430,7 +10928,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:264 +#: builtin/push.c:265 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -10439,33 +10937,33 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:271 +#: builtin/push.c:272 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:274 +#: builtin/push.c:275 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" -#: builtin/push.c:334 +#: builtin/push.c:335 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:338 +#: builtin/push.c:339 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:369 +#: builtin/push.c:370 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:370 +#: builtin/push.c:371 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -10478,191 +10976,231 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:388 +#: builtin/push.c:389 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:389 +#: builtin/push.c:390 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:394 +#: builtin/push.c:395 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:395 +#: builtin/push.c:396 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:400 +#: builtin/push.c:401 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:518 +#: builtin/push.c:523 msgid "repository" msgstr "" -#: builtin/push.c:519 builtin/send-pack.c:161 +#: builtin/push.c:524 builtin/send-pack.c:163 msgid "push all refs" msgstr "" -#: builtin/push.c:520 builtin/send-pack.c:163 +#: builtin/push.c:525 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "" -#: builtin/push.c:522 +#: builtin/push.c:527 msgid "delete refs" msgstr "" -#: builtin/push.c:523 +#: builtin/push.c:528 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:526 builtin/send-pack.c:164 +#: builtin/push.c:531 builtin/send-pack.c:166 msgid "force updates" msgstr "" -#: builtin/push.c:528 builtin/send-pack.c:175 +#: builtin/push.c:533 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "" -#: builtin/push.c:529 builtin/send-pack.c:176 +#: builtin/push.c:534 builtin/send-pack.c:181 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:532 +#: builtin/push.c:537 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:534 builtin/send-pack.c:169 +#: builtin/push.c:539 builtin/send-pack.c:174 msgid "use thin pack" msgstr "" -#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158 -#: builtin/send-pack.c:159 +#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/send-pack.c:161 msgid "receive pack program" msgstr "" -#: builtin/push.c:537 +#: builtin/push.c:542 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:540 +#: builtin/push.c:545 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:542 +#: builtin/push.c:547 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:543 +#: builtin/push.c:548 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:546 builtin/send-pack.c:166 +#: builtin/push.c:551 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:548 builtin/send-pack.c:170 +#: builtin/push.c:553 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:549 +#: builtin/push.c:554 builtin/send-pack.c:171 msgid "server-specific" msgstr "" -#: builtin/push.c:549 +#: builtin/push.c:554 builtin/send-pack.c:172 msgid "option to transmit" msgstr "" -#: builtin/push.c:563 +#: builtin/push.c:568 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:565 +#: builtin/push.c:570 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/push.c:584 +#: builtin/push.c:589 msgid "push options must not have new line characters" msgstr "" -#: builtin/read-tree.c:37 +#: builtin/read-tree.c:40 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -#: builtin/read-tree.c:110 +#: builtin/read-tree.c:121 msgid "write resulting index to <file>" msgstr "" -#: builtin/read-tree.c:113 +#: builtin/read-tree.c:124 msgid "only empty the index" msgstr "" -#: builtin/read-tree.c:115 +#: builtin/read-tree.c:126 msgid "Merging" msgstr "" -#: builtin/read-tree.c:117 +#: builtin/read-tree.c:128 msgid "perform a merge in addition to a read" msgstr "" -#: builtin/read-tree.c:119 +#: builtin/read-tree.c:130 msgid "3-way merge if no file level merging required" msgstr "" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:132 msgid "3-way merge in presence of adds and removes" msgstr "" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:134 msgid "same as -m, but discard unmerged entries" msgstr "" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:135 msgid "<subdirectory>/" msgstr "" -#: builtin/read-tree.c:125 +#: builtin/read-tree.c:136 msgid "read the tree into the index under <subdirectory>/" msgstr "" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:139 msgid "update working tree with merge result" msgstr "" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:141 msgid "gitignore" msgstr "" -#: builtin/read-tree.c:131 +#: builtin/read-tree.c:142 msgid "allow explicitly ignored files to be overwritten" msgstr "" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:145 msgid "don't check the working tree after merging" msgstr "" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:146 msgid "don't update the index or the work tree" msgstr "" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:148 msgid "skip applying sparse checkout filter" msgstr "" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:150 msgid "debug unpack-trees" msgstr "" -#: builtin/receive-pack.c:26 +#: builtin/rebase--helper.c:8 +msgid "git rebase--helper [<options>]" +msgstr "" + +#: builtin/rebase--helper.c:22 +msgid "keep empty commits" +msgstr "" + +#: builtin/rebase--helper.c:23 +msgid "continue rebase" +msgstr "" + +#: builtin/rebase--helper.c:25 +msgid "abort rebase" +msgstr "" + +#: builtin/rebase--helper.c:28 +msgid "make rebase script" +msgstr "" + +#: builtin/rebase--helper.c:30 +msgid "shorten SHA-1s in the todo list" +msgstr "" + +#: builtin/rebase--helper.c:32 +msgid "expand SHA-1s in the todo list" +msgstr "" + +#: builtin/rebase--helper.c:34 +msgid "check the todo list" +msgstr "" + +#: builtin/rebase--helper.c:36 +msgid "skip unnecessary picks" +msgstr "" + +#: builtin/rebase--helper.c:38 +msgid "rearrange fixup/squash lines" +msgstr "" + +#: builtin/receive-pack.c:29 msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:793 +#: builtin/receive-pack.c:839 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -10679,7 +11217,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:813 +#: builtin/receive-pack.c:859 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -10691,194 +11229,194 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:1883 +#: builtin/receive-pack.c:1932 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:1897 +#: builtin/receive-pack.c:1946 msgid "You must specify a directory." msgstr "" -#: builtin/reflog.c:423 +#: builtin/reflog.c:424 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: builtin/reflog.c:540 builtin/reflog.c:545 +#: builtin/reflog.c:541 builtin/reflog.c:546 #, c-format msgid "'%s' is not a valid timestamp" msgstr "" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "git remote [-v | --verbose]" msgstr "" -#: builtin/remote.c:13 +#: builtin/remote.c:14 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -#: builtin/remote.c:14 builtin/remote.c:34 +#: builtin/remote.c:15 builtin/remote.c:35 msgid "git remote rename <old> <new>" msgstr "" -#: builtin/remote.c:15 builtin/remote.c:39 +#: builtin/remote.c:16 builtin/remote.c:40 msgid "git remote remove <name>" msgstr "" -#: builtin/remote.c:16 builtin/remote.c:44 +#: builtin/remote.c:17 builtin/remote.c:45 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "git remote prune [-n | --dry-run] <name>" msgstr "" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" -#: builtin/remote.c:20 +#: builtin/remote.c:21 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "" -#: builtin/remote.c:21 builtin/remote.c:70 +#: builtin/remote.c:22 builtin/remote.c:71 msgid "git remote get-url [--push] [--all] <name>" msgstr "" -#: builtin/remote.c:22 builtin/remote.c:75 +#: builtin/remote.c:23 builtin/remote.c:76 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url --add <name> <newurl>" msgstr "" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url --delete <name> <url>" msgstr "" -#: builtin/remote.c:29 +#: builtin/remote.c:30 msgid "git remote add [<options>] <name> <url>" msgstr "" -#: builtin/remote.c:49 +#: builtin/remote.c:50 msgid "git remote set-branches <name> <branch>..." msgstr "" -#: builtin/remote.c:50 +#: builtin/remote.c:51 msgid "git remote set-branches --add <name> <branch>..." msgstr "" -#: builtin/remote.c:55 +#: builtin/remote.c:56 msgid "git remote show [<options>] <name>" msgstr "" -#: builtin/remote.c:60 +#: builtin/remote.c:61 msgid "git remote prune [<options>] <name>" msgstr "" -#: builtin/remote.c:65 +#: builtin/remote.c:66 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "" -#: builtin/remote.c:94 +#: builtin/remote.c:95 #, c-format msgid "Updating %s" msgstr "" -#: builtin/remote.c:126 +#: builtin/remote.c:127 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -#: builtin/remote.c:143 +#: builtin/remote.c:144 #, c-format msgid "unknown mirror argument: %s" msgstr "" -#: builtin/remote.c:159 +#: builtin/remote.c:160 msgid "fetch the remote branches" msgstr "" -#: builtin/remote.c:161 +#: builtin/remote.c:162 msgid "import all tags and associated objects when fetching" msgstr "" -#: builtin/remote.c:164 +#: builtin/remote.c:165 msgid "or do not fetch any tag at all (--no-tags)" msgstr "" -#: builtin/remote.c:166 +#: builtin/remote.c:167 msgid "branch(es) to track" msgstr "" -#: builtin/remote.c:167 +#: builtin/remote.c:168 msgid "master branch" msgstr "" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "push|fetch" msgstr "" -#: builtin/remote.c:169 +#: builtin/remote.c:170 msgid "set up remote as a mirror to push to or fetch from" msgstr "" -#: builtin/remote.c:181 +#: builtin/remote.c:182 msgid "specifying a master branch makes no sense with --mirror" msgstr "" -#: builtin/remote.c:183 +#: builtin/remote.c:184 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:190 builtin/remote.c:629 +#: builtin/remote.c:191 builtin/remote.c:631 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:194 builtin/remote.c:633 +#: builtin/remote.c:195 builtin/remote.c:635 #, c-format msgid "'%s' is not a valid remote name" msgstr "" -#: builtin/remote.c:234 +#: builtin/remote.c:235 #, c-format msgid "Could not setup master '%s'" msgstr "" -#: builtin/remote.c:336 +#: builtin/remote.c:337 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" -#: builtin/remote.c:437 builtin/remote.c:445 +#: builtin/remote.c:438 builtin/remote.c:446 msgid "(matching)" msgstr "" -#: builtin/remote.c:449 +#: builtin/remote.c:450 msgid "(delete)" msgstr "" -#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854 +#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 #, c-format msgid "No such remote: %s" msgstr "" -#: builtin/remote.c:639 +#: builtin/remote.c:641 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:659 +#: builtin/remote.c:661 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -10886,17 +11424,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:695 +#: builtin/remote.c:697 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:729 +#: builtin/remote.c:731 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:792 +#: builtin/remote.c:796 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -10906,629 +11444,635 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:806 +#: builtin/remote.c:810 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:907 +#: builtin/remote.c:911 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:910 +#: builtin/remote.c:914 msgid " tracked" msgstr "" -#: builtin/remote.c:912 +#: builtin/remote.c:916 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:914 +#: builtin/remote.c:918 msgid " ???" msgstr "" -#: builtin/remote.c:955 +#: builtin/remote.c:959 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:963 +#: builtin/remote.c:967 #, c-format msgid "rebases interactively onto remote %s" msgstr "" -#: builtin/remote.c:964 +#: builtin/remote.c:968 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:967 +#: builtin/remote.c:971 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:970 +#: builtin/remote.c:974 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:973 +#: builtin/remote.c:977 #, c-format msgid "%-*s and with remote %s\n" msgstr "" -#: builtin/remote.c:1016 +#: builtin/remote.c:1020 msgid "create" msgstr "" -#: builtin/remote.c:1019 +#: builtin/remote.c:1023 msgid "delete" msgstr "" -#: builtin/remote.c:1023 +#: builtin/remote.c:1027 msgid "up to date" msgstr "" -#: builtin/remote.c:1026 +#: builtin/remote.c:1030 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1029 +#: builtin/remote.c:1033 msgid "local out of date" msgstr "" -#: builtin/remote.c:1036 +#: builtin/remote.c:1040 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1039 +#: builtin/remote.c:1043 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1043 +#: builtin/remote.c:1047 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1046 +#: builtin/remote.c:1050 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1114 +#: builtin/remote.c:1118 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1141 +#: builtin/remote.c:1145 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1142 +#: builtin/remote.c:1146 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295 +#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 msgid "(no URL)" msgstr "" -#. TRANSLATORS: the colon ':' should align with -#. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1154 builtin/remote.c:1156 +#. TRANSLATORS: the colon ':' should align +#. with the one in " Fetch URL: %s" +#. translation. +#. +#: builtin/remote.c:1161 builtin/remote.c:1163 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162 +#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1158 +#: builtin/remote.c:1165 msgid "(not queried)" msgstr "" -#: builtin/remote.c:1160 +#: builtin/remote.c:1167 msgid "(unknown)" msgstr "" -#: builtin/remote.c:1164 +#: builtin/remote.c:1171 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1176 +#: builtin/remote.c:1183 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1179 builtin/remote.c:1205 +#: builtin/remote.c:1186 builtin/remote.c:1212 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1188 +#: builtin/remote.c:1195 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1196 +#: builtin/remote.c:1203 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1202 +#: builtin/remote.c:1209 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1223 +#: builtin/remote.c:1230 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1225 +#: builtin/remote.c:1232 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1240 +#: builtin/remote.c:1247 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1242 +#: builtin/remote.c:1249 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1252 +#: builtin/remote.c:1259 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1260 +#: builtin/remote.c:1267 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1262 +#: builtin/remote.c:1269 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1280 +#: builtin/remote.c:1287 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1281 +#: builtin/remote.c:1288 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1291 +#: builtin/remote.c:1298 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1292 +#: builtin/remote.c:1299 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1308 +#: builtin/remote.c:1315 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1311 +#: builtin/remote.c:1318 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1356 +#: builtin/remote.c:1363 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541 +#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1435 +#: builtin/remote.c:1442 msgid "add branch" msgstr "" -#: builtin/remote.c:1442 +#: builtin/remote.c:1449 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1459 +#: builtin/remote.c:1466 msgid "query push URLs rather than fetch URLs" msgstr "" -#: builtin/remote.c:1461 +#: builtin/remote.c:1468 msgid "return all URLs" msgstr "" -#: builtin/remote.c:1489 +#: builtin/remote.c:1496 #, c-format msgid "no URLs configured for remote '%s'" msgstr "" -#: builtin/remote.c:1515 +#: builtin/remote.c:1522 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1517 +#: builtin/remote.c:1524 msgid "add URL" msgstr "" -#: builtin/remote.c:1519 +#: builtin/remote.c:1526 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1526 +#: builtin/remote.c:1533 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1567 +#: builtin/remote.c:1572 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1575 +#: builtin/remote.c:1580 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1577 +#: builtin/remote.c:1582 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1591 +#: builtin/remote.c:1598 msgid "be verbose; must be placed before a subcommand" msgstr "" -#: builtin/remote.c:1622 +#: builtin/remote.c:1629 #, c-format msgid "Unknown subcommand: %s" msgstr "" -#: builtin/repack.c:17 +#: builtin/repack.c:18 msgid "git repack [<options>]" msgstr "" -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -#: builtin/repack.c:166 +#: builtin/repack.c:168 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:168 +#: builtin/repack.c:170 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:171 +#: builtin/repack.c:173 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:173 +#: builtin/repack.c:175 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:175 +#: builtin/repack.c:177 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:177 +#: builtin/repack.c:179 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:180 +#: builtin/repack.c:182 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:182 +#: builtin/repack.c:184 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:183 +#: builtin/repack.c:185 msgid "approxidate" msgstr "" -#: builtin/repack.c:184 +#: builtin/repack.c:186 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:186 +#: builtin/repack.c:188 msgid "with -a, repack unreachable objects" msgstr "" -#: builtin/repack.c:188 +#: builtin/repack.c:190 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:189 builtin/repack.c:193 +#: builtin/repack.c:191 builtin/repack.c:197 msgid "bytes" msgstr "" -#: builtin/repack.c:190 +#: builtin/repack.c:192 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:192 +#: builtin/repack.c:194 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:194 +#: builtin/repack.c:196 +msgid "limits the maximum number of threads" +msgstr "" + +#: builtin/repack.c:198 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:196 +#: builtin/repack.c:200 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:206 +#: builtin/repack.c:210 msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:210 +#: builtin/repack.c:214 msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:400 builtin/worktree.c:115 +#: builtin/repack.c:406 builtin/worktree.c:134 #, c-format msgid "failed to remove '%s'" msgstr "" -#: builtin/replace.c:19 +#: builtin/replace.c:20 msgid "git replace [-f] <object> <replacement>" msgstr "" -#: builtin/replace.c:20 +#: builtin/replace.c:21 msgid "git replace [-f] --edit <object>" msgstr "" -#: builtin/replace.c:21 +#: builtin/replace.c:22 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "" -#: builtin/replace.c:22 +#: builtin/replace.c:23 msgid "git replace -d <object>..." msgstr "" -#: builtin/replace.c:23 +#: builtin/replace.c:24 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "" -#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 +#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 #, c-format msgid "Not a valid object name: '%s'" msgstr "" -#: builtin/replace.c:355 +#: builtin/replace.c:361 #, c-format msgid "bad mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:357 +#: builtin/replace.c:363 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:368 +#: builtin/replace.c:374 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "" -#: builtin/replace.c:401 +#: builtin/replace.c:407 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "" -#: builtin/replace.c:402 +#: builtin/replace.c:408 msgid "the signature will be removed in the replacement commit!" msgstr "" -#: builtin/replace.c:408 +#: builtin/replace.c:414 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "" -#: builtin/replace.c:432 +#: builtin/replace.c:438 msgid "list replace refs" msgstr "" -#: builtin/replace.c:433 +#: builtin/replace.c:439 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:434 +#: builtin/replace.c:440 msgid "edit existing object" msgstr "" -#: builtin/replace.c:435 +#: builtin/replace.c:441 msgid "change a commit's parents" msgstr "" -#: builtin/replace.c:436 +#: builtin/replace.c:442 msgid "replace the ref if it exists" msgstr "" -#: builtin/replace.c:437 +#: builtin/replace.c:443 msgid "do not pretty-print contents for --edit" msgstr "" -#: builtin/replace.c:438 +#: builtin/replace.c:444 msgid "use this format" msgstr "" -#: builtin/rerere.c:12 +#: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" -#: builtin/rerere.c:58 +#: builtin/rerere.c:59 msgid "register clean resolutions in index" msgstr "" -#: builtin/reset.c:26 +#: builtin/reset.c:29 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" -#: builtin/reset.c:27 +#: builtin/reset.c:30 msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgstr "" -#: builtin/reset.c:28 +#: builtin/reset.c:31 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "mixed" msgstr "" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "soft" msgstr "" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "hard" msgstr "" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "merge" msgstr "" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "keep" msgstr "" -#: builtin/reset.c:74 +#: builtin/reset.c:78 msgid "You do not have a valid HEAD." msgstr "" -#: builtin/reset.c:76 +#: builtin/reset.c:80 msgid "Failed to find tree of HEAD." msgstr "" -#: builtin/reset.c:82 +#: builtin/reset.c:86 #, c-format msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:100 +#: builtin/reset.c:113 #, c-format msgid "HEAD is now at %s" msgstr "" -#: builtin/reset.c:183 +#: builtin/reset.c:197 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:276 +#: builtin/reset.c:297 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:278 +#: builtin/reset.c:299 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:279 +#: builtin/reset.c:300 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:281 builtin/reset.c:283 +#: builtin/reset.c:302 builtin/reset.c:304 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:285 +#: builtin/reset.c:306 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:288 +#: builtin/reset.c:312 msgid "record only the fact that removed paths will be added later" msgstr "" -#: builtin/reset.c:305 +#: builtin/reset.c:329 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:313 +#: builtin/reset.c:337 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "" -#: builtin/reset.c:322 +#: builtin/reset.c:346 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:331 +#: builtin/reset.c:355 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:333 +#: builtin/reset.c:357 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:343 +#: builtin/reset.c:367 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:347 +#: builtin/reset.c:371 msgid "-N can only be used with --mixed" msgstr "" -#: builtin/reset.c:364 +#: builtin/reset.c:388 msgid "Unstaged changes after reset:" msgstr "" -#: builtin/reset.c:370 +#: builtin/reset.c:394 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/reset.c:374 +#: builtin/reset.c:398 msgid "Could not write new index file." msgstr "" -#: builtin/rev-list.c:354 +#: builtin/rev-list.c:361 msgid "rev-list does not support display of notes" msgstr "" -#: builtin/rev-parse.c:391 +#: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:396 +#: builtin/rev-parse.c:407 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:398 +#: builtin/rev-parse.c:409 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:401 +#: builtin/rev-parse.c:412 msgid "output in stuck long form" msgstr "" -#: builtin/rev-parse.c:532 +#: builtin/rev-parse.c:545 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -11537,92 +12081,96 @@ msgid "" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -#: builtin/revert.c:22 +#: builtin/revert.c:23 msgid "git revert [<options>] <commit-ish>..." msgstr "" -#: builtin/revert.c:23 +#: builtin/revert.c:24 msgid "git revert <subcommand>" msgstr "" -#: builtin/revert.c:28 +#: builtin/revert.c:29 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "" -#: builtin/revert.c:29 +#: builtin/revert.c:30 msgid "git cherry-pick <subcommand>" msgstr "" -#: builtin/revert.c:71 +#: builtin/revert.c:90 #, c-format msgid "%s: %s cannot be used with %s" msgstr "" -#: builtin/revert.c:80 +#: builtin/revert.c:99 msgid "end revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:81 +#: builtin/revert.c:100 msgid "resume revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:82 +#: builtin/revert.c:101 msgid "cancel revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:83 +#: builtin/revert.c:102 msgid "don't automatically commit" msgstr "" -#: builtin/revert.c:84 +#: builtin/revert.c:103 msgid "edit the commit message" msgstr "" -#: builtin/revert.c:87 -msgid "parent number" +#: builtin/revert.c:106 +msgid "parent-number" msgstr "" -#: builtin/revert.c:89 +#: builtin/revert.c:107 +msgid "select mainline parent" +msgstr "" + +#: builtin/revert.c:109 msgid "merge strategy" msgstr "" -#: builtin/revert.c:90 +#: builtin/revert.c:110 msgid "option" msgstr "" -#: builtin/revert.c:91 +#: builtin/revert.c:111 msgid "option for merge strategy" msgstr "" -#: builtin/revert.c:100 +#: builtin/revert.c:120 msgid "append commit name" msgstr "" -#: builtin/revert.c:102 +#: builtin/revert.c:122 msgid "preserve initially empty commits" msgstr "" -#: builtin/revert.c:103 +#: builtin/revert.c:123 msgid "allow commits with empty messages" msgstr "" -#: builtin/revert.c:104 +#: builtin/revert.c:124 msgid "keep redundant, empty commits" msgstr "" -#: builtin/revert.c:192 +#: builtin/revert.c:214 msgid "revert failed" msgstr "" -#: builtin/revert.c:205 +#: builtin/revert.c:227 msgid "cherry-pick failed" msgstr "" -#: builtin/rm.c:17 +#: builtin/rm.c:18 msgid "git rm [<options>] [--] <file>..." msgstr "" -#: builtin/rm.c:205 +#: builtin/rm.c:206 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -11632,66 +12180,66 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:210 +#: builtin/rm.c:211 msgid "" "\n" "(use -f to force removal)" msgstr "" -#: builtin/rm.c:214 +#: builtin/rm.c:215 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:218 builtin/rm.c:227 +#: builtin/rm.c:219 builtin/rm.c:228 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:224 +#: builtin/rm.c:225 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:308 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:347 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "" -#: builtin/rm.c:370 +#: builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "" -#: builtin/send-pack.c:18 +#: builtin/send-pack.c:19 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " @@ -11699,51 +12247,51 @@ msgid "" " --all and explicit <ref> specification are mutually exclusive." msgstr "" -#: builtin/send-pack.c:160 +#: builtin/send-pack.c:162 msgid "remote name" msgstr "" -#: builtin/send-pack.c:171 +#: builtin/send-pack.c:176 msgid "use stateless RPC protocol" msgstr "" -#: builtin/send-pack.c:172 +#: builtin/send-pack.c:177 msgid "read refs from stdin" msgstr "" -#: builtin/send-pack.c:173 +#: builtin/send-pack.c:178 msgid "print status from remote helper" msgstr "" -#: builtin/shortlog.c:13 +#: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "" -#: builtin/shortlog.c:249 +#: builtin/shortlog.c:263 msgid "Group by committer rather than author" msgstr "" -#: builtin/shortlog.c:251 +#: builtin/shortlog.c:265 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:267 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:269 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:270 msgid "w[,i1[,i2]]" msgstr "" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:271 msgid "Linewrap output" msgstr "" -#: builtin/show-branch.c:10 +#: builtin/show-branch.c:12 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -11751,124 +12299,124 @@ msgid "" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -#: builtin/show-branch.c:14 +#: builtin/show-branch.c:16 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "" -#: builtin/show-branch.c:375 +#: builtin/show-branch.c:376 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "" msgstr[1] "" -#: builtin/show-branch.c:541 +#: builtin/show-branch.c:530 #, c-format msgid "no matching refs with %s" msgstr "" -#: builtin/show-branch.c:639 +#: builtin/show-branch.c:626 msgid "show remote-tracking and local branches" msgstr "" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:628 msgid "show remote-tracking branches" msgstr "" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:630 msgid "color '*!+-' corresponding to the branch" msgstr "" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:632 msgid "show <n> more commits after the common ancestor" msgstr "" -#: builtin/show-branch.c:647 +#: builtin/show-branch.c:634 msgid "synonym to more=-1" msgstr "" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:635 msgid "suppress naming strings" msgstr "" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:637 msgid "include the current branch" msgstr "" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:639 msgid "name commits with their object names" msgstr "" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:641 msgid "show possible merge bases" msgstr "" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:643 msgid "show refs unreachable from any other ref" msgstr "" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:645 msgid "show commits in topological order" msgstr "" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:648 msgid "show only commits not on the first branch" msgstr "" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:650 msgid "show merges reachable from only one tip" msgstr "" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:652 msgid "topologically sort, maintaining date order where possible" msgstr "" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:655 msgid "<n>[,<base>]" msgstr "" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:656 msgid "show <n> most recent ref-log entries starting at base" msgstr "" -#: builtin/show-branch.c:703 +#: builtin/show-branch.c:690 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" -#: builtin/show-branch.c:727 +#: builtin/show-branch.c:714 msgid "no branches given, and HEAD is not valid" msgstr "" -#: builtin/show-branch.c:730 +#: builtin/show-branch.c:717 msgid "--reflog option needs one branch name" msgstr "" -#: builtin/show-branch.c:733 +#: builtin/show-branch.c:720 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "" msgstr[1] "" -#: builtin/show-branch.c:737 +#: builtin/show-branch.c:724 #, c-format msgid "no such ref %s" msgstr "" -#: builtin/show-branch.c:829 +#: builtin/show-branch.c:808 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "" msgstr[1] "" -#: builtin/show-branch.c:833 +#: builtin/show-branch.c:812 #, c-format msgid "'%s' is not a valid ref." msgstr "" -#: builtin/show-branch.c:836 +#: builtin/show-branch.c:815 #, c-format msgid "cannot find commit %s (%s)" msgstr "" @@ -11915,28 +12463,28 @@ msgstr "" msgid "show refs from stdin that aren't in local repository" msgstr "" -#: builtin/stripspace.c:17 +#: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "" -#: builtin/stripspace.c:18 +#: builtin/stripspace.c:19 msgid "git stripspace [-c | --comment-lines]" msgstr "" -#: builtin/stripspace.c:35 +#: builtin/stripspace.c:36 msgid "skip and remove all lines starting with comment character" msgstr "" -#: builtin/stripspace.c:38 +#: builtin/stripspace.c:39 msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 #, c-format msgid "No such ref: %s" msgstr "" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 #, c-format msgid "Expecting a full ref name, got %s" msgstr "" @@ -11946,216 +12494,209 @@ msgstr "" msgid "cannot strip one component off url '%s'" msgstr "" -#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592 +#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 msgid "alternative anchor for relative paths" msgstr "" -#: builtin/submodule--helper.c:287 +#: builtin/submodule--helper.c:307 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347 +#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "" -#: builtin/submodule--helper.c:373 +#: builtin/submodule--helper.c:389 +#, c-format +msgid "" +"could not lookup configuration '%s'. Assuming this repository is its own " +"authoritative upstream." +msgstr "" + +#: builtin/submodule--helper.c:400 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:377 +#: builtin/submodule--helper.c:404 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:387 +#: builtin/submodule--helper.c:414 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" -#: builtin/submodule--helper.c:394 +#: builtin/submodule--helper.c:421 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:410 +#: builtin/submodule--helper.c:437 msgid "Suppress output for initializing a submodule" msgstr "" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:442 msgid "git submodule--helper init [<path>]" msgstr "" -#: builtin/submodule--helper.c:436 +#: builtin/submodule--helper.c:470 msgid "git submodule--helper name <path>" msgstr "" -#: builtin/submodule--helper.c:442 +#: builtin/submodule--helper.c:475 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" -#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "" -#: builtin/submodule--helper.c:564 +#: builtin/submodule--helper.c:597 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" -#: builtin/submodule--helper.c:571 +#: builtin/submodule--helper.c:604 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "" -#: builtin/submodule--helper.c:595 +#: builtin/submodule--helper.c:626 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:598 +#: builtin/submodule--helper.c:629 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:601 +#: builtin/submodule--helper.c:632 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:607 +#: builtin/submodule--helper.c:638 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 msgid "force cloning progress" msgstr "" -#: builtin/submodule--helper.c:615 +#: builtin/submodule--helper.c:646 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" -#: builtin/submodule--helper.c:646 +#: builtin/submodule--helper.c:677 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:662 -#, c-format -msgid "cannot open file '%s'" -msgstr "" - -#: builtin/submodule--helper.c:667 -#, c-format -msgid "could not close file %s" -msgstr "" - -#: builtin/submodule--helper.c:674 +#: builtin/submodule--helper.c:692 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:742 +#: builtin/submodule--helper.c:757 #, c-format msgid "Submodule path '%s' not initialized" msgstr "" -#: builtin/submodule--helper.c:746 +#: builtin/submodule--helper.c:761 msgid "Maybe you want to use 'update --init'?" msgstr "" -#: builtin/submodule--helper.c:772 +#: builtin/submodule--helper.c:790 #, c-format msgid "Skipping unmerged submodule %s" msgstr "" -#: builtin/submodule--helper.c:793 +#: builtin/submodule--helper.c:819 #, c-format msgid "Skipping submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:929 +#: builtin/submodule--helper.c:952 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "" -#: builtin/submodule--helper.c:940 +#: builtin/submodule--helper.c:963 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" -#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105 +#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 msgid "path into the working tree" msgstr "" -#: builtin/submodule--helper.c:964 +#: builtin/submodule--helper.c:996 msgid "path into the working tree, across nested submodule boundaries" msgstr "" -#: builtin/submodule--helper.c:968 +#: builtin/submodule--helper.c:1000 msgid "rebase, merge, checkout or none" msgstr "" -#: builtin/submodule--helper.c:972 +#: builtin/submodule--helper.c:1004 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -#: builtin/submodule--helper.c:975 +#: builtin/submodule--helper.c:1007 msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:1009 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" -#: builtin/submodule--helper.c:978 +#: builtin/submodule--helper.c:1010 msgid "don't print cloning progress" msgstr "" -#: builtin/submodule--helper.c:985 +#: builtin/submodule--helper.c:1017 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:995 +#: builtin/submodule--helper.c:1030 msgid "bad value for update parameter" msgstr "" -#: builtin/submodule--helper.c:1066 +#: builtin/submodule--helper.c:1098 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "" -#: builtin/submodule--helper.c:1106 +#: builtin/submodule--helper.c:1214 msgid "recurse into submodules" msgstr "" -#: builtin/submodule--helper.c:1112 +#: builtin/submodule--helper.c:1220 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1157 -msgid "submodule--helper subcommand must be called with a subcommand" -msgstr "" - -#: builtin/submodule--helper.c:1164 +#: builtin/submodule--helper.c:1278 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" -#: builtin/submodule--helper.c:1170 +#: builtin/submodule--helper.c:1284 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" -#: builtin/symbolic-ref.c:7 +#: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "" -#: builtin/symbolic-ref.c:8 +#: builtin/symbolic-ref.c:9 msgid "git symbolic-ref -d [-q] <name>" msgstr "" @@ -12179,32 +12720,28 @@ msgstr "" msgid "reason of the update" msgstr "" -#: builtin/tag.c:23 +#: builtin/tag.c:24 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" msgstr "" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "git tag -d <tagname>..." msgstr "" -#: builtin/tag.c:25 +#: builtin/tag.c:26 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <object>]\n" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "" -#: builtin/tag.c:27 +#: builtin/tag.c:28 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "" -#: builtin/tag.c:82 -#, c-format -msgid "tag name too long: %.*s..." -msgstr "" - -#: builtin/tag.c:87 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "" @@ -12233,354 +12770,370 @@ msgid "" "want to.\n" msgstr "" -#: builtin/tag.c:213 +#: builtin/tag.c:189 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:215 +#: builtin/tag.c:191 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:240 +#: builtin/tag.c:215 msgid "bad object type." msgstr "" -#: builtin/tag.c:253 -msgid "tag header too big." -msgstr "" - -#: builtin/tag.c:289 +#: builtin/tag.c:261 msgid "no tag message?" msgstr "" -#: builtin/tag.c:295 +#: builtin/tag.c:268 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:354 +#: builtin/tag.c:376 msgid "list tag names" msgstr "" -#: builtin/tag.c:356 +#: builtin/tag.c:378 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:358 +#: builtin/tag.c:380 msgid "delete tags" msgstr "" -#: builtin/tag.c:359 +#: builtin/tag.c:381 msgid "verify tags" msgstr "" -#: builtin/tag.c:361 +#: builtin/tag.c:383 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:363 +#: builtin/tag.c:385 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:365 +#: builtin/tag.c:387 msgid "tag message" msgstr "" -#: builtin/tag.c:367 +#: builtin/tag.c:389 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:371 +#: builtin/tag.c:393 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:372 +#: builtin/tag.c:394 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:373 builtin/update-ref.c:368 +#: builtin/tag.c:395 builtin/update-ref.c:368 msgid "create a reflog" msgstr "" -#: builtin/tag.c:375 +#: builtin/tag.c:397 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:376 +#: builtin/tag.c:398 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:377 builtin/tag.c:378 +#: builtin/tag.c:399 builtin/tag.c:401 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:379 +#: builtin/tag.c:400 builtin/tag.c:402 +msgid "print only tags that don't contain the commit" +msgstr "" + +#: builtin/tag.c:403 msgid "print only tags that are merged" msgstr "" -#: builtin/tag.c:380 +#: builtin/tag.c:404 msgid "print only tags that are not merged" msgstr "" -#: builtin/tag.c:385 +#: builtin/tag.c:409 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:415 +#: builtin/tag.c:453 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:437 -msgid "-n option is only allowed with -l." +#: builtin/tag.c:475 +msgid "-n option is only allowed in list mode" msgstr "" -#: builtin/tag.c:439 -msgid "--contains option is only allowed with -l." +#: builtin/tag.c:477 +msgid "--contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:441 -msgid "--points-at option is only allowed with -l." +#: builtin/tag.c:479 +msgid "--no-contains option is only allowed in list mode" +msgstr "" + +#: builtin/tag.c:481 +msgid "--points-at option is only allowed in list mode" msgstr "" -#: builtin/tag.c:443 -msgid "--merged and --no-merged option are only allowed with -l" +#: builtin/tag.c:483 +msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" -#: builtin/tag.c:454 +#: builtin/tag.c:494 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:473 +#: builtin/tag.c:513 msgid "too many params" msgstr "" -#: builtin/tag.c:479 +#: builtin/tag.c:519 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:484 +#: builtin/tag.c:524 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:512 +#: builtin/tag.c:554 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" -#: builtin/unpack-objects.c:493 +#: builtin/unpack-objects.c:494 msgid "Unpacking objects" msgstr "" -#: builtin/update-index.c:79 +#: builtin/update-index.c:80 #, c-format msgid "failed to create directory %s" msgstr "" -#: builtin/update-index.c:85 +#: builtin/update-index.c:86 #, c-format msgid "failed to stat %s" msgstr "" -#: builtin/update-index.c:95 +#: builtin/update-index.c:96 #, c-format msgid "failed to create file %s" msgstr "" -#: builtin/update-index.c:103 +#: builtin/update-index.c:104 #, c-format msgid "failed to delete file %s" msgstr "" -#: builtin/update-index.c:110 builtin/update-index.c:212 +#: builtin/update-index.c:111 builtin/update-index.c:217 #, c-format msgid "failed to delete directory %s" msgstr "" -#: builtin/update-index.c:133 +#: builtin/update-index.c:136 #, c-format msgid "Testing mtime in '%s' " msgstr "" -#: builtin/update-index.c:145 +#: builtin/update-index.c:150 msgid "directory stat info does not change after adding a new file" msgstr "" -#: builtin/update-index.c:158 +#: builtin/update-index.c:163 msgid "directory stat info does not change after adding a new directory" msgstr "" -#: builtin/update-index.c:171 +#: builtin/update-index.c:176 msgid "directory stat info changes after updating a file" msgstr "" -#: builtin/update-index.c:182 +#: builtin/update-index.c:187 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" -#: builtin/update-index.c:193 +#: builtin/update-index.c:198 msgid "directory stat info does not change after deleting a file" msgstr "" -#: builtin/update-index.c:206 +#: builtin/update-index.c:211 msgid "directory stat info does not change after deleting a directory" msgstr "" -#: builtin/update-index.c:213 +#: builtin/update-index.c:218 msgid " OK" msgstr "" -#: builtin/update-index.c:564 +#: builtin/update-index.c:571 msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:919 +#: builtin/update-index.c:926 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:922 +#: builtin/update-index.c:929 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:925 +#: builtin/update-index.c:932 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:927 +#: builtin/update-index.c:934 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:929 +#: builtin/update-index.c:936 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:931 +#: builtin/update-index.c:938 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:934 +#: builtin/update-index.c:941 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:938 +#: builtin/update-index.c:945 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:942 +#: builtin/update-index.c:949 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:943 +#: builtin/update-index.c:950 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:952 +#: builtin/update-index.c:959 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:955 +#: builtin/update-index.c:962 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:958 +#: builtin/update-index.c:965 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:961 +#: builtin/update-index.c:968 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:964 +#: builtin/update-index.c:971 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:966 +#: builtin/update-index.c:973 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:968 +#: builtin/update-index.c:975 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:970 +#: builtin/update-index.c:977 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:974 +#: builtin/update-index.c:981 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:978 +#: builtin/update-index.c:985 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:982 +#: builtin/update-index.c:989 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:986 +#: builtin/update-index.c:993 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:989 +#: builtin/update-index.c:996 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:991 +#: builtin/update-index.c:998 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:995 +#: builtin/update-index.c:1002 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:997 +#: builtin/update-index.c:1004 msgid "enable or disable split index" msgstr "" -#: builtin/update-index.c:999 +#: builtin/update-index.c:1006 msgid "enable/disable untracked cache" msgstr "" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1008 msgid "test if the filesystem supports untracked cache" msgstr "" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1010 msgid "enable untracked cache without testing the filesystem" msgstr "" -#: builtin/update-index.c:1120 +#: builtin/update-index.c:1107 +msgid "" +"core.splitIndex is set to false; remove or change it, if you really want to " +"enable split index" +msgstr "" + +#: builtin/update-index.c:1116 +msgid "" +"core.splitIndex is set to true; remove or change it, if you really want to " +"disable split index" +msgstr "" + +#: builtin/update-index.c:1127 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "" -#: builtin/update-index.c:1124 +#: builtin/update-index.c:1131 msgid "Untracked cache disabled" msgstr "" -#: builtin/update-index.c:1132 +#: builtin/update-index.c:1139 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" msgstr "" -#: builtin/update-index.c:1136 +#: builtin/update-index.c:1143 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "" -#: builtin/update-ref.c:9 +#: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "" -#: builtin/update-ref.c:10 +#: builtin/update-ref.c:11 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "" -#: builtin/update-ref.c:11 +#: builtin/update-ref.c:12 msgid "git update-ref [<options>] --stdin [-z]" msgstr "" @@ -12600,199 +13153,210 @@ msgstr "" msgid "read updates from stdin" msgstr "" -#: builtin/update-server-info.c:6 +#: builtin/update-server-info.c:7 msgid "git update-server-info [--force]" msgstr "" -#: builtin/update-server-info.c:14 +#: builtin/update-server-info.c:15 msgid "update the info files from scratch" msgstr "" -#: builtin/verify-commit.c:17 +#: builtin/verify-commit.c:18 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "" -#: builtin/verify-commit.c:72 +#: builtin/verify-commit.c:73 msgid "print commit contents" msgstr "" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 +#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "" -#: builtin/verify-pack.c:54 +#: builtin/verify-pack.c:55 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "" -#: builtin/verify-pack.c:64 +#: builtin/verify-pack.c:65 msgid "verbose" msgstr "" -#: builtin/verify-pack.c:66 +#: builtin/verify-pack.c:67 msgid "show statistics only" msgstr "" -#: builtin/verify-tag.c:18 +#: builtin/verify-tag.c:19 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "" -#: builtin/verify-tag.c:36 +#: builtin/verify-tag.c:37 msgid "print tag contents" msgstr "" -#: builtin/worktree.c:15 +#: builtin/worktree.c:16 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree list [<options>]" msgstr "" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree lock [<options>] <path>" msgstr "" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree prune [<options>]" msgstr "" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:42 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "" -#: builtin/worktree.c:48 +#: builtin/worktree.c:52 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "" -#: builtin/worktree.c:53 +#: builtin/worktree.c:57 builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" -#: builtin/worktree.c:64 +#: builtin/worktree.c:76 +#, c-format +msgid "" +"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " +"%<PRIuMAX>)" +msgstr "" + +#: builtin/worktree.c:84 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "" -#: builtin/worktree.c:80 +#: builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" -#: builtin/worktree.c:128 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "" -#: builtin/worktree.c:130 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "" -#: builtin/worktree.c:204 +#: builtin/worktree.c:223 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:236 +#: builtin/worktree.c:254 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:272 +#: builtin/worktree.c:293 #, c-format msgid "Preparing %s (identifier %s)" msgstr "" -#: builtin/worktree.c:323 +#: builtin/worktree.c:345 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:325 +#: builtin/worktree.c:347 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:327 +#: builtin/worktree.c:349 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:329 +#: builtin/worktree.c:351 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:337 +#: builtin/worktree.c:352 +msgid "keep the new working tree locked" +msgstr "" + +#: builtin/worktree.c:360 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:472 +#: builtin/worktree.c:499 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:484 builtin/worktree.c:517 +#: builtin/worktree.c:511 builtin/worktree.c:544 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:486 builtin/worktree.c:519 +#: builtin/worktree.c:513 builtin/worktree.c:546 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:491 +#: builtin/worktree.c:518 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:493 +#: builtin/worktree.c:520 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:521 +#: builtin/worktree.c:548 #, c-format msgid "'%s' is not locked" msgstr "" -#: builtin/write-tree.c:13 +#: builtin/write-tree.c:14 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "" -#: builtin/write-tree.c:26 +#: builtin/write-tree.c:27 msgid "<prefix>/" msgstr "" -#: builtin/write-tree.c:27 +#: builtin/write-tree.c:28 msgid "write tree object for a subdirectory <prefix>" msgstr "" -#: builtin/write-tree.c:30 +#: builtin/write-tree.c:31 msgid "only useful for debugging" msgstr "" -#: upload-pack.c:22 +#: upload-pack.c:23 msgid "git upload-pack [<options>] <dir>" msgstr "" -#: upload-pack.c:1036 +#: upload-pack.c:1040 msgid "quit after a single request/response exchange" msgstr "" -#: upload-pack.c:1038 +#: upload-pack.c:1042 msgid "exit immediately after initial ref advertisement" msgstr "" -#: upload-pack.c:1040 +#: upload-pack.c:1044 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" -#: upload-pack.c:1042 +#: upload-pack.c:1046 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "" -#: credential-cache--daemon.c:223 +#: credential-cache--daemon.c:222 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -12805,22 +13369,27 @@ msgstr "" msgid "print debugging messages to stderr" msgstr "" -#: git.c:14 +#: git.c:15 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" -#: http.c:344 +#: http.c:338 +#, c-format +msgid "negative value for http.postbuffer; defaulting to %d" +msgstr "" + +#: http.c:359 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "" -#: http.c:353 +#: http.c:368 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" -#: http.c:1713 +#: http.c:1768 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -12828,7 +13397,7 @@ msgid "" " redirect: %s" msgstr "" -#: remote-curl.c:319 +#: remote-curl.c:324 #, c-format msgid "redirecting to %s" msgstr "" @@ -13164,7 +13733,7 @@ msgstr "" #: git-merge-octopus.sh:77 #, sh-format -msgid "Already up-to-date with $pretty_name" +msgid "Already up to date with $pretty_name" msgstr "" #: git-merge-octopus.sh:89 @@ -13181,51 +13750,56 @@ msgstr "" msgid "Simple merge did not work, trying automatic merge." msgstr "" -#: git-rebase.sh:57 +#: git-rebase.sh:58 msgid "" -"When you have resolved this problem, run \"git rebase --continue\".\n" -"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" -"To check out the original branch and stop rebasing, run \"git rebase --abort" -"\"." +"Resolve all conflicts manually, mark them as resolved with\n" +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" +"You can instead skip this commit: run \"git rebase --skip\".\n" +"To abort and get back to the state before \"git rebase\", run \"git rebase --" +"abort\"." msgstr "" -#: git-rebase.sh:157 git-rebase.sh:396 +#: git-rebase.sh:160 git-rebase.sh:402 #, sh-format msgid "Could not move back to $head_name" msgstr "" #: git-rebase.sh:171 +msgid "Applied autostash." +msgstr "" + +#: git-rebase.sh:174 #, sh-format msgid "Cannot store $stash_sha1" msgstr "" -#: git-rebase.sh:211 +#: git-rebase.sh:214 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:216 +#: git-rebase.sh:219 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:357 +#: git-rebase.sh:363 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:368 +#: git-rebase.sh:374 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:375 +#: git-rebase.sh:381 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:378 +#: git-rebase.sh:384 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: git-rebase.sh:418 +#: git-rebase.sh:424 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -13238,101 +13812,101 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:469 +#: git-rebase.sh:480 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:493 +#: git-rebase.sh:504 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:496 git-rebase.sh:500 +#: git-rebase.sh:507 git-rebase.sh:511 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:505 +#: git-rebase.sh:516 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:528 +#: git-rebase.sh:539 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:561 +#: git-rebase.sh:572 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:566 +#: git-rebase.sh:577 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:570 +#: git-rebase.sh:581 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:590 +#: git-rebase.sh:601 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:594 +#: git-rebase.sh:605 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:605 +#: git-rebase.sh:616 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#: git-rebase.sh:614 +#: git-rebase.sh:625 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:624 +#: git-rebase.sh:635 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" -#: git-stash.sh:50 +#: git-stash.sh:61 msgid "git stash clear with parameters is unimplemented" msgstr "" -#: git-stash.sh:73 +#: git-stash.sh:102 msgid "You do not have the initial commit yet" msgstr "" -#: git-stash.sh:88 +#: git-stash.sh:117 msgid "Cannot save the current index state" msgstr "" -#: git-stash.sh:103 +#: git-stash.sh:132 msgid "Cannot save the untracked files" msgstr "" -#: git-stash.sh:123 git-stash.sh:136 +#: git-stash.sh:152 git-stash.sh:165 msgid "Cannot save the current worktree state" msgstr "" -#: git-stash.sh:140 +#: git-stash.sh:169 msgid "No changes selected" msgstr "" -#: git-stash.sh:143 +#: git-stash.sh:172 msgid "Cannot remove temporary index (can't happen)" msgstr "" -#: git-stash.sh:156 +#: git-stash.sh:185 msgid "Cannot record working tree state" msgstr "" -#: git-stash.sh:188 +#: git-stash.sh:217 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" @@ -13347,114 +13921,114 @@ msgstr "" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:238 +#: git-stash.sh:273 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "" -#: git-stash.sh:251 +#: git-stash.sh:288 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -#: git-stash.sh:259 +#: git-stash.sh:296 msgid "No local changes to save" msgstr "" -#: git-stash.sh:263 +#: git-stash.sh:301 msgid "Cannot initialize stash" msgstr "" -#: git-stash.sh:267 +#: git-stash.sh:305 msgid "Cannot save the current status" msgstr "" -#: git-stash.sh:268 +#: git-stash.sh:306 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "" -#: git-stash.sh:285 +#: git-stash.sh:334 msgid "Cannot remove worktree changes" msgstr "" -#: git-stash.sh:403 +#: git-stash.sh:482 #, sh-format msgid "unknown option: $opt" msgstr "" -#: git-stash.sh:416 -msgid "No stash found." +#: git-stash.sh:495 +msgid "No stash entries found." msgstr "" -#: git-stash.sh:423 +#: git-stash.sh:502 #, sh-format msgid "Too many revisions specified: $REV" msgstr "" -#: git-stash.sh:438 +#: git-stash.sh:517 #, sh-format msgid "$reference is not a valid reference" msgstr "" -#: git-stash.sh:466 +#: git-stash.sh:545 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "" -#: git-stash.sh:477 +#: git-stash.sh:556 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-stash.sh:485 +#: git-stash.sh:564 msgid "unable to refresh index" msgstr "" -#: git-stash.sh:489 +#: git-stash.sh:568 msgid "Cannot apply a stash in the middle of a merge" msgstr "" -#: git-stash.sh:497 +#: git-stash.sh:576 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-stash.sh:499 +#: git-stash.sh:578 msgid "Could not save index tree" msgstr "" -#: git-stash.sh:508 -msgid "Could not restore untracked files from stash" +#: git-stash.sh:587 +msgid "Could not restore untracked files from stash entry" msgstr "" -#: git-stash.sh:533 +#: git-stash.sh:612 msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:548 +#: git-stash.sh:627 msgid "Index was not unstashed." msgstr "" -#: git-stash.sh:562 -msgid "The stash is kept in case you need it again." +#: git-stash.sh:641 +msgid "The stash entry is kept in case you need it again." msgstr "" -#: git-stash.sh:571 +#: git-stash.sh:650 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:572 +#: git-stash.sh:651 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:580 +#: git-stash.sh:659 msgid "No branch name specified" msgstr "" -#: git-stash.sh:652 +#: git-stash.sh:738 msgid "(To restore them type \"git stash apply\")" msgstr "" @@ -13477,7 +14051,7 @@ msgstr "" msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "" -#: git-submodule.sh:218 +#: git-submodule.sh:219 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -13485,22 +14059,22 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:236 +#: git-submodule.sh:237 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:238 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:246 +#: git-submodule.sh:247 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:248 +#: git-submodule.sh:249 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -13511,184 +14085,184 @@ msgid "" "option." msgstr "" -#: git-submodule.sh:254 +#: git-submodule.sh:255 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:266 +#: git-submodule.sh:267 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:271 +#: git-submodule.sh:272 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:280 +#: git-submodule.sh:281 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:327 +#: git-submodule.sh:342 #, sh-format msgid "Entering '$displaypath'" msgstr "" -#: git-submodule.sh:347 +#: git-submodule.sh:362 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" -#: git-submodule.sh:418 +#: git-submodule.sh:433 #, sh-format msgid "pathspec and --all are incompatible" msgstr "" -#: git-submodule.sh:423 +#: git-submodule.sh:438 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" -#: git-submodule.sh:443 +#: git-submodule.sh:458 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -#: git-submodule.sh:451 +#: git-submodule.sh:466 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "" -#: git-submodule.sh:454 +#: git-submodule.sh:469 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "" -#: git-submodule.sh:455 +#: git-submodule.sh:470 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" -#: git-submodule.sh:458 +#: git-submodule.sh:473 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" -#: git-submodule.sh:467 +#: git-submodule.sh:482 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" -#: git-submodule.sh:623 +#: git-submodule.sh:637 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:633 +#: git-submodule.sh:647 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:638 +#: git-submodule.sh:652 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" -#: git-submodule.sh:656 +#: git-submodule.sh:670 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:662 +#: git-submodule.sh:676 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -#: git-submodule.sh:669 +#: git-submodule.sh:683 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:670 +#: git-submodule.sh:684 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:674 +#: git-submodule.sh:688 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:675 +#: git-submodule.sh:689 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:680 +#: git-submodule.sh:694 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:681 +#: git-submodule.sh:695 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:686 +#: git-submodule.sh:700 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:687 +#: git-submodule.sh:701 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:718 +#: git-submodule.sh:732 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:826 +#: git-submodule.sh:840 msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:878 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:898 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:901 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:904 +#: git-submodule.sh:918 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:1051 +#: git-submodule.sh:1064 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:1118 +#: git-submodule.sh:1136 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "" @@ -13707,13 +14281,13 @@ msgstr "" msgid "" "\n" "Commands:\n" -" p, pick = use commit\n" -" r, reword = use commit, but edit the commit message\n" -" e, edit = use commit, but stop for amending\n" -" s, squash = use commit, but meld into previous commit\n" -" f, fixup = like \"squash\", but discard this commit's log message\n" -" x, exec = run command (the rest of the line) using shell\n" -" d, drop = remove commit\n" +"p, pick = use commit\n" +"r, reword = use commit, but edit the commit message\n" +"e, edit = use commit, but stop for amending\n" +"s, squash = use commit, but meld into previous commit\n" +"f, fixup = like \"squash\", but discard this commit's log message\n" +"x, exec = run command (the rest of the line) using shell\n" +"d, drop = remove commit\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -13776,49 +14350,49 @@ msgstr "" msgid "Refusing to squash a merge: $sha1" msgstr "" -#: git-rebase--interactive.sh:399 +#: git-rebase--interactive.sh:400 #, sh-format msgid "Error redoing merge $sha1" msgstr "" -#: git-rebase--interactive.sh:407 +#: git-rebase--interactive.sh:408 #, sh-format msgid "Could not pick $sha1" msgstr "" -#: git-rebase--interactive.sh:416 +#: git-rebase--interactive.sh:417 #, sh-format msgid "This is the commit message #${n}:" msgstr "" -#: git-rebase--interactive.sh:421 +#: git-rebase--interactive.sh:422 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "" -#: git-rebase--interactive.sh:432 +#: git-rebase--interactive.sh:433 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "" msgstr[1] "" -#: git-rebase--interactive.sh:441 +#: git-rebase--interactive.sh:442 #, sh-format msgid "Cannot write $fixup_msg" msgstr "" -#: git-rebase--interactive.sh:444 +#: git-rebase--interactive.sh:445 msgid "This is a combination of 2 commits." msgstr "" -#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 -#: git-rebase--interactive.sh:531 +#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529 +#: git-rebase--interactive.sh:532 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "" -#: git-rebase--interactive.sh:559 +#: git-rebase--interactive.sh:560 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -13828,31 +14402,31 @@ msgid "" "you are able to reword the commit." msgstr "" -#: git-rebase--interactive.sh:574 +#: git-rebase--interactive.sh:575 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "" -#: git-rebase--interactive.sh:589 +#: git-rebase--interactive.sh:590 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "" -#: git-rebase--interactive.sh:631 +#: git-rebase--interactive.sh:632 #, sh-format msgid "Executing: $rest" msgstr "" -#: git-rebase--interactive.sh:639 +#: git-rebase--interactive.sh:640 #, sh-format msgid "Execution failed: $rest" msgstr "" -#: git-rebase--interactive.sh:641 +#: git-rebase--interactive.sh:642 msgid "and made changes to the index and/or the working tree" msgstr "" -#: git-rebase--interactive.sh:643 +#: git-rebase--interactive.sh:644 msgid "" "You can fix the problem, and then run\n" "\n" @@ -13860,7 +14434,7 @@ msgid "" msgstr "" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:656 +#: git-rebase--interactive.sh:657 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -13870,79 +14444,29 @@ msgid "" "\tgit rebase --continue" msgstr "" -#: git-rebase--interactive.sh:667 +#: git-rebase--interactive.sh:668 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "" -#: git-rebase--interactive.sh:668 +#: git-rebase--interactive.sh:669 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "" -#: git-rebase--interactive.sh:703 +#: git-rebase--interactive.sh:704 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "" -#: git-rebase--interactive.sh:750 -msgid "Could not skip unnecessary pick commands" -msgstr "" - -#: git-rebase--interactive.sh:908 -#, sh-format -msgid "" -"Warning: the SHA-1 is missing or isn't a commit in the following line:\n" -" - $line" -msgstr "" - -#: git-rebase--interactive.sh:941 -#, sh-format -msgid "" -"Warning: the command isn't recognized in the following line:\n" -" - $line" -msgstr "" - -#: git-rebase--interactive.sh:980 +#: git-rebase--interactive.sh:749 msgid "could not detach HEAD" msgstr "" -#: git-rebase--interactive.sh:1018 -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):" -msgstr "" - -#: git-rebase--interactive.sh:1026 -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error." -msgstr "" - -#: git-rebase--interactive.sh:1037 -#, sh-format -msgid "" -"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " -"Ignoring." -msgstr "" - -#: git-rebase--interactive.sh:1054 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'." -msgstr "" - -#: git-rebase--interactive.sh:1055 -msgid "Or you can abort the rebase with 'git rebase --abort'." -msgstr "" - -#: git-rebase--interactive.sh:1079 +#: git-rebase--interactive.sh:784 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "" -#: git-rebase--interactive.sh:1084 +#: git-rebase--interactive.sh:789 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -13960,21 +14484,21 @@ msgid "" " git rebase --continue\n" msgstr "" -#: git-rebase--interactive.sh:1101 +#: git-rebase--interactive.sh:806 msgid "Error trying to find the author identity to amend commit" msgstr "" -#: git-rebase--interactive.sh:1106 +#: git-rebase--interactive.sh:811 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115 +#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 msgid "Could not commit staged changes." msgstr "" -#: git-rebase--interactive.sh:1139 +#: git-rebase--interactive.sh:848 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -13983,47 +14507,47 @@ msgid "" "\n" msgstr "" -#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305 +#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 msgid "Could not execute editor" msgstr "" -#: git-rebase--interactive.sh:1160 +#: git-rebase--interactive.sh:869 #, sh-format msgid "Could not checkout $switch_to" msgstr "" -#: git-rebase--interactive.sh:1165 +#: git-rebase--interactive.sh:874 msgid "No HEAD?" msgstr "" -#: git-rebase--interactive.sh:1166 +#: git-rebase--interactive.sh:875 #, sh-format msgid "Could not create temporary $state_dir" msgstr "" -#: git-rebase--interactive.sh:1168 +#: git-rebase--interactive.sh:877 msgid "Could not mark as interactive" msgstr "" -#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183 +#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 msgid "Could not init rewritten commits" msgstr "" -#: git-rebase--interactive.sh:1283 +#: git-rebase--interactive.sh:993 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "" msgstr[1] "" -#: git-rebase--interactive.sh:1288 +#: git-rebase--interactive.sh:998 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "" -#: git-rebase--interactive.sh:1295 +#: git-rebase--interactive.sh:1005 msgid "Note that empty commits are commented out" msgstr "" @@ -14085,126 +14609,120 @@ msgid "Unable to determine absolute path of git directory" msgstr "" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:238 +#: git-add--interactive.perl:196 #, perl-format msgid "%12s %12s %s" msgstr "" -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "staged" msgstr "" -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "unstaged" msgstr "" -#: git-add--interactive.perl:297 git-add--interactive.perl:322 +#: git-add--interactive.perl:246 git-add--interactive.perl:271 msgid "binary" msgstr "" -#: git-add--interactive.perl:306 git-add--interactive.perl:360 +#: git-add--interactive.perl:255 git-add--interactive.perl:309 msgid "nothing" msgstr "" -#: git-add--interactive.perl:342 git-add--interactive.perl:357 +#: git-add--interactive.perl:291 git-add--interactive.perl:306 msgid "unchanged" msgstr "" -#: git-add--interactive.perl:653 +#: git-add--interactive.perl:602 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:656 +#: git-add--interactive.perl:605 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:659 +#: git-add--interactive.perl:608 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:662 +#: git-add--interactive.perl:611 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:671 +#: git-add--interactive.perl:620 msgid "Update" msgstr "" -#: git-add--interactive.perl:683 +#: git-add--interactive.perl:632 msgid "Revert" msgstr "" -#: git-add--interactive.perl:706 +#: git-add--interactive.perl:655 #, perl-format msgid "note: %s is untracked now.\n" msgstr "" -#: git-add--interactive.perl:717 +#: git-add--interactive.perl:666 msgid "Add untracked" msgstr "" -#: git-add--interactive.perl:723 +#: git-add--interactive.perl:672 msgid "No untracked files.\n" msgstr "" -#: git-add--interactive.perl:1039 +#: git-add--interactive.perl:985 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "" -#: git-add--interactive.perl:1042 +#: git-add--interactive.perl:988 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "" -#: git-add--interactive.perl:1045 +#: git-add--interactive.perl:991 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "" -#: git-add--interactive.perl:1048 git-add--interactive.perl:1057 +#: git-add--interactive.perl:994 git-add--interactive.perl:1003 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "" -#: git-add--interactive.perl:1051 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding" -msgstr "" - -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:997 git-add--interactive.perl:1000 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "" -#: git-add--interactive.perl:1067 +#: git-add--interactive.perl:1013 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "" -#: git-add--interactive.perl:1068 +#: git-add--interactive.perl:1014 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1020 #, perl-format msgid "" "---\n" @@ -14214,14 +14732,14 @@ msgid "" msgstr "" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1082 +#: git-add--interactive.perl:1028 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" -#: git-add--interactive.perl:1096 +#: git-add--interactive.perl:1042 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "" @@ -14232,12 +14750,12 @@ msgstr "" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: git-add--interactive.perl:1187 +#: git-add--interactive.perl:1134 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" -#: git-add--interactive.perl:1196 +#: git-add--interactive.perl:1143 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -14246,7 +14764,7 @@ msgid "" "d - do not stage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1202 +#: git-add--interactive.perl:1149 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -14255,7 +14773,7 @@ msgid "" "d - do not stash this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1208 +#: git-add--interactive.perl:1155 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -14264,7 +14782,7 @@ msgid "" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1214 +#: git-add--interactive.perl:1161 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -14273,7 +14791,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1220 +#: git-add--interactive.perl:1167 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -14282,7 +14800,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1226 +#: git-add--interactive.perl:1173 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -14291,7 +14809,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1232 +#: git-add--interactive.perl:1179 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -14300,7 +14818,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1241 +#: git-add--interactive.perl:1188 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -14313,283 +14831,283 @@ msgid "" "? - print help\n" msgstr "" -#: git-add--interactive.perl:1272 +#: git-add--interactive.perl:1219 msgid "The selected hunks do not apply to the index!\n" msgstr "" -#: git-add--interactive.perl:1273 +#: git-add--interactive.perl:1220 msgid "Apply them to the worktree anyway? " msgstr "" -#: git-add--interactive.perl:1276 +#: git-add--interactive.perl:1223 msgid "Nothing was applied.\n" msgstr "" -#: git-add--interactive.perl:1287 +#: git-add--interactive.perl:1234 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1243 msgid "Only binary files changed.\n" msgstr "" -#: git-add--interactive.perl:1298 +#: git-add--interactive.perl:1245 msgid "No changes.\n" msgstr "" -#: git-add--interactive.perl:1306 +#: git-add--interactive.perl:1253 msgid "Patch update" msgstr "" -#: git-add--interactive.perl:1358 +#: git-add--interactive.perl:1305 #, perl-format msgid "Stage mode change [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1359 +#: git-add--interactive.perl:1306 #, perl-format msgid "Stage deletion [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1360 +#: git-add--interactive.perl:1307 #, perl-format msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1363 +#: git-add--interactive.perl:1310 #, perl-format msgid "Stash mode change [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1364 +#: git-add--interactive.perl:1311 #, perl-format msgid "Stash deletion [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1365 +#: git-add--interactive.perl:1312 #, perl-format msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1368 +#: git-add--interactive.perl:1315 #, perl-format msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1369 +#: git-add--interactive.perl:1316 #, perl-format msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1370 +#: git-add--interactive.perl:1317 #, perl-format msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1373 +#: git-add--interactive.perl:1320 #, perl-format msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1374 +#: git-add--interactive.perl:1321 #, perl-format msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1375 +#: git-add--interactive.perl:1322 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1378 +#: git-add--interactive.perl:1325 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1379 +#: git-add--interactive.perl:1326 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1380 +#: git-add--interactive.perl:1327 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1383 +#: git-add--interactive.perl:1330 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1384 +#: git-add--interactive.perl:1331 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1385 +#: git-add--interactive.perl:1332 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1388 +#: git-add--interactive.perl:1335 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1389 +#: git-add--interactive.perl:1336 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1390 +#: git-add--interactive.perl:1337 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" -#: git-add--interactive.perl:1493 +#: git-add--interactive.perl:1440 msgid "go to which hunk (<ret> to see more)? " msgstr "" -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1442 msgid "go to which hunk? " msgstr "" -#: git-add--interactive.perl:1504 +#: git-add--interactive.perl:1451 #, perl-format msgid "Invalid number: '%s'\n" msgstr "" -#: git-add--interactive.perl:1509 +#: git-add--interactive.perl:1456 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:1535 +#: git-add--interactive.perl:1482 msgid "search for regex? " msgstr "" -#: git-add--interactive.perl:1548 +#: git-add--interactive.perl:1495 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "" -#: git-add--interactive.perl:1558 +#: git-add--interactive.perl:1505 msgid "No hunk matches the given pattern\n" msgstr "" -#: git-add--interactive.perl:1570 git-add--interactive.perl:1592 +#: git-add--interactive.perl:1517 git-add--interactive.perl:1539 msgid "No previous hunk\n" msgstr "" -#: git-add--interactive.perl:1579 git-add--interactive.perl:1598 +#: git-add--interactive.perl:1526 git-add--interactive.perl:1545 msgid "No next hunk\n" msgstr "" -#: git-add--interactive.perl:1606 +#: git-add--interactive.perl:1553 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:1658 +#: git-add--interactive.perl:1605 msgid "Review diff" msgstr "" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1677 +#: git-add--interactive.perl:1624 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" "revert - revert staged set of changes back to the HEAD version\n" "patch - pick hunks and update selectively\n" -"diff\t - view diff between HEAD and index\n" +"diff - view diff between HEAD and index\n" "add untracked - add contents of untracked files to the staged set of " "changes\n" msgstr "" -#: git-add--interactive.perl:1694 git-add--interactive.perl:1699 -#: git-add--interactive.perl:1702 git-add--interactive.perl:1709 -#: git-add--interactive.perl:1713 git-add--interactive.perl:1719 +#: git-add--interactive.perl:1641 git-add--interactive.perl:1646 +#: git-add--interactive.perl:1649 git-add--interactive.perl:1656 +#: git-add--interactive.perl:1660 git-add--interactive.perl:1666 msgid "missing --" msgstr "" -#: git-add--interactive.perl:1715 +#: git-add--interactive.perl:1662 #, perl-format msgid "unknown --patch mode: %s" msgstr "" -#: git-add--interactive.perl:1721 git-add--interactive.perl:1727 +#: git-add--interactive.perl:1668 git-add--interactive.perl:1674 #, perl-format msgid "invalid argument %s, expecting --" msgstr "" -#: git-send-email.perl:121 +#: git-send-email.perl:126 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "" -#: git-send-email.perl:128 git-send-email.perl:134 +#: git-send-email.perl:133 git-send-email.perl:139 msgid "local time offset greater than or equal to 24 hours\n" msgstr "" -#: git-send-email.perl:202 git-send-email.perl:208 +#: git-send-email.perl:207 git-send-email.perl:213 msgid "the editor exited uncleanly, aborting everything" msgstr "" -#: git-send-email.perl:282 +#: git-send-email.perl:290 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" -#: git-send-email.perl:287 +#: git-send-email.perl:295 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "" -#: git-send-email.perl:305 +#: git-send-email.perl:313 msgid "--dump-aliases incompatible with other options\n" msgstr "" -#: git-send-email.perl:368 git-send-email.perl:623 +#: git-send-email.perl:378 git-send-email.perl:629 msgid "Cannot run git format-patch from outside a repository\n" msgstr "" -#: git-send-email.perl:437 +#: git-send-email.perl:447 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "" -#: git-send-email.perl:466 +#: git-send-email.perl:476 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "" -#: git-send-email.perl:498 +#: git-send-email.perl:504 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" -#: git-send-email.perl:500 +#: git-send-email.perl:506 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "" -#: git-send-email.perl:502 +#: git-send-email.perl:508 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" -#: git-send-email.perl:507 +#: git-send-email.perl:513 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "" -#: git-send-email.perl:589 +#: git-send-email.perl:595 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -14599,36 +15117,36 @@ msgid "" " * Giving --format-patch option if you mean a range.\n" msgstr "" -#: git-send-email.perl:610 +#: git-send-email.perl:616 #, perl-format msgid "Failed to opendir %s: %s" msgstr "" -#: git-send-email.perl:634 +#: git-send-email.perl:640 #, perl-format msgid "" "fatal: %s: %s\n" "warning: no patches were sent\n" msgstr "" -#: git-send-email.perl:645 +#: git-send-email.perl:651 msgid "" "\n" "No patch files specified!\n" "\n" msgstr "" -#: git-send-email.perl:658 +#: git-send-email.perl:664 #, perl-format msgid "No subject line in %s?" msgstr "" -#: git-send-email.perl:668 +#: git-send-email.perl:674 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "" -#: git-send-email.perl:678 +#: git-send-email.perl:684 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -14637,41 +15155,41 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "" -#: git-send-email.perl:701 +#: git-send-email.perl:707 #, perl-format msgid "Failed to open %s.final: %s" msgstr "" -#: git-send-email.perl:704 +#: git-send-email.perl:710 #, perl-format msgid "Failed to open %s: %s" msgstr "" -#: git-send-email.perl:739 +#: git-send-email.perl:745 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" msgstr "" -#: git-send-email.perl:748 +#: git-send-email.perl:754 msgid "Summary email is empty, skipping it\n" msgstr "" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:780 +#: git-send-email.perl:786 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "" -#: git-send-email.perl:809 +#: git-send-email.perl:815 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" -#: git-send-email.perl:814 +#: git-send-email.perl:820 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "" -#: git-send-email.perl:822 +#: git-send-email.perl:828 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -14680,20 +15198,20 @@ msgid "" "want to send.\n" msgstr "" -#: git-send-email.perl:841 +#: git-send-email.perl:847 msgid "To whom should the emails be sent (if anyone)?" msgstr "" -#: git-send-email.perl:859 +#: git-send-email.perl:865 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "" -#: git-send-email.perl:871 +#: git-send-email.perl:877 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -#: git-send-email.perl:921 git-send-email.perl:929 +#: git-send-email.perl:927 git-send-email.perl:935 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "" @@ -14701,16 +15219,16 @@ msgstr "" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:933 +#: git-send-email.perl:939 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" -#: git-send-email.perl:1234 +#: git-send-email.perl:1260 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "" -#: git-send-email.perl:1309 +#: git-send-email.perl:1335 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -14727,123 +15245,128 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1324 +#: git-send-email.perl:1350 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "" -#: git-send-email.perl:1327 +#: git-send-email.perl:1353 msgid "Send this email reply required" msgstr "" -#: git-send-email.perl:1353 +#: git-send-email.perl:1379 msgid "The required SMTP server is not properly defined." msgstr "" -#: git-send-email.perl:1397 +#: git-send-email.perl:1426 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "" -#: git-send-email.perl:1403 +#: git-send-email.perl:1431 git-send-email.perl:1435 +#, perl-format +msgid "STARTTLS failed! %s" +msgstr "" + +#: git-send-email.perl:1445 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -#: git-send-email.perl:1421 +#: git-send-email.perl:1463 #, perl-format msgid "Failed to send %s\n" msgstr "" -#: git-send-email.perl:1424 +#: git-send-email.perl:1466 #, perl-format msgid "Dry-Sent %s\n" msgstr "" -#: git-send-email.perl:1424 +#: git-send-email.perl:1466 #, perl-format msgid "Sent %s\n" msgstr "" -#: git-send-email.perl:1426 +#: git-send-email.perl:1468 msgid "Dry-OK. Log says:\n" msgstr "" -#: git-send-email.perl:1426 +#: git-send-email.perl:1468 msgid "OK. Log says:\n" msgstr "" -#: git-send-email.perl:1438 +#: git-send-email.perl:1480 msgid "Result: " msgstr "" -#: git-send-email.perl:1441 +#: git-send-email.perl:1483 msgid "Result: OK\n" msgstr "" -#: git-send-email.perl:1454 +#: git-send-email.perl:1496 #, perl-format msgid "can't open file %s" msgstr "" -#: git-send-email.perl:1501 git-send-email.perl:1521 +#: git-send-email.perl:1543 git-send-email.perl:1563 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1507 +#: git-send-email.perl:1549 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1555 +#: git-send-email.perl:1597 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1578 +#: git-send-email.perl:1622 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1676 +#: git-send-email.perl:1728 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "" -#: git-send-email.perl:1683 +#: git-send-email.perl:1735 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "" -#: git-send-email.perl:1687 +#: git-send-email.perl:1739 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "" -#: git-send-email.perl:1714 +#: git-send-email.perl:1766 msgid "cannot send message as 7bit" msgstr "" -#: git-send-email.perl:1722 +#: git-send-email.perl:1774 msgid "invalid transfer encoding" msgstr "" -#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 #, perl-format msgid "unable to open %s: %s\n" msgstr "" -#: git-send-email.perl:1744 +#: git-send-email.perl:1815 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "" -#: git-send-email.perl:1760 +#: git-send-email.perl:1831 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1764 +#: git-send-email.perl:1835 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "" |